- package rgb.txt for pnmtopng (#313301)
- drop useless xorg-x11-server-utils BR
This commit is contained in:
parent
ae0f41a646
commit
a343e6c04e
16
netpbm-10.35-rgbtxt.patch
Normal file
16
netpbm-10.35-rgbtxt.patch
Normal file
@ -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
|
11
netpbm.spec
11
netpbm.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: A library for handling different graphics file formats
|
Summary: A library for handling different graphics file formats
|
||||||
Name: netpbm
|
Name: netpbm
|
||||||
Version: 10.35.40
|
Version: 10.35.40
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: Assorted licenses, see %{_docdir}/%{name}-%{version}/copyright_summary
|
License: Assorted licenses, see %{_docdir}/%{name}-%{version}/copyright_summary
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
URL: http://netpbm.sourceforge.net/
|
URL: http://netpbm.sourceforge.net/
|
||||||
@ -28,9 +28,10 @@ Patch16: netpbm-10.35-pbmtog3segfault.patch
|
|||||||
Patch17: netpbm-10.35-pbmtomacp.patch
|
Patch17: netpbm-10.35-pbmtomacp.patch
|
||||||
Patch18: netpbm-10.35-glibc.patch
|
Patch18: netpbm-10.35-glibc.patch
|
||||||
Patch19: netpbm-10.35-gcc43.patch
|
Patch19: netpbm-10.35-gcc43.patch
|
||||||
|
Patch20: netpbm-10.35-rgbtxt.patch
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
|
BuildRequires: libjpeg-devel, libpng-devel, libtiff-devel, flex
|
||||||
BuildRequires: libX11-devel xorg-x11-server-utils python
|
BuildRequires: libX11-devel, python
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The netpbm package contains a library of functions which support
|
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
|
%patch17 -p1 -b .pbmtomacp
|
||||||
%patch18 -p1 -b .glibc
|
%patch18 -p1 -b .glibc
|
||||||
%patch19 -p1 -b .gcc43
|
%patch19 -p1 -b .gcc43
|
||||||
|
%patch20 -p1 -b .rgbtxt
|
||||||
|
|
||||||
##mv shhopt/shhopt.h shhopt/pbmshhopt.h
|
##mv shhopt/shhopt.h shhopt/pbmshhopt.h
|
||||||
##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile
|
##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
|
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/*.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/README
|
||||||
rm -rf $RPM_BUILD_ROOT/usr/VERSION
|
rm -rf $RPM_BUILD_ROOT/usr/VERSION
|
||||||
rm -rf $RPM_BUILD_ROOT/usr/link
|
rm -rf $RPM_BUILD_ROOT/usr/link
|
||||||
@ -211,6 +214,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/netpbm/
|
%{_datadir}/netpbm/
|
||||||
|
|
||||||
%changelog
|
%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
|
* Sun Mar 9 2008 Jindrich Novy <jnovy@redhat.com> 10.35.40-1
|
||||||
- update to 10.35.40 (fixes pgmdeshadow, pgmmedian, pgmbentley and pamtosvg)
|
- update to 10.35.40 (fixes pgmdeshadow, pgmmedian, pgmbentley and pamtosvg)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user