rpms/hplip/devel .cvsignore, 1.25, 1.26 hplip-gzip-n.patch, 1.1, 1.2 hplip-libsane.patch, 1.2, 1.3 hplip.spec, 1.179, 1.180 sources, 1.25, 1.26 hplip-libm.patch, 1.3, NONE

[Tim Waugh (twaugh)]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17276

Modified Files:
	.cvsignore hplip-gzip-n.patch hplip-libsane.patch hplip.spec 
	sources 
Removed Files:
	hplip-libm.patch 
Log Message:
* Mon Jun 23 2008 Tim Waugh <twaugh at redhat.com> 2.8.6-1
- 2.8.6.  No longer need libm patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	3 Jun 2008 14:07:18 -0000	1.25
+++ .cvsignore	23 Jun 2008 11:39:35 -0000	1.26
@@ -22,3 +22,4 @@
 hplip-2.7.12.tar.gz
 hplip-2.8.2.tar.gz
 hplip-2.8.5.tar.gz
+hplip-2.8.6.tar.gz

hplip-gzip-n.patch:

Index: hplip-gzip-n.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-gzip-n.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-gzip-n.patch	18 Jan 2008 15:53:35 -0000	1.1
+++ hplip-gzip-n.patch	23 Jun 2008 11:39:35 -0000	1.2
@@ -1,24 +1,28 @@
-diff -up hplip-2.7.12/Makefile.am.gzip-n hplip-2.7.12/Makefile.am
---- hplip-2.7.12/Makefile.am.gzip-n	2008-01-18 15:42:03.000000000 +0000
-+++ hplip-2.7.12/Makefile.am	2008-01-18 15:42:38.000000000 +0000
-@@ -420,7 +420,7 @@ if HPLIP_BUILD
+diff -up hplip-2.8.6/Makefile.am.gzip-n hplip-2.8.6/Makefile.am
+--- hplip-2.8.6/Makefile.am.gzip-n	2008-06-21 00:40:39.000000000 +0100
++++ hplip-2.8.6/Makefile.am	2008-06-23 12:10:17.000000000 +0100
+@@ -401,8 +401,8 @@ if HPLIP_BUILD
  #	   Install fax support. 
  	if [ "$(fax_build)" = "yes" ]; then \
  	   mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax; \
 -	   gzip -f $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd; \
+-	   gzip -f $(DESTDIR)$(faxppddir)/HP-Fax2-hplip.ppd; \
 +	   gzip -n -f $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd; \
++	   gzip -n -f $(DESTDIR)$(faxppddir)/HP-Fax2-hplip.ppd; \
  	fi
  endif # if HPLIP_BUILD
  
-diff -up hplip-2.7.12/Makefile.in.gzip-n hplip-2.7.12/Makefile.in
---- hplip-2.7.12/Makefile.in.gzip-n	2008-01-18 15:42:44.000000000 +0000
-+++ hplip-2.7.12/Makefile.in	2008-01-18 15:43:08.000000000 +0000
-@@ -7345,7 +7345,7 @@ install-data-hook: install-foo 
+diff -up hplip-2.8.6/Makefile.in.gzip-n hplip-2.8.6/Makefile.in
+--- hplip-2.8.6/Makefile.in.gzip-n	2008-06-21 00:41:33.000000000 +0100
++++ hplip-2.8.6/Makefile.in	2008-06-23 12:10:45.000000000 +0100
+@@ -6615,8 +6615,8 @@ install-data-hook: install-foo
  #	   Install fax support. 
  @HPLIP_BUILD_TRUE@	if [ "$(fax_build)" = "yes" ]; then \
  @HPLIP_BUILD_TRUE@	   mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax; \
 - at HPLIP_BUILD_TRUE@	   gzip -f $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd; \
+- at HPLIP_BUILD_TRUE@	   gzip -f $(DESTDIR)$(faxppddir)/HP-Fax2-hplip.ppd; \
 + at HPLIP_BUILD_TRUE@	   gzip -n -f $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd; \
++ at HPLIP_BUILD_TRUE@	   gzip -n -f $(DESTDIR)$(faxppddir)/HP-Fax2-hplip.ppd; \
  @HPLIP_BUILD_TRUE@	fi
  
  install-foo:

hplip-libsane.patch:

Index: hplip-libsane.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-libsane.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hplip-libsane.patch	29 Jun 2007 16:53:39 -0000	1.2
+++ hplip-libsane.patch	23 Jun 2008 11:39:35 -0000	1.3
@@ -1,22 +1,24 @@
---- hplip-2.7.6/Makefile.in.libsane	2007-06-29 15:31:53.000000000 +0100
-+++ hplip-2.7.6/Makefile.in	2007-06-29 15:32:29.000000000 +0100
-@@ -1912,7 +1912,7 @@
- #      scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap
- @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
+diff -up hplip-2.8.6/Makefile.am.libsane hplip-2.8.6/Makefile.am
+--- hplip-2.8.6/Makefile.am.libsane	2008-06-23 12:13:10.000000000 +0100
++++ hplip-2.8.6/Makefile.am	2008-06-23 12:14:24.000000000 +0100
+@@ -187,7 +187,7 @@ else
+ libsane_hpaio_la_LDFLAGS = $(BB_SCAN_VERSION)
+ endif
  # The following is a interlibrary dependency that must be compiled first.
-- at HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la
-+ at HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la -lsane
+-libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
++libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lsane
  #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
- @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN
+ libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) $(BB_SCAN_CFLAGS)
  
---- hplip-2.7.6/Makefile.am.libsane	2007-06-29 15:31:53.000000000 +0100
-+++ hplip-2.7.6/Makefile.am	2007-06-29 15:32:14.000000000 +0100
-@@ -187,7 +187,7 @@
- #      scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap
- libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
+diff -up hplip-2.8.6/Makefile.in.libsane hplip-2.8.6/Makefile.in
+--- hplip-2.8.6/Makefile.in.libsane	2008-06-23 12:13:10.000000000 +0100
++++ hplip-2.8.6/Makefile.in	2008-06-23 12:14:39.000000000 +0100
+@@ -1679,7 +1679,7 @@ lib_LTLIBRARIES = $(am__append_4)
+ @DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LDFLAGS = $(BB_SCAN_VERSION)
+ @DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation $(BB_SCAN_VERSION)
  # The following is a interlibrary dependency that must be compiled first.
--libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la
-+libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la -lsane
+- at HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
++ at HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups -lsane
  #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
- libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN
+ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) $(BB_SCAN_CFLAGS)
  


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- hplip.spec	6 Jun 2008 07:25:16 -0000	1.179
+++ hplip.spec	23 Jun 2008 11:39:35 -0000	1.180
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
-Version: 2.8.5
-Release: 2%{?dist}
+Version: 2.8.6
+Release: 1%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -18,7 +18,6 @@
 Patch2: hplip-gzip-n.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
-Patch5: hplip-libm.patch
 Patch6: hplip-systray.patch
 Patch8: hplip-libsane.patch
 Patch12: hplip-no-root-config.patch
@@ -106,9 +105,6 @@
 # Low ink is a warning condition, not an error.
 %patch4 -p1 -b .marker-supply
 
-# libhpip should link against libm (bug #197599).
-%patch5 -p1 -b .libm
-
 # Make --qt4 the default for the systray applet, so that it appears
 # in the right place.
 %patch6 -p1 -b .systray
@@ -190,6 +186,8 @@
 %{_bindir}/hp-levels
 %{_bindir}/hp-makecopies
 %{_bindir}/hp-makeuri
+%{_bindir}/hp-mkuri
+%{_bindir}/hp-plugin
 %{_bindir}/hp-probe
 %{_bindir}/hp-scan
 %{_bindir}/hp-sendfax
@@ -208,6 +206,7 @@
 %{_datadir}/hplip/align.py*
 %{_datadir}/hplip/clean.py*
 %{_datadir}/hplip/colorcal.py*
+%{_datadir}/hplip/dat2drv.py*
 %{_datadir}/hplip/fab.py*
 %{_datadir}/hplip/fax
 %{_datadir}/hplip/firmware.py*
@@ -217,6 +216,7 @@
 %{_datadir}/hplip/levels.py*
 %{_datadir}/hplip/makecopies.py*
 %{_datadir}/hplip/makeuri.py*
+%{_datadir}/hplip/plugin.py*
 %{_datadir}/hplip/probe.py*
 %{_datadir}/hplip/scan.py*
 %{_datadir}/hplip/sendfax.py*
@@ -291,6 +291,9 @@
 exit 0
 
 %changelog
+* Mon Jun 23 2008 Tim Waugh <twaugh at redhat.com> 2.8.6-1
+- 2.8.6.  No longer need libm patch.
+
 * Fri Jun  6 2008 Tim Waugh <twaugh at redhat.com> 2.8.5-2
 - Make --qt4 the default for the systray applet, so that it appears
   in the right place.  Requires PyQt4.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	3 Jun 2008 14:07:18 -0000	1.25
+++ sources	23 Jun 2008 11:39:35 -0000	1.26
@@ -1 +1 @@
-1f32fd8cc52669ef12b0df1a06ba8a56  hplip-2.8.5.tar.gz
+2571d7bf54d20a9b915288816e8cd895  hplip-2.8.6.tar.gz


--- hplip-libm.patch DELETED ---