From b677b86929eb24dc87cc9cdd034dd92682c45de5 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Mon, 30 Jan 2012 23:27:23 +0900 Subject: [PATCH] 1.1.2 --- .gitignore | 1 + rubygem-gio2.spec | 147 ++++++++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 79 insertions(+), 71 deletions(-) diff --git a/.gitignore b/.gitignore index 299a2d6..7420145 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /gio2-1.0.0.gem /gio2-1.0.3.gem /gio2-1.1.1.gem +/gio2-1.1.2.gem diff --git a/rubygem-gio2.spec b/rubygem-gio2.spec index 02ba12b..b1cd1dc 100644 --- a/rubygem-gio2.spec +++ b/rubygem-gio2.spec @@ -1,24 +1,36 @@ +%if 0%{?fedora} >= 18 +%global rubyabi 1.9.1 +%global header_dir %{ruby_vendorarchdir} +%global ruby19 1 +%else %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") -%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) -%global gemname gio2 -%global geminstdir %{gemdir}/gems/%{gemname}-%{version} +%global rubyabi 1.8 +%global header_dir %{ruby_sitearch} +%global ruby19 0 +%endif + +%global gem_name gdk_pixbuf2 %global glibminver 1.1.0 %global obsoleteevr 0.90.7-1.999 +%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']") +%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']") -%global rubyabi 1.8 +%global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null) +%global gem_name gio2 +%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version} Summary: Ruby binding of gio-2.0.x -Name: rubygem-%{gemname} -Version: 1.1.1 +Name: rubygem-%{gem_name} +Version: 1.1.2 Release: 1%{?dist} Group: Development/Languages # from README License: LGPLv2 URL: http://ruby-gnome2.sourceforge.jp/ -Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem +Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem BuildRequires: ruby(abi) = %{rubyabi} BuildRequires: rubygems @@ -29,7 +41,7 @@ BuildRequires: rubygem(rake-compiler) Requires: ruby(abi) = %{rubyabi} Requires: rubygems Requires: rubygem(glib2) >= %{glibminver} -Provides: rubygem(%{gemname}) = %{version} +Provides: rubygem(%{gem_name}) = %{version} %description Ruby/GIO2 is a Ruby binding of gio-2.0.x. @@ -42,16 +54,16 @@ Requires: %{name} = %{version}-%{release} %description doc This package contains documentation for %{name}. -%package -n ruby-%{gemname} -Summary: Non-Gem support package for %{gemname} +%package -n ruby-%{gem_name} +Summary: Non-Gem support package for %{gem_name} Group: Development/Languages Requires: %{name} = %{version}-%{release} # Requires for corresponsing non-gem rpms Requires: ruby(glib2) >= %{glibminver} -Provides: ruby(%{gemname}) = %{version}-%{release} +Provides: ruby(%{gem_name}) = %{version}-%{release} -%description -n ruby-%{gemname} -This package provides non-Gem support for %{gemname}. +%description -n ruby-%{gem_name} +This package provides non-Gem support for %{gem_name}. %package devel Summary: Ruby/GIO2 development environment @@ -59,59 +71,41 @@ Group: Development/Languages Requires: %{name} = %{version}-%{release} Requires: ruby-devel # Obsoletes / Provides -Obsoletes: ruby-%{gemname}-devel < %{obsoleteevr} -Provides: ruby-%{gemname}-devel = %{version}-%{release} +Obsoletes: ruby-%{gem_name}-devel < %{obsoleteevr} +Provides: ruby-%{gem_name}-devel = %{version}-%{release} %description devel Header files and libraries for building a extension library for the -rubygem-%{gemname} +rubygem-%{gem_name} %prep %setup -q -c -T -%if 0 -# For Patch0 -TOPDIR=$(pwd) -mkdir tmp_unpack_dir -pushd tmp_unpack_dir - -tar xf %SOURCE0 -mkdir data ; cd data -tar xf ../data.tar.gz -%patch0 -p1 - -VERSION=%{version} rake gem -mv pkg/*gem $TOPDIR -popd -%endif - -mkdir -p .%{gemdir} +mkdir -p .%{gem_dir} export CONFIGURE_ARGS="--with-cflags='%{optflags}'" export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-pkg-config-dir=$(pwd)%{_libdir}/pkgconfig" gem install \ -V \ --local \ - --install-dir .%{gemdir} \ + --install-dir .%{gem_dir} \ --force \ --rdoc \ -%if 1 %{SOURCE0} -%else - ./%{gemname}-%{version}.gem -%endif find . -name \*.gem | xargs chmod 0644 %build # Move C extension library to some private directory -pushd .%{geminstdir} +pushd .%{gem_instdir} +%if ! %{ruby19} mkdir lib/ruby-gnome2 -mv lib/%{gemname}.so lib/ruby-gnome2/ -grep -rl '%{gemname}.so' . | \ +mv lib/%{gem_name}.so lib/ruby-gnome2/ +grep -rl '%{gem_name}.so' . | \ xargs sed -i \ - -e "\@require@s|'%{gemname}.so'|'ruby-gnome2/%{gemname}.so'|" \ - -e '\@require@s|"%{gemname}.so"|"ruby-gnome2/%{gemname}.so"|' + -e "\@require@s|'%{gem_name}.so'|'ruby-gnome2/%{gem_name}.so'|" \ + -e '\@require@s|"%{gem_name}.so"|"ruby-gnome2/%{gem_name}.so"|' +%endif # Fix up Rakefile for "gnome2-raketask" requirement sed -i -e "/require.*gnome2-raketask/s|^\(.*\)|begin\n \1\nrescue LoadError\n require 'rubygems'\n require 'gnome2-raketask'\nend\n|" \ @@ -123,15 +117,21 @@ sed -i -e "/glib-test-init/s|^.*$|require 'glib-test-init'|" \ %install # Once copy all -mkdir -p %{buildroot}%{gemdir} -cp -a .%{gemdir}/* \ - %{buildroot}%{gemdir}/ +mkdir -p %{buildroot}%{gem_dir} +cp -a .%{gem_dir}/* \ + %{buildroot}%{gem_dir}/ pushd %{buildroot} # move header files, C extension files to the correct directory -mkdir -p .%{ruby_sitearch}/ruby-gnome2/ -# mv .%{geminstdir}/lib/*.h .%{ruby_sitearch}/ -mv .%{geminstdir}/lib/ruby-gnome2/%{gemname}.so .%{ruby_sitearch}/ruby-gnome2/ + +%if ! %{ruby19} +mkdir -p .%{ruby_sitearch}/ruby-gnome2 +mv .%{gem_instdir}/lib/ruby-gnome2/%{gem_name}.so .%{ruby_sitearch}/ruby-gnome2/ +%else +mkdir -p .%{gem_extdir}/lib +mv .%{gem_instdir}/lib/%{gem_name}.so .%{gem_extdir}/lib +%endif + popd # move pkgconfig file @@ -142,8 +142,8 @@ install -cpm 644 ./%{_libdir}/pkgconfig/*.pc \ # Cleanups pushd %{buildroot} -rm -rf .%{geminstdir}/ext/ -rm -f .%{geminstdir}/extconf.rb +rm -rf .%{gem_instdir}/ext/ +rm -f .%{gem_instdir}/extconf.rb popd # The following method is completely copied from rubygem-gettext @@ -151,7 +151,7 @@ popd # # Create symlinks ## -## Note that before switching to gem %%{ruby_sitelib}/%%{gemname} +## Note that before switching to gem %%{ruby_sitelib}/%%{gem_name} ## already existed as a directory, so this cannot be replaced ## by symlink (cpio fails) ## Similarly, all directories under %%{ruby_sitelib} cannot be @@ -205,45 +205,52 @@ popd } -create_symlink_rec %{geminstdir}/lib %{ruby_sitelib} +%if ! %{ruby19} +create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib} +%endif %check -pushd .%{geminstdir} +pushd .%{gem_instdir} ruby -rubygems -Ilib test/load-test.rb %files %defattr(-,root,root,-) -%dir %{geminstdir} -%dir %{geminstdir}/lib/ -%dir %{geminstdir}/lib/%{gemname}/ +%dir %{gem_instdir} +%dir %{gem_instdir}/lib/ +%dir %{gem_instdir}/lib/%{gem_name}/ -%doc %{geminstdir}/[A-Z]* -%exclude %{geminstdir}/Rakefile +%doc %{gem_instdir}/[A-Z]* +%exclude %{gem_instdir}/Rakefile -%{geminstdir}/lib/%{gemname}.rb -%{geminstdir}/lib/%{gemname}/deprecated.rb +%{gem_instdir}/lib/%{gem_name}.rb +%{gem_instdir}/lib/%{gem_name}/deprecated.rb # %%ruby_sitearch/ruby-gnome2 is owned by rubygem-glib2 -%{ruby_sitearch}/ruby-gnome2/%{gemname}.so +%{ruby_sitearch}/ruby-gnome2/%{gem_name}.so -%{gemdir}/cache/%{gemname}-%{version}.gem -%{gemdir}/specifications/%{gemname}-%{version}.gemspec +%{gem_cache} +%{gem_spec} -%files -n ruby-%{gemname} +%if ! %{ruby19} +%files -n ruby-%{gem_name} %defattr(-,root,root,-) %{ruby_sitelib}/*.rb %{ruby_sitelib}/gio2/ +%endif %files devel %defattr(-,root,root,-) -%{_libdir}/pkgconfig/ruby-%{gemname}.pc +%{_libdir}/pkgconfig/ruby-%{gem_name}.pc %files doc %defattr(-,root,root,-) -%{gemdir}/doc/%{gemname}-%{version} -%{geminstdir}/Rakefile -%{geminstdir}/test/ +%{gem_docdir} +%{gem_instdir}/Rakefile +%{gem_instdir}/test/ %changelog +* Mon Jan 30 2012 Mamoru Tasaka - 1.1.2-1 +- 1.1.2 + * Sun Jan 15 2012 Mamoru Tasaka - 1.1.1-1 - 1.1.1 @@ -273,7 +280,7 @@ ruby -rubygems -Ilib test/load-test.rb * Sun Oct 31 2010 Mamoru Tasaka - 0.90.5-3 - 0.90.5 -- Move C extension so that "require %%gemname" works correctly +- Move C extension so that "require %%gem_name" works correctly * Sun Oct 24 2010 Mamoru Taska - 0.90.4-2 - Initial package diff --git a/sources b/sources index f993ca6..3c78b49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9cd10a853b37a33d838c538fa114f769 gio2-1.1.1.gem +56ff11f96fc5ff53ce460d2abdba2fc6 gio2-1.1.2.gem