auto-import changelog data from netpbm-10.19-2.src.rpm
Fri Jan 30 2004 Phil Knirsch <pknirsch@redhat.com> 10.19-2 - No need anymore to fix ppmfade and ppmshade. Thu Jan 29 2004 Phil Knirsch <pknirsch@redhat.com> 10.19-1 - Major update to latest upstream version 10.19.
This commit is contained in:
cvsdist
parent
dce3fc1044
commit
c77bcbfe11
@ -1 +1 @@
|
|||||||
netpbm-9.24-nojbig.tar.bz2
|
netpbm-10.19.tar.bz2
|
||||||
|
|||||||
20
netpbm-10.17-time.patch
Normal file
20
netpbm-10.17-time.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- netpbm-10.17/converter/other/fiasco/config.h.time 2001-05-28 02:43:11.000000000 +0200
|
||||||
|
+++ netpbm-10.17/converter/other/fiasco/config.h 2003-09-08 15:23:17.000000000 +0200
|
||||||
|
@@ -19,7 +19,7 @@
|
||||||
|
#define STDC_HEADERS 1
|
||||||
|
|
||||||
|
/* Define if you can safely include both <sys/time.h> and <time.h>. */
|
||||||
|
-#define TIME_WITH_SYS_TIME 1
|
||||||
|
+/* #undef TIME_WITH_SYS_TIME 1 */
|
||||||
|
|
||||||
|
/* Define if your processor stores words with the most significant
|
||||||
|
byte first (like Motorola and SPARC, unlike Intel and VAX). */
|
||||||
|
@@ -79,7 +79,7 @@
|
||||||
|
#define HAVE_STRING_H 1
|
||||||
|
|
||||||
|
/* Define if you have the <sys/time.h> header file. */
|
||||||
|
-#define HAVE_SYS_TIME_H 1
|
||||||
|
+/* #undef HAVE_SYS_TIME_H 1 */
|
||||||
|
|
||||||
|
/* Define if you have the <unistd.h> header file. */
|
||||||
|
#define HAVE_UNISTD_H 1
|
||||||
107
netpbm.spec
107
netpbm.spec
@ -1,16 +1,14 @@
|
|||||||
Summary: A library for handling different graphics file formats.
|
Summary: A library for handling different graphics file formats.
|
||||||
Name: netpbm
|
Name: netpbm
|
||||||
Version: 9.24
|
Version: 10.19
|
||||||
Release: 12.1.1
|
Release: 2
|
||||||
License: freeware
|
License: freeware
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source0: netpbm-9.24-nojbig.tar.bz2
|
Source0: netpbm-10.19.tar.bz2
|
||||||
Patch0: netpbm-9.8-install.patch
|
Patch1: netpbm-10.17-time.patch
|
||||||
Patch1: netpbm-9.9-time.patch
|
Patch2: netpbm-9.24-strip.patch
|
||||||
Patch2: netpbm-9.24-struct.patch
|
Patch3: netpbm-10.19-security.patch
|
||||||
Patch3: netpbm-9.24-strip.patch
|
Patch4: netpbm-10.18-manpath.patch
|
||||||
Patch4: netpbm-9.24-security.patch
|
|
||||||
Patch5: netpbm-9.24-debiansecurity.patch
|
|
||||||
Buildroot: %{_tmppath}/%{name}-root
|
Buildroot: %{_tmppath}/%{name}-root
|
||||||
BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
|
BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl
|
||||||
Obsoletes: libgr
|
Obsoletes: libgr
|
||||||
@ -54,15 +52,13 @@ netpbm-progs. You'll also need to install the netpbm package.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .install
|
|
||||||
%patch1 -p1 -b .time
|
%patch1 -p1 -b .time
|
||||||
%patch2 -p1 -b .struct
|
%patch2 -p1 -b .strip
|
||||||
%patch3 -p1 -b .strip
|
%patch3 -p1 -b .security
|
||||||
%patch4 -p1 -b .security
|
%patch4 -p1 -b .manpath
|
||||||
%patch5 -p1 -b .debiansecurity
|
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./configure <<EOF
|
./configure <<EOF
|
||||||
@ -70,7 +66,12 @@ perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUma
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
/usr
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -93,55 +94,26 @@ make \
|
|||||||
%install
|
%install
|
||||||
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
# Nasty hack to work around a useless ldconfig script
|
mkdir -p $RPM_BUILD_ROOT
|
||||||
rm -f buildtools/try_ldconfig
|
make package pkgdir=$RPM_BUILD_ROOT/usr
|
||||||
ln -sf /bin/true buildtools/try_ldconfig
|
|
||||||
|
|
||||||
PATH="`pwd`:${PATH}" make install \
|
# Ugly hack to have libs in correct dir on 64bit archs.
|
||||||
JPEGINC_DIR=$RPM_BUILD_ROOT%{_includedir} \
|
mkdir -p $RPM_BUILD_ROOT%{_libdir}
|
||||||
PNGINC_DIR=$RPM_BUILD_ROOT%{_includedir} \
|
if [ "%{_libdir}" != "/usr/lib" ]; then
|
||||||
TIFFINC_DIR=$RPM_BUILD_ROOT%{_includedir} \
|
mv $RPM_BUILD_ROOT/usr/lib/lib* $RPM_BUILD_ROOT%{_libdir}
|
||||||
JPEGLIB_DIR=%{_libdir} \
|
fi
|
||||||
PNGLIB_DIR=%{_libdir} \
|
|
||||||
TIFFLIB_DIR=%{_libdir} \
|
|
||||||
INSTALL_PREFIX=$RPM_BUILD_ROOT%{_prefix} \
|
|
||||||
INSTALLBINARIES=$RPM_BUILD_ROOT%{_bindir} \
|
|
||||||
INSTALLHDRS=$RPM_BUILD_ROOT%{_includedir} \
|
|
||||||
INSTALLLIBS=$RPM_BUILD_ROOT%{_libdir} \
|
|
||||||
INSTALLMANUALS1=$RPM_BUILD_ROOT%{_mandir}/man1 \
|
|
||||||
INSTALLMANUALS3=$RPM_BUILD_ROOT%{_mandir}/man3 \
|
|
||||||
INSTALLMANUALS5=$RPM_BUILD_ROOT%{_mandir}/man5
|
|
||||||
|
|
||||||
[ %{_libdir} = /usr/lib ] || mv $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT%{_libdir}
|
cp -af lib/libnetpbm.a $RPM_BUILD_ROOT%{_libdir}/libnetpbm.a
|
||||||
|
ln -sf libnetpbm.so.10 $RPM_BUILD_ROOT%{_libdir}/libnetpbm.so
|
||||||
|
|
||||||
# Install header files.
|
mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_libdir}
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_includedir}
|
rm -rf $RPM_BUILD_ROOT/usr/README
|
||||||
install -m644 pbm/pbm.h $RPM_BUILD_ROOT%{_includedir}/
|
rm -rf $RPM_BUILD_ROOT/usr/VERSION
|
||||||
#install -m644 pbmplus.h $RPM_BUILD_ROOT%{_includedir}/
|
rm -rf $RPM_BUILD_ROOT/usr/link
|
||||||
install -m644 pgm/pgm.h $RPM_BUILD_ROOT%{_includedir}/
|
rm -rf $RPM_BUILD_ROOT/usr/misc
|
||||||
install -m644 pnm/pnm.h $RPM_BUILD_ROOT%{_includedir}/
|
rm -rf $RPM_BUILD_ROOT/usr/man
|
||||||
install -m644 ppm/ppm.h $RPM_BUILD_ROOT%{_includedir}/
|
rm -rf $RPM_BUILD_ROOT/usr/man
|
||||||
install -m644 shhopt/pbmshhopt.h $RPM_BUILD_ROOT%{_includedir}/
|
rm -rf $RPM_BUILD_ROOT/usr/pkginfo
|
||||||
|
|
||||||
# Install the static-only librle.a
|
|
||||||
install -m644 urt/{rle,rle_config}.h $RPM_BUILD_ROOT%{_includedir}/
|
|
||||||
install -m644 urt/librle.a $RPM_BUILD_ROOT%{_libdir}/
|
|
||||||
|
|
||||||
# Fixup symlinks.
|
|
||||||
ln -sf gemtopnm $RPM_BUILD_ROOT%{_bindir}/gemtopbm
|
|
||||||
ln -sf pnmtoplainpnm $RPM_BUILD_ROOT%{_bindir}/pnmnoraw
|
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libpbm.so
|
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libpgm.so
|
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libpnm.so
|
|
||||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libppm.so
|
|
||||||
ln -sf libpbm.so.9 $RPM_BUILD_ROOT%{_libdir}/libpbm.so
|
|
||||||
ln -sf libpgm.so.9 $RPM_BUILD_ROOT%{_libdir}/libpgm.so
|
|
||||||
ln -sf libpnm.so.9 $RPM_BUILD_ROOT%{_libdir}/libpnm.so
|
|
||||||
ln -sf libppm.so.9 $RPM_BUILD_ROOT%{_libdir}/libppm.so
|
|
||||||
|
|
||||||
# Fixup perl paths in the two scripts that require it.
|
|
||||||
perl -pi -e 's^/bin/perl^%{__perl}^' \
|
|
||||||
$RPM_BUILD_ROOT%{_bindir}/{ppmfade,ppmshadow}
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
|
||||||
@ -152,7 +124,7 @@ $RPM_BUILD_ROOT%{_bindir}/{ppmfade,ppmshadow}
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc COPYRIGHT.PATENT GPL_LICENSE.txt HISTORY README
|
%doc doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README
|
||||||
%{_libdir}/lib*.so.*
|
%{_libdir}/lib*.so.*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
@ -170,8 +142,11 @@ $RPM_BUILD_ROOT%{_bindir}/{ppmfade,ppmshadow}
|
|||||||
%{_mandir}/man5/*
|
%{_mandir}/man5/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Jan 22 2004 Phil Knirsch <pknirsch@redhat.com> 9.24-12.1.1
|
* Fri Jan 30 2004 Phil Knirsch <pknirsch@redhat.com> 10.19-2
|
||||||
- Included new debian security fixes and made security errata.
|
- No need anymore to fix ppmfade and ppmshade.
|
||||||
|
|
||||||
|
* Thu Jan 29 2004 Phil Knirsch <pknirsch@redhat.com> 10.19-1
|
||||||
|
- Major update to latest upstream version 10.19.
|
||||||
|
|
||||||
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
|
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
|
||||||
- rebuilt
|
- rebuilt
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user