[rubygem-gstreamer] 1.1.2

Mamoru Tasaka mtasaka at fedoraproject.org
Tue Jan 31 09:15:46 UTC 2012


commit 83084ce789f9756d4a6defa87f59a9854dda41ee
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Tue Jan 31 18:15:37 2012 +0900

    1.1.2

 .gitignore             |    1 +
 rubygem-gstreamer.spec |  138 +++++++++++++++++++++++++++++-------------------
 sources                |    2 +-
 3 files changed, 85 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 21cbc3f..383d258 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /gstreamer-1.0.3.gem
 /gstreamer-1.1.1.gem
+/gstreamer-1.1.2.gem
diff --git a/rubygem-gstreamer.spec b/rubygem-gstreamer.spec
index 6eb1e0d..19e8488 100644
--- a/rubygem-gstreamer.spec
+++ b/rubygem-gstreamer.spec
@@ -1,27 +1,36 @@
-%global		ruby_sitelib		%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%global		ruby_sitearch		%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+%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	rubyabi	1.8
+%global	header_dir	%{ruby_sitearch}
+%global	ruby19	0
+%endif
+
 
-%global		gemdir		%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global		gemname		gstreamer
+%global		gem_name		gstreamer
 %global		gemsoname	gst
-%global		geminstdir	%{gemdir}/gems/%{gemname}-%{version}
 
 %global		glibminver		1.1.0
 %global		obsoleteevr	0.90.7-1.999
 
-%global		rubyabi		1.8
 
 Summary:	Ruby binding of GStreamer
-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-devel
 BuildRequires:		rubygem-glib2-devel%{?_isa} >= %{glibminver}
 BuildRequires:		ruby-devel%{?_isa}
 BuildRequires:		gstreamer-plugins-base-devel%{?_isa}
@@ -32,11 +41,11 @@ BuildRequires:		gstreamer-plugins-good%{?_isa}
 BuildRequires:		rubygem(test-unit)
 Requires:	ruby(abi) = %{rubyabi}
 Requires:	rubygem(glib2) >= %{glibminver}
-Provides:	rubygem(%{gemname}) = %{version}-%{release}
+Provides:	rubygem(%{gem_name}) = %{version}-%{release}
 # Kill non-gem support on F-17+
 # Obsoletes but not provides
 %if 0%{?fedora} > 16
-Obsoletes:	ruby-%{gemname} < %{version}-%{release}
+Obsoletes:	ruby-%{gem_name} < %{version}-%{release}
 %endif
 
 
@@ -52,17 +61,17 @@ Requires:	%{name}%{?_isa} = %{version}-%{release}
 This package contains documentation for %{name}.
 
 %if 0%{?fedora} < 17
-%package	-n ruby-%{gemname}
+%package	-n ruby-%{gem_name}
 # Non-gem support is only for < F-17
-Summary:	Non-Gem support package for %{gemname}
+Summary:	Non-Gem support package for %{gem_name}
 Group:		Development/Languages
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 # Requires for corresponsing non-gem rpms
 Requires:	ruby(glib2)
-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}.
 %endif
 
 %package	devel
@@ -70,35 +79,35 @@ Summary:	Ruby/GStreamer development environment
 Group:		Development/Languages
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 # Obsoletes / Provides
-# ruby(%%{gemname}-devel) Provides is for compatibility
+# ruby(%%{gem_name}-devel) Provides is for compatibility
 # on F-15 and below
-Obsoletes:	ruby-%{gemname}-devel < %{obsoleteevr}
+Obsoletes:	ruby-%{gem_name}-devel < %{obsoleteevr}
 %if 0%{?fedora} < 16
-Provides:	ruby-%{gemname}-devel = %{version}-%{release}
-Provides:	ruby(%{gemname}-devel) = %{version}-%{release}
+Provides:	ruby-%{gem_name}-devel = %{version}-%{release}
+Provides:	ruby(%{gem_name}-devel) = %{version}-%{release}
 %endif
 
 %description devel
 Header files and libraries for building a extension library for the
-rubygem-%{gemname}
+rubygem-%{gem_name}
 
 %prep
 %setup -q -c -T
-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 \
 	%{SOURCE0}
 
 find . -name \*.gem | xargs chmod 0644
 
-pushd .%{geminstdir}
+pushd .%{gem_instdir}
 
 # Fix wrong shebang
 #grep -rl /usr/local/bin sample | \
@@ -112,13 +121,15 @@ popd
 
 %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 at s|'%{gemname}.so'|'ruby-gnome2/%{gemname}.so'|" \
-		-e '\@require at s|"%{gemname}.so"|"ruby-gnome2/%{gemname}.so"|'
+		-e "\@require at s|'%{gem_name}.so'|'ruby-gnome2/%{gem_name}.so'|" \
+		-e '\@require at 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|" \
@@ -126,15 +137,23 @@ sed -i -e "/require.*gnome2-raketask/s|^\(.*\)|begin\n  \1\nrescue LoadError\n
 
 %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/
+# mv .%%{gem_instdir}/lib/*.h .%%{ruby_sitearch}/
+
+%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
@@ -145,8 +164,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
 
 %if 0%{?fedora} < 17
@@ -155,7 +174,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
@@ -209,11 +228,11 @@ popd
 
 }
 
-create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
+create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
 %endif
 
 %check
-pushd .%{geminstdir}
+pushd .%{gem_instdir}
 
 mkdir TMPDIR
 cd TMPDIR
@@ -225,37 +244,46 @@ cd ..
 ruby -Ilib:test test/run-test.rb --verbose || echo "Investigate this later"
 
 %files
-%dir	%{geminstdir}
-%dir	%{geminstdir}/lib/
-
-%doc	%{geminstdir}/[A-Z]*
-%exclude	%{geminstdir}/Rakefile
-
-%{geminstdir}/lib/%{gemsoname}.rb
+%dir	%{gem_instdir}
+%dir	%{gem_instdir}/lib/
+
+%doc	%{gem_instdir}/[A-Z]*
+%exclude	%{gem_instdir}/Rakefile
+
+%{gem_instdir}/lib/%{gemsoname}.rb
+%if %{ruby19}
+%dir	%{gem_extdir}
+%dir	%{gem_extdir}/lib
+%{gem_extdir}/lib/%{gem_name}.so
+%else
 # %%ruby_sitearch/ruby-gnome2 is owned by rubygem-glib2
-%{ruby_sitearch}/ruby-gnome2/%{gemname}.so
+%{ruby_sitearch}/ruby-gnome2/%{gem_name}.so
+%endif
 
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%{gem_cache}
+%{gem_spec}
 
 %if 0%{?fedora} < 17
-%files	-n ruby-%{gemname}
+%files	-n ruby-%{gem_name}
 %defattr(-,root,root,-)
 %{ruby_sitelib}/*.rb
 %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}/sample/
-%{geminstdir}/test/
+%{gem_dir}/doc/%{gem_name}-%{version}
+%{gem_instdir}/Rakefile
+%{gem_instdir}/sample/
+%{gem_instdir}/test/
 
 %changelog
+* Tue Jan 31 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.2-1
+- 1.1.2
+
 * Sun Jan 15 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.1-1
 - 1.1.1
 
diff --git a/sources b/sources
index b8c9589..63d05cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96ff0df83ca20163916147ee9b79fe23  gstreamer-1.1.1.gem
+7eccc75d555abc76c0cbe2a9e36615e6  gstreamer-1.1.2.gem


More information about the scm-commits mailing list