rpms/netpbm/devel .cvsignore, 1.25, 1.26 netpbm.spec, 1.94, 1.95 sources, 1.29, 1.30
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Thu Oct 18 10:26:50 UTC 2007
- Previous message (by thread): rpms/kdelibs4/devel kdelibs-3.94.0-parallel-devel.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 kdelibs4.spec, 1.3, 1.4 sources, 1.2, 1.3 kdelibs-3.93.0-colorscheme-hack.diff, 1.1, NONE kdelibs-3.93.0-kde149704.diff, 1.1, NONE kdelibs-3.93.0-parallel-devel.diff, 1.1, NONE
- Next message (by thread): rpms/shadow-utils/devel shadow-4.0.18.1-mtime.patch, NONE, 1.1 shadow-utils.spec, 1.105, 1.106
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jnovy
Update of /cvs/extras/rpms/netpbm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25222
Modified Files:
.cvsignore netpbm.spec sources
Log Message:
* Thu Oct 18 2007 Jindrich Novy <jnovy at redhat.com> 10.35.32-1
- remove .svn directories from tarball to reduce its size
- update fixes rhbz#337181 and likely others
* Thu Oct 18 2007 MATSUURA Takanori <t.matsuu at gmail.com> 10.35.32-0
- update to 10.35.32 from svn tree
- create man pages from userguide HTML files
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netpbm/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 18 Sep 2006 11:55:07 -0000 1.25
+++ .cvsignore 18 Oct 2007 10:26:16 -0000 1.26
@@ -26,3 +26,4 @@
netpbmdoc-10.34.l1.tar.bz2
netpbm-10.35.l1.tar.bz2
netpbmdoc-10.35.l1.tar.bz2
+netpbm-10.35.32.tar.bz2
Index: netpbm.spec
===================================================================
RCS file: /cvs/extras/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- netpbm.spec 11 Oct 2007 16:36:20 -0000 1.94
+++ netpbm.spec 18 Oct 2007 10:26:16 -0000 1.95
@@ -1,12 +1,15 @@
Summary: A library for handling different graphics file formats
Name: netpbm
-Version: 10.35
-Release: 17%{?dist}
+Version: 10.35.32
+Release: 1%{?dist}
License: Assorted licenses, see %{_docdir}/%{name}-%{version}/copyright_summary
Group: System Environment/Libraries
URL: http://netpbm.sourceforge.net/
-Source0: netpbm-%{version}.l1.tar.bz2
-Source1: netpbmdoc-%{version}.l1.tar.bz2
+# Source0 is prepared by
+# svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/stable netpbm-%{nersion}
+# svn checkout https://netpbm.svn.sourceforge.net/svnroot/netpbm/userguide netpbm-%{nersion}/userguide
+# and removing the .svn directories
+Source0: netpbm-%{version}.tar.bz2
Patch1: netpbm-10.17-time.patch
Patch2: netpbm-9.24-strip.patch
Patch3: netpbm-10.19-message.patch
@@ -26,7 +29,7 @@
Patch18: netpbm-10.35-glibc.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
+BuildRequires: libX11-devel xorg-x11-server-utils python
%description
The netpbm package contains a library of functions which support
@@ -125,6 +128,17 @@
X11LIB=%{_libdir}/libX11.so \
XML2LIBS="NONE"
+# prepare man files
+cd userguide
+for i in *.html ; do
+ ../buildtools/makeman ${i}
+done
+for i in 1 3 5 ; do
+ mkdir -p man/man${i}
+ mv *.${i} man/man${i}
+done
+
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -140,8 +154,8 @@
cp -af lib/libnetpbm.a $RPM_BUILD_ROOT%{_libdir}/libnetpbm.a
ln -sf libnetpbm.so.10 $RPM_BUILD_ROOT%{_libdir}/libnetpbm.so
-mkdir -p $RPM_BUILD_ROOT%{_mandir}
-tar jxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_mandir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}
+mv userguide/man $RPM_BUILD_ROOT%{_mandir}
# Get rid of the useless non-ascii character in pgmminkowski.1
sed -i 's/\xa0//' $RPM_BUILD_ROOT%{_mandir}/man1/pgmminkowski.1
@@ -177,7 +191,7 @@
%files
%defattr(-,root,root)
-%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README
+%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README userguide
%{_libdir}/lib*.so.*
%files devel
@@ -193,6 +207,14 @@
%{_datadir}/netpbm/
%changelog
+* Thu Oct 18 2007 Jindrich Novy <jnovy at redhat.com> 10.35.32-1
+- remove .svn directories from tarball to reduce its size
+- update fixes rhbz#337181 and likely others
+
+* Thu Oct 18 2007 MATSUURA Takanori <t.matsuu at gmail.com> 10.35.32-0
+- update to 10.35.32 from svn tree
+- create man pages from userguide HTML files
+
* Thu Oct 11 2007 Jindrich Novy <jnovy at redhat.com> 10.35-17
- add xorg-x11-server-utils BR (#313301)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netpbm/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 18 Sep 2006 11:55:07 -0000 1.29
+++ sources 18 Oct 2007 10:26:16 -0000 1.30
@@ -1,2 +1 @@
-90a5855e3f08bce4c239ffd205df2a37 netpbm-10.35.l1.tar.bz2
-8a76bd4a10ba0dd122e7fee759a2bdab netpbmdoc-10.35.l1.tar.bz2
+d816dd084194f2e7ccf7ab97ee89b155 netpbm-10.35.32.tar.bz2
- Previous message (by thread): rpms/kdelibs4/devel kdelibs-3.94.0-parallel-devel.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 kdelibs4.spec, 1.3, 1.4 sources, 1.2, 1.3 kdelibs-3.93.0-colorscheme-hack.diff, 1.1, NONE kdelibs-3.93.0-kde149704.diff, 1.1, NONE kdelibs-3.93.0-parallel-devel.diff, 1.1, NONE
- Next message (by thread): rpms/shadow-utils/devel shadow-4.0.18.1-mtime.patch, NONE, 1.1 shadow-utils.spec, 1.105, 1.106
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list