diff --git a/.gitignore b/.gitignore index 3e3fefc..2cbf29b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /gstreamer-1.2.4.gem /gstreamer-1.2.5.gem /gstreamer-1.2.6.gem +/gstreamer-2.0.2.gem diff --git a/rubygem-gstreamer.spec b/rubygem-gstreamer.spec index 08e2f20..1afc0b8 100644 --- a/rubygem-gstreamer.spec +++ b/rubygem-gstreamer.spec @@ -1,63 +1,39 @@ -%if 0%{?fedora} >= 17 -%if 0%{?fedora} < 19 -%global rubyabi 1.9.1 -%endif %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 gem_name gstreamer -%global gemsoname gst +%global gemsoname gst -%global glibminver 1.2.0 +%global glibminver 2.0.0 %global obsoleteevr 0.90.7-1.999 Summary: Ruby binding of GStreamer Name: rubygem-%{gem_name} -Version: 1.2.6 -Release: 2%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Group: Development/Languages # from README License: LGPLv2 URL: http://ruby-gnome2.sourceforge.jp/ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem -%if 0%{?fedora} >= 19 Requires: ruby(release) BuildRequires: ruby(release) -%else -Requires: ruby(abi) = %{rubyabi} -Requires: ruby -BuildRequires: ruby(abi) = %{rubyabi} -BuildRequires: ruby -%endif - -BuildRequires: rubygems-devel -BuildRequires: rubygem-glib2-devel%{?_isa} >= %{glibminver} -BuildRequires: ruby-devel%{?_isa} -BuildRequires: gstreamer-plugins-base-devel%{?_isa} -# %%check -# test/test_caps.rb: smpte = Gst::ElementFactory.find("smpte") -BuildRequires: gstreamer-plugins-good%{?_isa} -# test/test_element.rb:70 assert_boolean -BuildRequires: rubygem(test-unit) + +BuildRequires: rubygems-devel +BuildRequires: rubygem-glib2-devel%{?_isa} >= %{glibminver} +BuildRequires: rubygem-gobject-introspection-devel%{?isa} >= %{glibminver} +BuildRequires: ruby-devel%{?_isa} +BuildRequires: pkgconfig(gstreamer-1.0) Requires: rubygem(glib2) >= %{glibminver} +Requires: rubygem(cairo) +Requires: rubygem(gdk_pixbuf2) >= %{glibminver} +Requires: rubygem(gobject-introspection) +Requires: rubygem(pango) >= %{glibminver} Provides: rubygem(%{gem_name}) = %{version}-%{release} # Kill non-gem support on F-17+ # Obsoletes but not provides -%if 0%{?fedora} > 16 Obsoletes: ruby-%{gem_name} < %{version}-%{release} -%endif - %description Ruby/GStreamer is a Ruby binding of GStreamer. @@ -70,20 +46,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description doc This package contains documentation for %{name}. -%if 0%{?fedora} < 17 -%package -n ruby-%{gem_name} -# Non-gem support is only for < F-17 -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(%{gem_name}) = %{version}-%{release} - -%description -n ruby-%{gem_name} -This package provides non-Gem support for %{gem_name}. -%endif - %package devel Summary: Ruby/GStreamer development environment Group: Development/Languages @@ -92,10 +54,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} # ruby(%%{gem_name}-devel) Provides is for compatibility # on F-15 and below Obsoletes: ruby-%{gem_name}-devel < %{obsoleteevr} -%if 0%{?fedora} < 16 -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 @@ -126,18 +84,6 @@ popd %build # Move C extension library to some private directory pushd .%{gem_instdir} -%if ! %{ruby19} -mkdir lib/ruby-gnome2 -mv lib/%{gem_name}.so lib/ruby-gnome2/ -grep -rl '%{gem_name}.so' . | \ - xargs sed -i \ - -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|" \ - Rakefile %install # Once copy all @@ -147,21 +93,12 @@ cp -a .%{gem_dir}/* \ pushd %{buildroot} # move header files, C extension files to the correct directory -mkdir -p .%{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_mri}/lib mv .%{gem_instdir}/lib/%{gem_name}.so .%{gem_extdir_mri}/lib -%endif - popd # move pkgconfig file -mkdir %{buildroot}%{_libdir}/pkgconfig +mkdir -p %{buildroot}%{_libdir}/pkgconfig install -cpm 644 ./%{_libdir}/pkgconfig/*.pc \ %{buildroot}%{_libdir}/pkgconfig/ @@ -172,80 +109,9 @@ rm -rf .%{gem_instdir}/ext/ rm -f .%{gem_instdir}/extconf.rb popd -%if 0%{?fedora} < 17 -# The following method is completely copied from rubygem-gettext -# spec file -# -# Create symlinks -## -## 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 -## replaced by symlink -# - -create_symlink_rec(){ - -ORIGBASEDIR=$1 -TARGETBASEDIR=$2 - -## First calculate relative path of ORIGBASEDIR -## from TARGETBASEDIR -TMPDIR=$TARGETBASEDIR -BACKDIR= -DOWNDIR= -num=0 -nnum=0 -while true -do - num=$((num+1)) - TMPDIR=$(echo $TMPDIR | sed -e 's|/[^/][^/]*$||') - DOWNDIR=$(echo $ORIGBASEDIR | sed -e "s|^$TMPDIR||") - if [ x$DOWNDIR != x$ORIGBASEDIR ] - then - nnum=0 - while [ $nnum -lt $num ] - do - BACKDIR="../$BACKDIR" - nnum=$((nnum+1)) - done - break - fi -done - -RELBASEDIR=$( echo $BACKDIR/$DOWNDIR | sed -e 's|//*|/|g' ) - -## Next actually create symlink -pushd %{buildroot}/$ORIGBASEDIR -find . -type f | while read f -do - DIRNAME=$(dirname $f) - BACK2DIR=$(echo $DIRNAME | sed -e 's|/[^/][^/]*|/..|g') - mkdir -p %{buildroot}${TARGETBASEDIR}/$DIRNAME - LNNAME=$(echo $BACK2DIR/$RELBASEDIR/$f | \ - sed -e 's|^\./||' | sed -e 's|//|/|g' | \ - sed -e 's|/\./|/|' ) - ln -s -f $LNNAME %{buildroot}${TARGETBASEDIR}/$f -done -popd - -} - -create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib} -%endif - %check pushd .%{gem_instdir} -mkdir TMPDIR -cd TMPDIR -ln -sf /bin/true make -PATH=$(pwd):$PATH -cd .. - -# Need check for test failure -ruby -Ilib:test test/run-test.rb --verbose || echo "Investigate this later" %files %dir %{gem_instdir} @@ -255,24 +121,14 @@ ruby -Ilib:test test/run-test.rb --verbose || echo "Investigate this later" %exclude %{gem_instdir}/Rakefile %{gem_instdir}/lib/%{gemsoname}.rb -%if %{ruby19} +%{gem_instdir}/lib/%{gemsoname}/ %dir %{gem_extdir_mri} %dir %{gem_extdir_mri}/lib %{gem_extdir_mri}/lib/%{gem_name}.so -%else -# %%ruby_sitearch/ruby-gnome2 is owned by rubygem-glib2 -%{ruby_sitearch}/ruby-gnome2/%{gem_name}.so -%endif %{gem_cache} %{gem_spec} -%if 0%{?fedora} < 17 -%files -n ruby-%{gem_name} -%defattr(-,root,root,-) -%{ruby_sitelib}/*.rb -%endif - %files devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/ruby-%{gem_name}.pc @@ -282,9 +138,11 @@ ruby -Ilib:test test/run-test.rb --verbose || echo "Investigate this later" %{gem_dir}/doc/%{gem_name}-%{version} %{gem_instdir}/Rakefile %{gem_instdir}/sample/ -%{gem_instdir}/test/ %changelog +* Fri Aug 16 2013 Mamoru TASAKA - 2.0.2-1 +- 2.0.2 + * Sun Aug 04 2013 Fedora Release Engineering - 1.2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index b57d186..a3a3c19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f03adaa73224783107435ad492dfb34d gstreamer-1.2.6.gem +dab355ad64811d64bccc6aa6dd879a5e gstreamer-2.0.2.gem