[rubygem-gstreamer/f16] Revert "1.1.4"
Mamoru Tasaka
mtasaka at fedoraproject.org
Mon Aug 13 13:53:24 UTC 2012
commit 189af7fbc6eb4e043f0797ac5ee9f6c7a5d996da
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date: Mon Aug 13 22:53:17 2012 +0900
Revert "1.1.4"
This reverts commit 5f31ea83933773a608218c3b7ceb45faecab602d.
.gitignore | 1 -
rubygem-gstreamer.spec | 186 ++++++++++++++++++++++-------------------------
sources | 2 +-
3 files changed, 88 insertions(+), 101 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3e73c13..641e395 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
/gstreamer-1.0.3.gem
-/gstreamer-1.1.4.gem
diff --git a/rubygem-gstreamer.spec b/rubygem-gstreamer.spec
index e94dc2d..6c0519e 100644
--- a/rubygem-gstreamer.spec
+++ b/rubygem-gstreamer.spec
@@ -1,36 +1,49 @@
-%if 0%{?fedora} >= 17
-%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 ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+%global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
-%global gem_name gstreamer
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global gemname gstreamer
%global gemsoname gst
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
-%global glibminver 1.1.4
+%global glibminver 0.90.7
%global obsoleteevr 0.90.7-1.999
+%global rubyabi 1.8
Summary: Ruby binding of GStreamer
-Name: rubygem-%{gem_name}
-Version: 1.1.4
-Release: 1%{?dist}
+Name: rubygem-%{gemname}
+Version: 1.0.3
+Release: 3%{?dist}
Group: Development/Languages
# from README
License: LGPLv2
URL: http://ruby-gnome2.sourceforge.jp/
-Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
+Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+
+# test/test_buffer.rb:164:in `test_span'
+# ArgumentError: assertion message must be String, Proc or
+# Test::Unit::Assertions::AssertionMessage: <7>(<Fixnum>)
+# https://github.com/ruby-gnome2/ruby-gnome2/issues/87
+Patch0: rubygem-gstreamer-1.0.3-assert-length.patch
+# test_caps:
+# GStreamer-CRITICAL **: gst_buffer_set_caps: assertion `caps == NULL
+# || GST_CAPS_IS_SIMPLE (caps)' failed
+# https://github.com/ruby-gnome2/ruby-gnome2/issues/86
+Patch1: rubygem-gstreamer-1.0.3-fail-with-gst_buffer_set_caps.patch
+# test/test_value.rb:35
+# https://github.com/ruby-gnome2/ruby-gnome2/issues/89
+Patch2: rubygem-gstreamer-1.0.3-set_flaction_range.patch
+# test/test_clock.rb:3
+# <TypeError> exception expected but none was thrown.
+# https://github.com/ruby-gnome2/ruby-gnome2/issues/88
+Patch3: rubygem-gstreamer-1.0.3-test_clock_omit.patch
+# test_state(TestElement) [./test/test_element.rb:50]:
+# sometimes fails with #<Gst::StateChangeReturn failure>
+# https://github.com/ruby-gnome2/ruby-gnome2/issues/91
+Patch4: rubygem-gstreamer-1.0.3-async-timeout.patch
BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: rubygems-devel
BuildRequires: rubygem-glib2-devel%{?_isa} >= %{glibminver}
BuildRequires: ruby-devel%{?_isa}
BuildRequires: gstreamer-plugins-base-devel%{?_isa}
@@ -41,11 +54,11 @@ BuildRequires: gstreamer-plugins-good%{?_isa}
BuildRequires: rubygem(test-unit)
Requires: ruby(abi) = %{rubyabi}
Requires: rubygem(glib2) >= %{glibminver}
-Provides: rubygem(%{gem_name}) = %{version}-%{release}
+Provides: rubygem(%{gemname}) = %{version}-%{release}
# Kill non-gem support on F-17+
# Obsoletes but not provides
%if 0%{?fedora} > 16
-Obsoletes: ruby-%{gem_name} < %{version}-%{release}
+Obsoletes: ruby-%{gemname} < %{version}-%{release}
%endif
@@ -61,17 +74,17 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This package contains documentation for %{name}.
%if 0%{?fedora} < 17
-%package -n ruby-%{gem_name}
+%package -n ruby-%{gemname}
# Non-gem support is only for < F-17
-Summary: Non-Gem support package for %{gem_name}
+Summary: Non-Gem support package for %{gemname}
Group: Development/Languages
Requires: %{name}%{?_isa} = %{version}-%{release}
# Requires for corresponsing non-gem rpms
Requires: ruby(glib2)
-Provides: ruby(%{gem_name}) = %{version}-%{release}
+Provides: ruby(%{gemname}) = %{version}-%{release}
-%description -n ruby-%{gem_name}
-This package provides non-Gem support for %{gem_name}.
+%description -n ruby-%{gemname}
+This package provides non-Gem support for %{gemname}.
%endif
%package devel
@@ -79,35 +92,42 @@ Summary: Ruby/GStreamer development environment
Group: Development/Languages
Requires: %{name}%{?_isa} = %{version}-%{release}
# Obsoletes / Provides
-# ruby(%%{gem_name}-devel) Provides is for compatibility
+# ruby(%%{gemname}-devel) Provides is for compatibility
# on F-15 and below
-Obsoletes: ruby-%{gem_name}-devel < %{obsoleteevr}
+Obsoletes: ruby-%{gemname}-devel < %{obsoleteevr}
%if 0%{?fedora} < 16
-Provides: ruby-%{gem_name}-devel = %{version}-%{release}
-Provides: ruby(%{gem_name}-devel) = %{version}-%{release}
+Provides: ruby-%{gemname}-devel = %{version}-%{release}
+Provides: ruby(%{gemname}-devel) = %{version}-%{release}
%endif
%description devel
Header files and libraries for building a extension library for the
-rubygem-%{gem_name}
+rubygem-%{gemname}
%prep
%setup -q -c -T
-mkdir -p .%{gem_dir}
+mkdir -p .%{gemdir}
export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-pkg-config-dir=$(pwd)%{_libdir}/pkgconfig"
gem install \
-V \
--local \
- --install-dir .%{gem_dir} \
+ --install-dir .%{gemdir} \
--force \
--rdoc \
%{SOURCE0}
find . -name \*.gem | xargs chmod 0644
-pushd .%{gem_instdir}
+pushd .%{geminstdir}
+
+# Patches
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
# Fix wrong shebang
#grep -rl /usr/local/bin sample | \
@@ -121,15 +141,13 @@ popd
%build
# Move C extension library to some private directory
-pushd .%{gem_instdir}
-%if ! %{ruby19}
+pushd .%{geminstdir}
mkdir lib/ruby-gnome2
-mv lib/%{gem_name}.so lib/ruby-gnome2/
-grep -rl '%{gem_name}.so' . | \
+mv lib/%{gemsoname}.so lib/ruby-gnome2/
+grep -rl '%{gemsoname}.so' . | \
xargs sed -i \
- -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
+ -e "\@require at s|'%{gemsoname}.so'|'ruby-gnome2/%{gemsoname}.so'|" \
+ -e '\@require at s|"%{gemsoname}.so"|"ruby-gnome2/%{gemsoname}.so"|'
# 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|" \
@@ -137,23 +155,15 @@ sed -i -e "/require.*gnome2-raketask/s|^\(.*\)|begin\n \1\nrescue LoadError\n
%install
# Once copy all
-mkdir -p %{buildroot}%{gem_dir}
-cp -a .%{gem_dir}/* \
- %{buildroot}%{gem_dir}/
+mkdir -p %{buildroot}%{gemdir}
+cp -a .%{gemdir}/* \
+ %{buildroot}%{gemdir}/
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}/lib
-mv .%{gem_instdir}/lib/%{gem_name}.so .%{gem_extdir}/lib
-%endif
-
+# mv .%%{geminstdir}/lib/*.h .%%{ruby_sitearch}/
+mv .%{geminstdir}/lib/ruby-gnome2/%{gemsoname}.so .%{ruby_sitearch}/ruby-gnome2/
popd
# move pkgconfig file
@@ -164,8 +174,8 @@ install -cpm 644 ./%{_libdir}/pkgconfig/*.pc \
# Cleanups
pushd %{buildroot}
-rm -rf .%{gem_instdir}/ext/
-rm -f .%{gem_instdir}/extconf.rb
+rm -rf .%{geminstdir}/ext/
+rm -f .%{geminstdir}/extconf.rb
popd
%if 0%{?fedora} < 17
@@ -174,7 +184,7 @@ popd
#
# Create symlinks
##
-## Note that before switching to gem %%{ruby_sitelib}/%%{gem_name}
+## Note that before switching to gem %%{ruby_sitelib}/%%{gemname}
## already existed as a directory, so this cannot be replaced
## by symlink (cpio fails)
## Similarly, all directories under %%{ruby_sitelib} cannot be
@@ -228,11 +238,11 @@ popd
}
-create_symlink_rec %{gem_instdir}/lib %{ruby_sitelib}
+create_symlink_rec %{geminstdir}/lib %{ruby_sitelib}
%endif
%check
-pushd .%{gem_instdir}
+pushd .%{geminstdir}
mkdir TMPDIR
cd TMPDIR
@@ -240,62 +250,40 @@ 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"
+ruby -Ilib:test test/run-test.rb --verbose
%files
-%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
+%dir %{geminstdir}
+%dir %{geminstdir}/lib/
+
+%doc %{geminstdir}/[A-Z]*
+%exclude %{geminstdir}/Rakefile
+
+%{geminstdir}/lib/%{gemsoname}.rb
# %%ruby_sitearch/ruby-gnome2 is owned by rubygem-glib2
-%{ruby_sitearch}/ruby-gnome2/%{gem_name}.so
-%endif
+%{ruby_sitearch}/ruby-gnome2/%{gemsoname}.so
-%{gem_cache}
-%{gem_spec}
+%{gemdir}/cache/%{gemname}-%{version}.gem
+%{gemdir}/specifications/%{gemname}-%{version}.gemspec
%if 0%{?fedora} < 17
-%files -n ruby-%{gem_name}
+%files -n ruby-%{gemname}
%defattr(-,root,root,-)
%{ruby_sitelib}/*.rb
%endif
%files devel
%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/ruby-%{gem_name}.pc
+%{_libdir}/pkgconfig/ruby-%{gemname}.pc
%files doc
%defattr(-,root,root,-)
-%{gem_dir}/doc/%{gem_name}-%{version}
-%{gem_instdir}/Rakefile
-%{gem_instdir}/sample/
-%{gem_instdir}/test/
+%{gemdir}/doc/%{gemname}-%{version}
+%{geminstdir}/Rakefile
+%{geminstdir}/sample/
+%{geminstdir}/test/
%changelog
-* Mon Aug 13 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.4-1
-- 1.1.4
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Apr 16 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.3-2
-- 1.1.3
-
-* Tue Jan 31 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.2-2
-- 1.1.2
-
-* Sun Jan 15 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.1-1
-- 1.1.1
-
* Sat Dec 31 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.0.3-3
- Rescue test failure
diff --git a/sources b/sources
index 17318ca..13e5ac5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d459b19f640b4564b7cb251246850e4e gstreamer-1.1.4.gem
+a0b94eafefeb79aeafb8aec3127bd9ee gstreamer-1.0.3.gem
More information about the scm-commits
mailing list