rpms/ruby-RMagick/EL-5 .cvsignore, 1.21, 1.22 ruby-RMagick.spec, 1.32, 1.33 sources, 1.21, 1.22
Robert Scheck
robert at fedoraproject.org
Sun Aug 2 17:04:29 UTC 2009
Author: robert
Update of /cvs/pkgs/rpms/ruby-RMagick/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22093
Modified Files:
.cvsignore ruby-RMagick.spec sources
Log Message:
Initial import of ruby-RMagick for EPEL 5
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-RMagick/EL-5/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore 27 Jun 2009 19:02:33 -0000 1.21
+++ .cvsignore 2 Aug 2009 17:04:29 -0000 1.22
@@ -1 +1 @@
-RMagick-2.10.0.tar.bz2
+RMagick-1.15.17.tar.bz2
Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-RMagick/EL-5/ruby-RMagick.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ruby-RMagick.spec 25 Jul 2009 07:17:53 -0000 1.32
+++ ruby-RMagick.spec 2 Aug 2009 17:04:29 -0000 1.33
@@ -1,50 +1,21 @@
%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
-%define rubyabi 1.8
-
%define modname RMagick
-%define repoid 58959
-
-%define setIMver() \
-%if 0%{?fedora} == %1 \
-BuildRequires: ImageMagick-devel = %2\
-Requires: ImageMagick = %2\
-%endif \
-%{nil}
-
-%define mainver 2.10.0
-%undefine betaver
-%define fedorarel 2
-
+%define repoid 47971
Name: ruby-%{modname}
-Version: %{mainver}
-Release: %{fedorarel}%{?betaver:.%betaver}%{?dist}
+Version: 1.15.17
+Release: 1%{?dist}
Summary: Graphics Processing for Ruby and Ruby on Rails
Group: Development/Languages
License: MIT
URL: http://rmagick.rubyforge.org/
-Source0: http://rubyforge.org/frs/download.php/%{repoid}/%{modname}-%{mainver}%{?betaver:-%betaver}.tar.bz2
+Source0: http://rubyforge.org/frs/download.php/%{repoid}/%{modname}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ruby
-BuildRequires: ruby-devel
-BuildRequires: ruby(abi) = %{rubyabi}
-# libwmf <-> libwmf-lite split
-BuildRequires: %{_bindir}/wmf2eps
-# For ImageMagick config/type.xml
-# And due to bug 500565 (i.e. test_Magick_version() in rmmain.c)
-BuildRequires: ImageMagick-devel
-Requires: ImageMagick
-
-%setIMver 12 6.5.3.7
-%setIMver 11 6.5.1.2
-%setIMver 10 6.4.0.10
-%setIMver 9 6.3.8.1
-
-Requires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby, ruby-devel, ImageMagick-devel >= 6.0.0, libwmf
Provides: ruby(%{modname}) = %{version}-%{release}
%description
@@ -55,141 +26,50 @@ ImageMagick and GraphicsMagick image pro
Summary: Documentation for %{name}
Group: Documentation
-%description doc
+%description doc
This package contains documentaton files for %{name}.
%prep
%setup -q -n %{modname}-%{version}
%build
-export CFLAGS="$RPM_OPT_FLAGS"
-export RUBYLIB=$(pwd)/ext/RMagick
-ruby setup.rb config \
- --prefix=%{_prefix} \
- --siteruby=%{ruby_sitelib} \
- --siterubyverarch=%{ruby_sitearch} \
- --doc-dir=$(pwd)/DOCDIR/HTML
-ruby setup.rb setup
+%configure --with-so-dir=%{ruby_sitearch} --with-site-ruby=%{ruby_sitelib} --disable-htmldoc
+make %{?_smp_mflags}
%install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__rm} -rf DOCDIR
-ruby setup.rb install \
- --prefix=$RPM_BUILD_ROOT
-
-# Permission
-find $RPM_BUILD_ROOT -name \*.so | xargs %{__chmod} 0755
-
-# Fix up DOCDIR
-find DOCDIR -name .rmagick -or -name .examples | \
- xargs %{__rm} -f
-
-%{__cp} -p ChangeLog DOCDIR/
-%{__sed} -e 's|ISO-8859-1|UTF-8|' README.html | \
- iconv -f ISO-8859-1 -t UTF-8 > \
- DOCDIR/README.html
-touch -r README.html DOCDIR/README.html
+rm -rf $RPM_BUILD_ROOT
+ruby setup.rb install --prefix=$RPM_BUILD_ROOT
+
+# Correct wrong permissions
+chmod 755 $RPM_BUILD_ROOT%{ruby_sitearch}/%{modname}.so
+
+# Switch from non-UTF-8 to UTF-8
+sed -e 's at ISO-8859-1@UTF-8@' README.html | iconv -f iso-8859-1 -t utf-8 > README.html.iso
+touch -r README.html README.html.iso
+mv -f README.html.iso README.html
+
+# At the correct shebank to the example files
+for file in doc/ex/*.rb; do
+ sed -e 's@/\(usr/local\|home/software/ruby-1.6.8\)/bin/ruby@%{_bindir}/ruby at g' $file > $file.new
+ touch -r $file $file.new
+ mv -f $file.new $file
+done
%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc DOCDIR/ChangeLog DOCDIR/README.html
-
+%doc ChangeLog README.html
%{ruby_sitelib}/%{modname}.rb
%{ruby_sitelib}/rvg/
-%{ruby_sitearch}/%{modname}2.so
+%{ruby_sitearch}/%{modname}.so
-%files doc
+%files doc
%defattr(-,root,root,-)
-%doc DOCDIR/HTML/*
+%doc doc/*
%changelog
-* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10.0-2
-- F-12: Mass rebuild
-
-* Sun Jun 28 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.10.0-1
-- 2.10.0
-
-* Wed Jun 17 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.2-3
-- F-12: Rebuild to create valid debuginfo rpm again (ref: bug 505774)
-
-* Tue Jun 16 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.2-2
-- F-12: Rebuild against new ImageMagick
-
-* Thu May 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.2-1
-- 2.9.2
-
-* Thu May 14 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.1-3
-- F-11: Rebuild against new ImageMagick
-- Make ImageMagick requirement very strict (bug 500565)
-
-* Mon Mar 9 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
-- F-11: Rebuild against new ImageMagick
-
-* Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.1-2
-- %%global-ize "nested" macro
-
-* Thu Feb 5 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.1-1
-- 2.9.1
-
-* Thu Jan 22 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.0-1
-- 2.9.0
-
-* Wed Dec 10 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.8.0-1
-- 2.8.0
-
-* Wed Nov 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.7.2-1
-- 2.7.2
-
-* Wed Nov 5 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.7.1-1
-- 2.7.1
-
-* Wed Oct 1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.7.0-1
-- 2.7.0
-
-* Thu Sep 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.6.0-1
-- 2.6.0
-
-* Thu Jul 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.2-1
-- 2.5.2
-
-* Sun Jun 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.1-1
-- 2.5.1
-
-* Thu Jun 19 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.5.0-1
-- 2.5.0
-
-* Sun Jun 8 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.4.0-1
-- 2.4.0
-
-* Mon Apr 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-2
-- Rebuild against ImageMagick 6.4.0+ (F-10)
-- BR: libwmf (actually %%_bindir/wmf2eps) explicitly
- ( related to bug 432651 )
-
-* Thu Apr 3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.3.0-1
-- 2.3.0
-
-* Mon Feb 18 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.2-1
-- 2.2.2
-
-* Sun Feb 3 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.2.0-1
-- 2.2.0
-
-* Fri Jan 11 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-1
-- 2.1.0
-
-* Fri Dec 28 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-3
-- 2.0.0
-- Workaround for ruby site bug related to static archive removal.
-
-* Sun Nov 4 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.3.beta5
-- 2.0.0 beta 5
-
-* Wed Oct 3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.3.beta4
-- Spec file cleanup
-
-* Sat Sep 22 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.0-0.1.beta4
-- Initial packaging
+* Fri Jul 31 2009 Robert Scheck <robert at fedoraproject.org> 1.15.17-1
+- Upgrade to 1.15.17
+- Initial spec file for Fedora and Red Hat Enterprise Linux
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ruby-RMagick/EL-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources 27 Jun 2009 19:02:33 -0000 1.21
+++ sources 2 Aug 2009 17:04:29 -0000 1.22
@@ -1 +1 @@
-0f23af161c186a3ae316b759ea2c4f66 RMagick-2.10.0.tar.bz2
+138a9b92a80a1386b079bed7d7f7d878 RMagick-1.15.17.tar.bz2
More information about the scm-commits
mailing list