From a2d1fe6a9f4f470cdf235914c8ad0847703a85d0 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Mar 14 2008 11:56:28 +0000
Subject: - package rgb.txt for pnmtopng (#313301)

- drop useless xorg-x11-server-utils BR

---

diff --git a/netpbm-10.35-rgbtxt.patch b/netpbm-10.35-rgbtxt.patch
new file mode 100644
index 0000000..6b3a43c
--- /dev/null
+++ b/netpbm-10.35-rgbtxt.patch
@@ -0,0 +1,16 @@
+diff -up netpbm-10.35.40/pm_config.in.h.rgbtxt netpbm-10.35.40/pm_config.in.h
+--- netpbm-10.35.40/pm_config.in.h.rgbtxt	2008-03-09 11:28:32.000000000 +0100
++++ netpbm-10.35.40/pm_config.in.h	2008-03-14 12:27:28.000000000 +0100
+@@ -67,9 +67,9 @@
+ #define RGB_DB2 "PBMplus_Dir:RGB.TXT"
+ #define RGB_DB3 "PBMplus_Dir:RGB.TXT"
+ #else
+-#define RGB_DB1 "/usr/lib/X11/rgb.txt"
+-#define RGB_DB2 "/usr/share/X11/rgb.txt"
+-#define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt"
++#define RGB_DB1 "/usr/share/netpbm/rgb.txt"
++#define RGB_DB2 "/usr/lib/X11/rgb.txt"
++#define RGB_DB3 "/usr/share/X11/rgb.txt"
+ #endif
+ 
+ /* CONFIGURE: This is the name of an environment variable that tells
diff --git a/netpbm.spec b/netpbm.spec
index 5f29401..00b142e 100644
--- a/netpbm.spec
+++ b/netpbm.spec
@@ -1,11 +1,11 @@
 Summary: A library for handling different graphics file formats
 Name: netpbm
 Version: 10.35.40
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Assorted licenses, see %{_docdir}/%{name}-%{version}/copyright_summary
 Group: System Environment/Libraries
 URL: http://netpbm.sourceforge.net/
-# Source0 is prepared by 
+# Source0 is prepared by
 # svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/stable netpbm-%{version}
 # svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide netpbm-%{version}/userguide
 # and removing the .svn directories
@@ -28,9 +28,10 @@ Patch16: netpbm-10.35-pbmtog3segfault.patch
 Patch17: netpbm-10.35-pbmtomacp.patch
 Patch18: netpbm-10.35-glibc.patch
 Patch19: netpbm-10.35-gcc43.patch
+Patch20: netpbm-10.35-rgbtxt.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
-BuildRequires: libX11-devel xorg-x11-server-utils python
+BuildRequires: libX11-devel, python
 
 %description
 The netpbm package contains a library of functions which support
@@ -87,6 +88,7 @@ netpbm-progs.  You'll also need to install the netpbm package.
 %patch17 -p1 -b .pbmtomacp
 %patch18 -p1 -b .glibc
 %patch19 -p1 -b .gcc43
+%patch20 -p1 -b .rgbtxt
 
 ##mv shhopt/shhopt.h shhopt/pbmshhopt.h
 ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
@@ -175,6 +177,7 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man5/extendedopacity.5
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/netpbm
 mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_datadir}/netpbm/
+mv $RPM_BUILD_ROOT/usr/misc/rgb.txt $RPM_BUILD_ROOT%{_datadir}/netpbm/
 rm -rf $RPM_BUILD_ROOT/usr/README
 rm -rf $RPM_BUILD_ROOT/usr/VERSION
 rm -rf $RPM_BUILD_ROOT/usr/link
@@ -211,6 +214,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/netpbm/
 
 %changelog
+* Fri Mar 14 2008 Jindrich Novy <jnovy@redhat.com> 10.35.40-2
+- package rgb.txt for pnmtopng (#313301)
+- drop useless xorg-x11-server-utils BR
+
 * Sun Mar  9 2008 Jindrich Novy <jnovy@redhat.com> 10.35.40-1
 - update to 10.35.40 (fixes pgmdeshadow, pgmmedian, pgmbentley and pamtosvg)