rpms/hplip
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- 2.8.6. No longer need libm patch.

Browse Source
This commit is contained in:
Tim Waugh 2008-06-23 11:39:35 +00:00
parent 7ca3927795
commit 787e3a3f25
6 changed files with 41 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -22,3 +22,4 @@ hplip-2.7.10.tar.gz
hplip-2.7.12.tar.gz hplip-2.7.12.tar.gz
hplip-2.8.2.tar.gz hplip-2.8.2.tar.gz
hplip-2.8.5.tar.gz hplip-2.8.5.tar.gz
hplip-2.8.6.tar.gz

20
hplip-gzip-n.patch
View File

@ -1,24 +1,28 @@
diff -up hplip-2.7.12/Makefile.am.gzip-n hplip-2.7.12/Makefile.am diff -up hplip-2.8.6/Makefile.am.gzip-n hplip-2.8.6/Makefile.am
--- hplip-2.7.12/Makefile.am.gzip-n 2008-01-18 15:42:03.000000000 +0000 --- hplip-2.8.6/Makefile.am.gzip-n 2008-06-21 00:40:39.000000000 +0100
+++ hplip-2.7.12/Makefile.am 2008-01-18 15:42:38.000000000 +0000 +++ hplip-2.8.6/Makefile.am 2008-06-23 12:10:17.000000000 +0100
@@ -420,7 +420,7 @@ if HPLIP_BUILD @@ -401,8 +401,8 @@ if HPLIP_BUILD
# Install fax support. # Install fax support.
if [ "$(fax_build)" = "yes" ]; then \ if [ "$(fax_build)" = "yes" ]; then \
mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax; \ mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax; \
- gzip -f $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd; \ - 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-Fax-hplip.ppd; \
+ gzip -n -f $(DESTDIR)$(faxppddir)/HP-Fax2-hplip.ppd; \
fi fi
endif # if HPLIP_BUILD endif # if HPLIP_BUILD
diff -up hplip-2.7.12/Makefile.in.gzip-n hplip-2.7.12/Makefile.in diff -up hplip-2.8.6/Makefile.in.gzip-n hplip-2.8.6/Makefile.in
--- hplip-2.7.12/Makefile.in.gzip-n 2008-01-18 15:42:44.000000000 +0000 --- hplip-2.8.6/Makefile.in.gzip-n 2008-06-21 00:41:33.000000000 +0100
+++ hplip-2.7.12/Makefile.in 2008-01-18 15:43:08.000000000 +0000 +++ hplip-2.8.6/Makefile.in 2008-06-23 12:10:45.000000000 +0100
@@ -7345,7 +7345,7 @@ install-data-hook: install-foo @@ -6615,8 +6615,8 @@ install-data-hook: install-foo
# Install fax support. # Install fax support.
@HPLIP_BUILD_TRUE@ if [ "$(fax_build)" = "yes" ]; then \ @HPLIP_BUILD_TRUE@ if [ "$(fax_build)" = "yes" ]; then \
@HPLIP_BUILD_TRUE@ mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax; \ @HPLIP_BUILD_TRUE@ mv $(DESTDIR)$(hpfaxdir)/hpfax.py $(DESTDIR)$(hpfaxdir)/hpfax; \
-@HPLIP_BUILD_TRUE@ gzip -f $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd; \ -@HPLIP_BUILD_TRUE@ gzip -f $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd; \
-@HPLIP_BUILD_TRUE@ gzip -f $(DESTDIR)$(faxppddir)/HP-Fax2-hplip.ppd; \
+@HPLIP_BUILD_TRUE@ gzip -n -f $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd; \ +@HPLIP_BUILD_TRUE@ gzip -n -f $(DESTDIR)$(faxppddir)/HP-Fax-hplip.ppd; \
+@HPLIP_BUILD_TRUE@ gzip -n -f $(DESTDIR)$(faxppddir)/HP-Fax2-hplip.ppd; \
@HPLIP_BUILD_TRUE@ fi @HPLIP_BUILD_TRUE@ fi
install-foo: install-foo:

22
hplip-libm.patch
View File

@ -1,22 +0,0 @@
--- hplip-2.7.6/Makefile.in.libm 2007-06-22 23:46:16.000000000 +0100
+++ hplip-2.7.6/Makefile.in 2007-06-29 14:08:56.000000000 +0100
@@ -1893,7 +1893,7 @@
@HPLIP_BUILD_TRUE@cupsext_la_LDFLAGS = -module -avoid-version
@HPLIP_BUILD_TRUE@cupsext_la_SOURCES = prnt/cupsext/cupsext.c
@HPLIP_BUILD_TRUE@cupsext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
-@HPLIP_BUILD_TRUE@libhpip_la_LDFLAGS = -version-info 0:1:0
+@HPLIP_BUILD_TRUE@libhpip_la_LDFLAGS = -lm -version-info 0:1:0
@HPLIP_BUILD_TRUE@libhpip_la_SOURCES = ip/xconvolve.c ip/xfax.c ip/xgrayout.c ip/xjpg_dct.c ip/xjpg_fix.c ip/xpad.c ip/xrotate.c ip/xskel.c ip/xtiff.c \
@HPLIP_BUILD_TRUE@ ip/ipmain.c ip/xchgbpp.c ip/xcrop.c ip/xgamma.c ip/xjpg_dec.c ip/xjpg_huf.c ip/xpcx.c ip/xsaturation.c ip/xtable.c ip/xtonemap.c \
@HPLIP_BUILD_TRUE@ ip/xbi2gray.c ip/xcolrspc.c ip/xfakemono.c ip/xgray2bi.c ip/xinvert.c ip/xjpg_enc.c ip/xmatrix.c ip/xpnm.c ip/xscale.c ip/xthumb.c ip/xyxtract.c \
--- hplip-2.7.6/Makefile.am.libm 2007-06-12 22:00:31.000000000 +0100
+++ hplip-2.7.6/Makefile.am 2007-06-29 14:08:30.000000000 +0100
@@ -169,7 +169,7 @@
# ip library
lib_LTLIBRARIES += libhpip.la
-libhpip_la_LDFLAGS = -version-info 0:1:0
+libhpip_la_LDFLAGS = -lm -version-info 0:1:0
libhpip_la_SOURCES = ip/xconvolve.c ip/xfax.c ip/xgrayout.c ip/xjpg_dct.c ip/xjpg_fix.c ip/xpad.c ip/xrotate.c ip/xskel.c ip/xtiff.c \
ip/ipmain.c ip/xchgbpp.c ip/xcrop.c ip/xgamma.c ip/xjpg_dec.c ip/xjpg_huf.c ip/xpcx.c ip/xsaturation.c ip/xtable.c ip/xtonemap.c \
ip/xbi2gray.c ip/xcolrspc.c ip/xfakemono.c ip/xgray2bi.c ip/xinvert.c ip/xjpg_enc.c ip/xmatrix.c ip/xpnm.c ip/xscale.c ip/xthumb.c ip/xyxtract.c \

34
hplip-libsane.patch
View File

@ -1,22 +1,24 @@
--- hplip-2.7.6/Makefile.in.libsane 2007-06-29 15:31:53.000000000 +0100 diff -up hplip-2.8.6/Makefile.am.libsane hplip-2.8.6/Makefile.am
+++ hplip-2.7.6/Makefile.in 2007-06-29 15:32:29.000000000 +0100 --- hplip-2.8.6/Makefile.am.libsane 2008-06-23 12:13:10.000000000 +0100
@@ -1912,7 +1912,7 @@ +++ hplip-2.8.6/Makefile.am 2008-06-23 12:14:24.000000000 +0100
# scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap @@ -187,7 +187,7 @@ else
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info 1:0:0 libsane_hpaio_la_LDFLAGS = $(BB_SCAN_VERSION)
endif
# The following is a interlibrary dependency that must be compiled first. # The following is a interlibrary dependency that must be compiled first.
-@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la -libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
+@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la -lsane +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 -DSOAP_DEBUG
@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@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 diff -up hplip-2.8.6/Makefile.in.libsane hplip-2.8.6/Makefile.in
+++ hplip-2.7.6/Makefile.am 2007-06-29 15:32:14.000000000 +0100 --- hplip-2.8.6/Makefile.in.libsane 2008-06-23 12:13:10.000000000 +0100
@@ -187,7 +187,7 @@ +++ hplip-2.8.6/Makefile.in 2008-06-23 12:14:39.000000000 +0100
# scan/sane/dime.c scan/sane/dime.h scan/sane/webScanStub.h scan/sane/webScanH.h scan/sane/stdsoap2.h scan/sane/webScan.nsmap @@ -1679,7 +1679,7 @@ lib_LTLIBRARIES = $(am__append_4)
libsane_hpaio_la_LDFLAGS = -version-info 1:0:0 @DARWIN_BUILD_FALSE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = $(BB_SCAN_VERSION)
@DARWIN_BUILD_TRUE@@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -module -framework CoreFoundation $(BB_SCAN_VERSION)
# The following is a interlibrary dependency that must be compiled first. # The following is a interlibrary dependency that must be compiled first.
-libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la -@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la $(DBUS_LIBS) -lcups
+libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la -lsane +@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@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 -DSOAP_DEBUG
libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = $(DBUS_CFLAGS) $(BB_SCAN_CFLAGS)

15
hplip.spec
View File

@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project Summary: HP Linux Imaging and Printing Project
Name: hplip Name: hplip
Version: 2.8.5 Version: 2.8.6
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2+ and MIT License: GPLv2+ and MIT
Group: System Environment/Daemons Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132 Conflicts: system-config-printer < 0.6.132
@ -18,7 +18,6 @@ Patch1: hplip-desktop.patch
Patch2: hplip-gzip-n.patch Patch2: hplip-gzip-n.patch
Patch3: hplip-quiet.patch Patch3: hplip-quiet.patch
Patch4: hplip-marker-supply.patch Patch4: hplip-marker-supply.patch
Patch5: hplip-libm.patch
Patch6: hplip-systray.patch Patch6: hplip-systray.patch
Patch8: hplip-libsane.patch Patch8: hplip-libsane.patch
Patch12: hplip-no-root-config.patch Patch12: hplip-no-root-config.patch
@ -106,9 +105,6 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
# Low ink is a warning condition, not an error. # Low ink is a warning condition, not an error.
%patch4 -p1 -b .marker-supply %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 # Make --qt4 the default for the systray applet, so that it appears
# in the right place. # in the right place.
%patch6 -p1 -b .systray %patch6 -p1 -b .systray
@ -190,6 +186,8 @@ rm -rf %{buildroot}
%{_bindir}/hp-levels %{_bindir}/hp-levels
%{_bindir}/hp-makecopies %{_bindir}/hp-makecopies
%{_bindir}/hp-makeuri %{_bindir}/hp-makeuri
%{_bindir}/hp-mkuri
%{_bindir}/hp-plugin
%{_bindir}/hp-probe %{_bindir}/hp-probe
%{_bindir}/hp-scan %{_bindir}/hp-scan
%{_bindir}/hp-sendfax %{_bindir}/hp-sendfax
@ -208,6 +206,7 @@ rm -rf %{buildroot}
%{_datadir}/hplip/align.py* %{_datadir}/hplip/align.py*
%{_datadir}/hplip/clean.py* %{_datadir}/hplip/clean.py*
%{_datadir}/hplip/colorcal.py* %{_datadir}/hplip/colorcal.py*
%{_datadir}/hplip/dat2drv.py*
%{_datadir}/hplip/fab.py* %{_datadir}/hplip/fab.py*
%{_datadir}/hplip/fax %{_datadir}/hplip/fax
%{_datadir}/hplip/firmware.py* %{_datadir}/hplip/firmware.py*
@ -217,6 +216,7 @@ rm -rf %{buildroot}
%{_datadir}/hplip/levels.py* %{_datadir}/hplip/levels.py*
%{_datadir}/hplip/makecopies.py* %{_datadir}/hplip/makecopies.py*
%{_datadir}/hplip/makeuri.py* %{_datadir}/hplip/makeuri.py*
%{_datadir}/hplip/plugin.py*
%{_datadir}/hplip/probe.py* %{_datadir}/hplip/probe.py*
%{_datadir}/hplip/scan.py* %{_datadir}/hplip/scan.py*
%{_datadir}/hplip/sendfax.py* %{_datadir}/hplip/sendfax.py*
@ -291,6 +291,9 @@ fi
exit 0 exit 0
%changelog %changelog
* Mon Jun 23 2008 Tim Waugh <twaugh@redhat.com> 2.8.6-1
- 2.8.6. No longer need libm patch.
* Fri Jun 6 2008 Tim Waugh <twaugh@redhat.com> 2.8.5-2 * Fri Jun 6 2008 Tim Waugh <twaugh@redhat.com> 2.8.5-2
- Make --qt4 the default for the systray applet, so that it appears - Make --qt4 the default for the systray applet, so that it appears
in the right place. Requires PyQt4. in the right place. Requires PyQt4.

2
sources
View File

@ -1 +1 @@
1f32fd8cc52669ef12b0df1a06ba8a56 hplip-2.8.5.tar.gz 2571d7bf54d20a9b915288816e8cd895 hplip-2.8.6.tar.gz