From 3235fcaf12125867ebb1382d9755f9ab096a8d81 Mon Sep 17 00:00:00 2001
From: Jose Pedro Oliveira <jpo@fedoraproject.org>
Date: Wed, 23 Nov 2005 15:29:02 +0000
Subject: [PATCH] New file dependency: .../X11/rgb.txt. The above file also is
 changing     location in FC5. Problem description and patches: see ticket
 #173977.

---
 perl-Image-Info.spec | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/perl-Image-Info.spec b/perl-Image-Info.spec
index 894a89d..b37dc96 100644
--- a/perl-Image-Info.spec
+++ b/perl-Image-Info.spec
@@ -1,9 +1,8 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
+%define rgbtxt  %{_datadir}/X11/rgb.txt
 
 Name:           perl-Image-Info
 Version:        1.16
-Release:        4
-
+Release:        6%{?dist}
 Summary:        Image meta information extraction module for Perl
 
 Group:          Development/Libraries
@@ -16,7 +15,8 @@ Patch2:         Image-Info-1.16-XPM.pm.patch
 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 @@ various types of image files.
 %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 @@ find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -61,7 +63,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Wed Nov 23 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.16-6
+- Add dependency on rgb.txt, adjust its location for FC5.
+- 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