Hello community,
here is the log from the commit of package netpbm
checked in at Tue Nov 14 19:22:48 CET 2006.
--------
--- netpbm/netpbm.changes 2006-03-23 17:13:25.000000000 +0100
+++ /mounts/work_src_done/STABLE/netpbm/netpbm.changes 2006-11-14 15:05:37.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Nov 14 14:52:55 CET 2006 - prusnak@suse.cz
+
+- fixed [#216670]
+ - removed man pages that pointed to online documentation (manpages.patch)
+ - added man pages generated from HTML documentation (manpages.tar.bz2)
+
+-------------------------------------------------------------------
@@ -248 +255 @@
-- remove g3topbm due to conflict with g3utils
+- remove g3topbm due to conflict with g3utils
Old:
----
netpbm-10.26.22-man.patch
New:
----
netpbm-10.26.22-manpages.patch
netpbm-10.26.22-manpages.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ netpbm.spec ++++++
--- /var/tmp/diff_new_pack.WiMN7H/_old 2006-11-14 19:21:53.000000000 +0100
+++ /var/tmp/diff_new_pack.WiMN7H/_new 2006-11-14 19:21:53.000000000 +0100
@@ -12,18 +12,19 @@
Name: netpbm
BuildRequires: libpng-devel libtiff-devel
-License: Other License(s), see package, GPL
+License: Artistic License, Other License(s), see package
Group: Productivity/Graphics/Convertors
Provides: pbmplus
Autoreqprov: on
Version: 10.26.22
-Release: 7
+Release: 29
Summary: A Powerful Graphics Conversion Package
Source: netpbm-%{version}-nohpcdtoppm-nojbig.tar.bz2
Source1: netpbm-%{version}-documentation.tar.bz2
-Source2: prepare-src-tarball
+Source2: netpbm-%{version}-manpages.tar.bz2
+Source3: prepare-src-tarball
Patch: netpbm-%{version}.dif
-Patch3: netpbm-%{version}-man.patch
+Patch2: netpbm-%{version}-manpages.patch
Patch4: netpbm-%{version}-overflow.patch
Patch5: netpbm-%{version}-aliasing.patch
Patch6: netpbm-%{version}-tmpfile.patch
@@ -86,8 +87,8 @@
%package -n libnetpbm
Version: 1.0.0
-Release: 650
-License: LGPL, Other License(s), see package
+Release: 672
+License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), Other License(s), see package
Summary: Libraries for the NetPBM (NetPortableBitmap) Graphic Formats
Group: System/Libraries
Autoreqprov: on
@@ -107,10 +108,12 @@
Michael Mauldin
%prep
-%setup -q -a 1
+%setup
+%setup -D -q -a 1
+%setup -D -q -a 2
rm -rf libtiff
%patch
-%patch3
+%patch2
%patch4
%patch5
%patch6
@@ -149,12 +152,10 @@
ln -sf libnetpbm.so $RPM_BUILD_ROOT/usr/%_lib/libpnm.so
ln -sf libnetpbm.so $RPM_BUILD_ROOT/usr/%_lib/libppm.so
cp -pd package/include/* $RPM_BUILD_ROOT/usr/include
-cp -prd package/man/* $RPM_BUILD_ROOT/usr/share/man
+cp -prd man/* $RPM_BUILD_ROOT/usr/share/man
mkdir -p $RPM_BUILD_ROOT/usr/share/netpbm
install -m 644 converter/other/pnmtopalm/*.map $RPM_BUILD_ROOT/usr/share/netpbm
rm $RPM_BUILD_ROOT/usr/bin/g3topbm #conflict with g3utils
-rm $RPM_BUILD_ROOT/usr/share/man/web/netpbm.url
-rm $RPM_BUILD_ROOT/usr/bin/doc.url
%clean
rm -rf $RPM_BUILD_ROOT
@@ -181,6 +182,10 @@
%{_libdir}/lib*
%changelog -n netpbm
+* Tue Nov 14 2006 - prusnak@suse.cz
+- fixed [#216670]
+ - removed man pages that pointed to online documentation (manpages.patch)
+ - added man pages generated from HTML documentation (manpages.tar.bz2)
* Thu Mar 23 2006 - nadvornik@suse.cz
- fixed uninitialized variables [#155948]
* Wed Jan 25 2006 - mls@suse.de
@@ -248,8 +253,8 @@
- fix neededforbuild
* Fri Jul 26 2002 - nadvornik@suse.cz
- updated to 10.5:
-- libraries libpbm, libpgm, libpnm, libppm merged to libnetpbm
-- documentation is in html only
+ - libraries libpbm, libpgm, libpnm, libppm merged to libnetpbm
+ - documentation is in html only
* Tue May 14 2002 - nadvornik@suse.cz
- fixed usage of the %%{_libdir} macro
* Tue Feb 26 2002 - nadvornik@suse.cz
@@ -260,12 +265,12 @@
- changed neededforbuild <libpng> to <libpng-devel-packages>
* Thu Jan 10 2002 - nadvornik@suse.cz
- update to 9.23:
-- bugfix release
+ - bugfix release
- patched pnmtops to accept -dpi <number>x<number> [bug #12591]
- used macros %%{_lib} and %%{_libdir}
* Wed Dec 05 2001 - nadvornik@suse.cz
- update to 9.21:
-- new: pamdeinterlace, pnmquant, ppmtoneo, neotoppm
+ - new: pamdeinterlace, pnmquant, ppmtoneo, neotoppm
* Tue Sep 04 2001 - nadvornik@suse.cz
- removed jbigtopnm and pnmtojbig because of potential patent
problems [bug #9903]
++++++ netpbm-10.26.22-manpages.patch ++++++
--- GNUmakefile
+++ GNUmakefile
@@ -64,7 +64,6 @@
SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
-SCRIPTS = manweb
MANUALS1 = netpbm
NOMERGEBINARIES = netpbm
@@ -198,11 +197,9 @@
endif
.PHONY: install-merge install-nonmerge
-install-merge: install.merge install.lib install.data \
- install.manweb install.man
+install-merge: install.merge install.lib install.data
-install-nonmerge: install.bin install.lib install.data \
- install.manweb install.man
+install-nonmerge: install.bin install.lib install.data
.PHONY: merge
merge: netpbm
@@ -290,17 +287,6 @@
install.lib:
endif
-.PHONY: install.manweb
-install.manweb: $(PKGDIR)/man/web/netpbm.url $(PKGDIR)/bin/doc.url
-
-$(PKGDIR)/man/web/netpbm.url: $(PKGDIR)/man/web
- echo "$(NETPBM_DOCURL)" > $@
- chmod $(INSTALL_PERM_MAN) $@
-
-$(PKGDIR)/bin/doc.url: $(PKGDIR)/bin
- echo "$(NETPBM_DOCURL)" > $@
- chmod $(INSTALL_PERM_MAN) $@
-
.PHONY: install-dev
# Note that you might install the development package and NOT the runtime
# package. If you have a special system for building stuff, maybe for
--- Makefile.common
+++ Makefile.common
@@ -360,31 +360,6 @@
$(INSTALL) -c -m $(INSTALL_PERM_DATA) \
$(SRCDIR)/$(SUBDIR)/$(@:%_installdata=%) $<
-
-.PHONY: install.man install.man1 install.man3 install.man5
-install.man: install.man1 install.man3 install.man5 \
- $(SUBDIRS:%=%/install.man)
-
-MANUALS1 = $(BINARIES) $(SCRIPTS)
-
-install.man1: $(PKGDIR)/man/man1 $(MANUALS1:%=%_installman1)
-
-install.man3: $(PKGDIR)/man/man3 $(MANUALS3:%=%_installman3)
-
-install.man5: $(PKGDIR)/man/man5 $(MANUALS5:%=%_installman5)
-
-%_installman1: $(PKGDIR)/man/man1
- perl -w $(SRCDIR)/buildtools/makepointerman $(@:%_installman1=%) \
- $(NETPBM_DOCURL) $< 1 $(MANPAGE_FORMAT) $(INSTALL_PERM_MAN)
-
-%_installman3: $(PKGDIR)/man/man3
- perl -w $(SRCDIR)/buildtools/makepointerman $(@:%_installman3=%) \
- $(NETPBM_DOCURL) $< 3 $(MANPAGE_FORMAT) $(INSTALL_PERM_MAN)
-
-%_installman5: $(PKGDIR)/man/man5
- perl -w $(SRCDIR)/buildtools/makepointerman $(@:%_installman5=%) \
- $(NETPBM_DOCURL) $< 5 $(MANPAGE_FORMAT) $(INSTALL_PERM_MAN)
-
.PHONY: clean
ifneq ($(EXE)x,x)
@@ -422,9 +397,6 @@
%/install.lib:
$(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \
SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@)
-%/install.man:
- $(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \
- SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@)
%/install.data:
$(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \
SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org