rpms/ruby-RMagick/F-10 .cvsignore, 1.19, 1.20 ruby-RMagick.spec, 1.24, 1.25 sources, 1.19, 1.20

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/ruby-RMagick/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15241/F-10

Modified Files:
	.cvsignore ruby-RMagick.spec sources 
Log Message:
* Thu May 21 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.9.2-1
- 2.9.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	4 Feb 2009 17:56:22 -0000	1.19
+++ .cvsignore	21 May 2009 13:24:32 -0000	1.20
@@ -1 +1 @@
-RMagick-2.9.1.tar.bz2
+RMagick-2.9.2.tar.bz2


Index: ruby-RMagick.spec
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/ruby-RMagick.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ruby-RMagick.spec	4 Feb 2009 17:56:22 -0000	1.24
+++ ruby-RMagick.spec	21 May 2009 13:24:32 -0000	1.25
@@ -1,23 +1,23 @@
-%{!?ruby_sitelib:	%define ruby_sitelib	%(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
-%{!?ruby_sitearch:	%define ruby_sitearch	%(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
-
-# Workaround for ruby side bug
-%{!?ruby_arch:		%define ruby_arch	%(ruby -rrbconfig -e "puts Config::CONFIG['archdir']")}
-
+%{!?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		51094
+%define		repoid		56819
 
-%define		IMver		6.3.5
+%define setIMver() \
+%if 0%{?fedora} == %1 \
+BuildRequires:	ImageMagick-devel = %2\
+Requires:		ImageMagick = %2\
+%endif \
+%{nil}
 
-%define		mainver		2.9.1
+%define		mainver		2.9.2
 %undefine		betaver		
 %define		fedorarel	1
 
 
-
 Name:		ruby-%{modname}
 Version:	%{mainver}
 Release:	%{fedorarel}%{?betaver:.%betaver}%{?dist}
@@ -35,8 +35,15 @@ BuildRequires:	ruby(abi) = %{rubyabi}
 # libwmf <-> libwmf-lite split
 BuildRequires:	%{_bindir}/wmf2eps
 # For ImageMagick config/type.xml
-BuildRequires:	ImageMagick-devel >= %{IMver}
-Requires:	ImageMagick >= %{IMver}
+# And due to bug 500565 (i.e. test_Magick_version() in rmmain.c)
+BuildRequires:	ImageMagick-devel
+Requires:	ImageMagick
+
+%setIMver 12 6.5.1.2
+%setIMver 11 6.5.1.2
+%setIMver 10 6.4.0.10
+%setIMver  9 6.3.8.1
+
 Requires:	ruby(abi) = %{rubyabi}
 Provides:	ruby(%{modname}) = %{version}-%{release}
 
@@ -99,6 +106,19 @@ touch -r README.html DOCDIR/README.html
 %doc DOCDIR/HTML/*
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ruby-RMagick/F-10/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	4 Feb 2009 17:56:22 -0000	1.19
+++ sources	21 May 2009 13:24:32 -0000	1.20
@@ -1 +1 @@
-a10453e29b47386f576a28048d1bc2ad  RMagick-2.9.1.tar.bz2
+3b10f1c166823e83d0d805cb4b82f120  RMagick-2.9.2.tar.bz2