rpms/perl-Image-Info/FC-3 perl-Image-Info.spec,1.4,1.5

[Jose Pedro Oliveira (jpo)]

Author: jpo

Update of /cvs/extras/rpms/perl-Image-Info/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28053/FC-3

Modified Files:
	perl-Image-Info.spec 
Log Message:
New file dependency: .../X11/rgb.txt.
The above file also is changing location in FC5.
Problem description and patches: see ticket #173977.



Index: perl-Image-Info.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-Info/FC-3/perl-Image-Info.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Image-Info.spec	10 Dec 2004 22:03:08 -0000	1.4
+++ perl-Image-Info.spec	23 Nov 2005 15:28:51 -0000	1.5
@@ -1,9 +1,8 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+%define rgbtxt  %{_prefix}/X11R6/lib/X11/rgb.txt
 
 Name:           perl-Image-Info
 Version:        1.16
-Release:        3
-Epoch:          0
+Release:        5%{?dist}
 Summary:        Image meta information extraction module for Perl
 
 Group:          Development/Libraries
@@ -16,7 +15,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl
+Requires:       %{rgbtxt}
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -30,6 +30,8 @@
 %patch1 -p1
 %patch2 -p1
 chmod 644 Changes README exifdump imgdump
+%{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \
+    lib/Image/Info/XPM.pm
 
 
 %build
@@ -45,7 +47,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -61,6 +63,13 @@
 
 
 %changelog
+* Wed Nov 23 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.16-5
+- Add dependency on rgb.txt.
+- Specfile cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.16-4
+- rebuilt
+
 * Thu Jul  1 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0:1.16-0.fdr.3
 - Reverted Image::Xbm and Image::Xpm patches.
 - Patched Image::Info::XBM.pm and Image::Info::XPM.pm instead.