From 03ada47a3d1621fb9c67547e5726dc428bbb3838 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Fri, 29 Jun 2007 16:53:39 +0000 Subject: [PATCH] - 2.7.6. --- .cvsignore | 1 + hplip-cups-backend.patch | 11 ---- hplip-desktop.patch | 55 +++--------------- hplip-ipv6.patch | 101 -------------------------------- hplip-libm.patch | 34 +++++------ hplip-libsane.patch | 26 ++++----- hplip-media-empty.patch | 29 ++++------ hplip-quiet.patch | 10 ++-- hplip.spec | 120 +++++++++++++++------------------------ sources | 2 +- 10 files changed, 104 insertions(+), 285 deletions(-) delete mode 100644 hplip-cups-backend.patch delete mode 100644 hplip-ipv6.patch diff --git a/.cvsignore b/.cvsignore index 184cda1..2754f28 100644 --- a/.cvsignore +++ b/.cvsignore @@ -15,3 +15,4 @@ hplip-1.6.12.tar.gz hplip-1.7.1.tar.gz hplip-1.7.2.tar.gz hplip-1.7.4a.tar.gz +hplip-2.7.6.tar.gz diff --git a/hplip-cups-backend.patch b/hplip-cups-backend.patch deleted file mode 100644 index 22474d5..0000000 --- a/hplip-cups-backend.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- hplip-0.9.10/configure.in.cups-backend 2006-03-28 13:48:42.000000000 +0100 -+++ hplip-0.9.10/configure.in 2006-03-28 13:49:03.000000000 +0100 -@@ -71,7 +71,7 @@ - AC_MSG_RESULT(no) - fi - --CUPSSEARCHPATH="/usr/share /usr/local/share /usr/lib /usr/local/lib /usr/libexec /usr/lib64 /opt" -+CUPSSEARCHPATH="/usr/share /usr/local/share /usr/lib /usr/local/lib /usr/libexec /opt" - - AC_MSG_CHECKING("for cups ppd path") - CUPS_PPD_PATH="/usr/share/cups" diff --git a/hplip-desktop.patch b/hplip-desktop.patch index 8fe53df..1c4abfd 100644 --- a/hplip-desktop.patch +++ b/hplip-desktop.patch @@ -1,46 +1,9 @@ ---- hplip-0.9.3/configure.in.desktop 2005-06-09 16:31:45.000000000 +0100 -+++ hplip-0.9.3/configure.in 2005-06-09 16:32:36.000000000 +0100 -@@ -93,8 +93,8 @@ - done - AC_MSG_RESULT("using $CUPS_BACKEND_PATH") - --ICONSEARCHPATH="/usr/lib/menu /usr/share/applications" --ICON="hplip hplip.desktop" -+ICONSEARCHPATH="/usr/share/applications" -+ICON="hplip.desktop" - - AC_MSG_CHECKING("for icon directory") - ICON_PATH="" ---- hplip-0.9.3/configure.desktop 2005-06-09 16:31:48.000000000 +0100 -+++ hplip-0.9.3/configure 2005-06-09 16:32:56.000000000 +0100 -@@ -21627,8 +21627,8 @@ - echo "$as_me:$LINENO: result: \"using $CUPS_BACKEND_PATH\"" >&5 - echo "${ECHO_T}\"using $CUPS_BACKEND_PATH\"" >&6 - --ICONSEARCHPATH="/usr/lib/menu /usr/share/applications" --ICON="hplip hplip.desktop" -+ICONSEARCHPATH="/usr/share/applications" -+ICON="hplip.desktop" - - echo "$as_me:$LINENO: checking \"for icon directory\"" >&5 - echo $ECHO_N "checking \"for icon directory\"... $ECHO_C" >&6 ---- hplip-1.7.4a/Makefile.am.desktop 2007-06-13 13:10:17.000000000 +0100 -+++ hplip-1.7.4a/Makefile.am 2007-06-13 13:10:50.000000000 +0100 -@@ -295,7 +295,6 @@ - # Create ICON file in srcdir. - if [ "$(ICON_FILE)" = "hplip.desktop" ]; then \ - echo -e "[Desktop Entry]" > $(srcdir)/$(ICON_FILE); \ -- echo -e "Version=0.6" >> $(srcdir)/$(ICON_FILE); \ - echo -e "Type=Application" >> $(srcdir)/$(ICON_FILE); \ - echo -e "Name=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \ - echo -e "GenericName=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \ ---- hplip-1.7.4a/Makefile.in.desktop 2007-06-13 13:10:22.000000000 +0100 -+++ hplip-1.7.4a/Makefile.in 2007-06-13 13:10:59.000000000 +0100 -@@ -2770,7 +2770,6 @@ - # Create ICON file in srcdir. - if [ "$(ICON_FILE)" = "hplip.desktop" ]; then \ - echo -e "[Desktop Entry]" > $(srcdir)/$(ICON_FILE); \ -- echo -e "Version=0.6" >> $(srcdir)/$(ICON_FILE); \ - echo -e "Type=Application" >> $(srcdir)/$(ICON_FILE); \ - echo -e "Name=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \ - echo -e "GenericName=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \ +--- hplip-2.7.6/hplip.desktop.in.desktop 2007-04-23 19:46:01.000000000 +0100 ++++ hplip-2.7.6/hplip.desktop.in 2007-06-29 16:10:36.000000000 +0100 +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Version=0.6 ++Encoding=UTF-8 + Type=Application + Name=HP Device Manager + GenericName=HP Device Manager diff --git a/hplip-ipv6.patch b/hplip-ipv6.patch deleted file mode 100644 index a67adbc..0000000 --- a/hplip-ipv6.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- hplip-1.6.10/io/hpiod/jetdirect.cpp.ipv6 2006-04-18 23:34:15.000000000 +0100 -+++ hplip-1.6.10/io/hpiod/jetdirect.cpp 2006-10-30 13:56:15.000000000 +0000 -@@ -55,23 +55,35 @@ - - int JetDirectChannel::Open(char *sendBuf, int *result) - { -- struct sockaddr_in pin; -+ struct sockaddr_storage pin; -+ size_t addrlen; -+ struct addrinfo *hostai; - JetDirectDevice *pD = (JetDirectDevice *)pDev; - char buf[LINE_SIZE]; - int r, len, port; - - *result = R_IO_ERROR; - -+ if (getaddrinfo (pD->GetIP(), NULL, NULL, &hostai) < 0) -+ { -+ syslog(LOG_ERR, "unable to resolve hostname %s\n", pD->GetIP()); -+ goto bugout; -+ } -+ -+ addrlen = hostai->ai_addrlen; - bzero(&pin, sizeof(pin)); -- pin.sin_family = AF_INET; -- pin.sin_addr.s_addr = inet_addr(pD->GetIP()); -+ memcpy(&pin, hostai->ai_addr, addrlen); -+ freeaddrinfo(hostai); - - switch (GetSocketID()) - { - case PRINT_CHANNEL: - port = PrintPort[pD->GetPort()]; -- pin.sin_port = htons(port); -- if ((Socket = socket(AF_INET, SOCK_STREAM, 0)) == -1) -+ if (pin.ss_family == AF_INET) -+ ((struct sockaddr_in *)&pin)->sin_port = htons(port); -+ else if (pin.ss_family == AF_INET6) -+ ((struct sockaddr_in6 *)&pin)->sin6_port = htons(port); -+ if ((Socket = socket(pin.ss_family, SOCK_STREAM, 0)) == -1) - { - syslog(LOG_ERR, "unable to open print port %d JetDirectChannel::Open: %m %s %s %d\n", port, pDev->GetURI(), __FILE__, __LINE__); - goto bugout; -@@ -87,9 +99,11 @@ - port = ScanPort0[pD->GetPort()]; - else - port = ScanPort1[pD->GetPort()]; -- pin.sin_port = htons(port); -- -- if ((Socket = socket(AF_INET, SOCK_STREAM, 0)) == -1) -+ if (pin.ss_family == AF_INET) -+ ((struct sockaddr_in *)&pin)->sin_port = htons(port); -+ else if (pin.ss_family == AF_INET6) -+ ((struct sockaddr_in6 *)&pin)->sin6_port = htons(port); -+ if ((Socket = socket(pin.ss_family, SOCK_STREAM, 0)) == -1) - { - syslog(LOG_ERR, "unable to open scan port %d JetDirectChannel::Open: %m %s %s %d\n", port, pDev->GetURI(), __FILE__, __LINE__); - goto bugout; -@@ -117,8 +131,12 @@ - port = GenericPort[pD->GetPort()]; - else - port = GenericPort1[pD->GetPort()]; -- pin.sin_port = htons(port); -- if ((Socket = socket(AF_INET, SOCK_STREAM, 0)) == -1) -+ -+ if (pin.ss_family == AF_INET) -+ ((struct sockaddr_in *)&pin)->sin_port = htons(port); -+ else if (pin.ss_family == AF_INET6) -+ ((struct sockaddr_in6 *)&pin)->sin6_port = htons(port); -+ if ((Socket = socket(pin.ss_family, SOCK_STREAM, 0)) == -1) - { - syslog(LOG_ERR, "unable to open port %d JetDirectChannel::Open: %m %s %s %d\n", port, pDev->GetURI(), __FILE__, __LINE__); - goto bugout; -@@ -158,8 +176,11 @@ - break; - case EWS_CHANNEL: - port = 80; -- pin.sin_port = htons(port); -- if ((Socket = socket(AF_INET, SOCK_STREAM, 0)) == -1) -+ if (pin.ss_family == AF_INET) -+ ((struct sockaddr_in *)&pin)->sin_port = htons(port); -+ else if (pin.ss_family == AF_INET6) -+ ((struct sockaddr_in6 *)&pin)->sin6_port = htons(port); -+ if ((Socket = socket(pin.ss_family, SOCK_STREAM, 0)) == -1) - { - syslog(LOG_ERR, "unable to open ews port %d JetDirectChannel::Open: %m %s %s %d\n", port, pDev->GetURI(), __FILE__, __LINE__); - goto bugout; - ---- hplip-1.6.10/base/g.py.ipv6 2006-10-30 15:09:12.000000000 +0000 -+++ hplip-1.6.10/base/g.py 2006-10-30 15:09:15.000000000 +0000 -@@ -166,8 +166,8 @@ - prop.hpssd_port = 0 - - --prop.hpiod_host = 'localhost' --prop.hpssd_host = 'localhost' -+prop.hpiod_host = '127.0.0.1' -+prop.hpssd_host = '127.0.0.1' - - prop.username = pwd.getpwuid(os.getuid())[0] - pdb = pwd.getpwnam(prop.username) diff --git a/hplip-libm.patch b/hplip-libm.patch index 4bdd60d..842c8d6 100644 --- a/hplip-libm.patch +++ b/hplip-libm.patch @@ -1,22 +1,22 @@ ---- hplip-1.6.12.8-rc3/Makefile.in.libm 2006-12-12 21:25:19.000000000 +0000 -+++ hplip-1.6.12.8-rc3/Makefile.in 2006-12-13 17:15:04.000000000 +0000 -@@ -509,7 +509,7 @@ - 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 \ - ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h +--- 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 - - # hpaio sane backend - @SCAN_BUILD_TRUE@MAJORVER = 1 ---- hplip-1.6.12.8-rc3/Makefile.am.libm 2006-11-30 23:56:21.000000000 +0000 -+++ hplip-1.6.12.8-rc3/Makefile.am 2006-12-13 17:16:12.000000000 +0000 -@@ -158,7 +158,7 @@ + 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 \ - ip/hpip.h ip/ipdefs.h ip/xform.h ip/xjpg_dct.h ip/xjpg_huf.h ip/xjpg_mrk.h --libhpip_la_LDFLAGS = -version-info 0:1:0 -+libhpip_la_LDFLAGS = -lm -version-info 0:1:0 - - if SCAN_BUILD - diff --git a/hplip-libsane.patch b/hplip-libsane.patch index d41c98f..2d71f71 100644 --- a/hplip-libsane.patch +++ b/hplip-libsane.patch @@ -1,22 +1,22 @@ ---- hplip-1.7.2/Makefile.in.libsane 2007-04-03 13:52:04.000000000 +0100 -+++ hplip-1.7.2/Makefile.in 2007-04-03 13:53:17.000000000 +0100 -@@ -579,7 +579,7 @@ +--- 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 - @SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info $(MAJORVER):$(MINORVER):$(AGEVER) + @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LDFLAGS = -version-info 1:0:0 # The following is a interlibrary dependency that must be compiled first. --@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -+@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -lsane +-@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la ++@HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la -lsane #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG - @SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN + @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE@libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN ---- hplip-1.7.2/Makefile.am.libsane 2007-04-03 13:52:04.000000000 +0100 -+++ hplip-1.7.2/Makefile.am 2007-04-03 13:52:40.000000000 +0100 -@@ -192,7 +192,7 @@ +--- 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 $(MAJORVER):$(MINORVER):$(AGEVER) + libsane_hpaio_la_LDFLAGS = -version-info 1:0:0 # The following is a interlibrary dependency that must be compiled first. --libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -+libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -lsane +-libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la ++libsane_hpaio_la_LIBADD = libhpip.la libhpmud.la -lsane #libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN diff --git a/hplip-media-empty.patch b/hplip-media-empty.patch index 0453feb..2aa36fa 100644 --- a/hplip-media-empty.patch +++ b/hplip-media-empty.patch @@ -1,15 +1,15 @@ ---- hplip-1.7.2/backend/hp/hp.c.media-empty 2006-12-14 18:15:44.000000000 +0000 -+++ hplip-1.7.2/backend/hp/hp.c 2007-04-05 15:45:20.000000000 +0100 -@@ -410,7 +410,7 @@ +--- hplip-2.7.6/prnt/backend/hp.c.media-empty 2007-05-11 22:55:52.000000000 +0100 ++++ hplip-2.7.6/prnt/backend/hp.c 2007-06-29 15:34:02.000000000 +0100 +@@ -326,7 +326,7 @@ int len, vstatus, cnt; - char buf[HPLIP_BUFFER_SIZE+HPLIP_HEADER_SIZE]; - HplipMsgAttributes ma; + char buf[HPMUD_BUFFER_SIZE]; + struct hpmud_model_attributes ma; - int paperout=0, offline=0; -+ int paperout = -1, offline = -1; - - if (argc > 1) - { -@@ -544,17 +544,17 @@ ++ int paperout=-1, offline=-1; + HPMUD_DEVICE hd=-1; + HPMUD_CHANNEL cd=-1; + int n, total, retry=0, size; +@@ -440,14 +440,14 @@ switch (vstatus) { case VSTATUS_OOPA: @@ -17,8 +17,7 @@ + if (paperout != 1) { fputs("STATE: +media-empty-error\n", stderr); -- paperout=1; -+ paperout = 1; + paperout=1; } break; default: @@ -26,8 +25,4 @@ + if (offline != 1) { fputs("STATE: +other\n", stderr); -- offline=1; -+ offline = 1; - } - break; - } + offline=1; diff --git a/hplip-quiet.patch b/hplip-quiet.patch index 9d72211..6f5cbec 100644 --- a/hplip-quiet.patch +++ b/hplip-quiet.patch @@ -1,11 +1,11 @@ ---- hplip-0.9.9/hpssd.py.quiet 2006-03-13 11:12:49.000000000 +0000 -+++ hplip-0.9.9/hpssd.py 2006-03-13 11:12:50.000000000 +0000 -@@ -1441,8 +1441,6 @@ +--- hplip-2.7.6/hpssd.py.quiet 2007-06-01 00:23:37.000000000 +0100 ++++ hplip-2.7.6/hpssd.py 2007-06-29 14:06:25.000000000 +0100 +@@ -656,8 +656,6 @@ usage() - utils.log_title(__title__, __version__) - - prop.history_size = 32 + prop.history_size = 100 - # Lock pidfile before we muck around with system state + if prop.daemonize: diff --git a/hplip.spec b/hplip.spec index bdb43b9..e5b6355 100644 --- a/hplip.spec +++ b/hplip.spec @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip -Version: 1.7.4a -Release: 3%{?dist} +Version: 2.7.6 +Release: 1%{?dist} License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -16,9 +16,7 @@ Source: http://kent.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}.tar. Patch1: hplip-desktop.patch Patch2: hplip-guest.patch Patch3: hplip-quiet.patch -Patch4: hplip-cups-backend.patch Patch5: hplip-libm.patch -Patch6: hplip-ipv6.patch Patch8: hplip-libsane.patch Patch9: hplip-media-empty.patch Patch11: hplip-unload-traceback.patch @@ -92,15 +90,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} # Quieten hpssd on startup. %patch3 -p1 -b .quiet -# Always use /usr/lib/cups/backend. -%patch4 -p1 -b .cups-backend - # libhpip should link against libm (bug #197599). %patch5 -p1 -b .libm -# IPv6 support (bug #198377). -%patch6 -p1 -b .ipv6 - # Link libsane-hpaio against libsane (bug #234813). %patch8 -p1 -b .libsane @@ -119,7 +111,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} autoconf # for patch4 %build -%configure --disable-foomatic-install --disable-cups-install +%configure --disable-foomatic-xml-install --disable-cups-install make hpppddir=%{_datadir}/foomatic/db/source/PPD/HP %install @@ -128,10 +120,6 @@ mkdir -p %{buildroot}%{_bindir} make install DESTDIR=%{buildroot} \ hpppddir=%{_datadir}/foomatic/db/source/PPD/HP -# Move SANE backend into correct directory -mkdir -p %{buildroot}%{_libdir}/sane -mv %{buildroot}%{_libdir}/libsane-*.so* %{buildroot}%{_libdir}/sane - # Remove unpackaged files rm -rf %{buildroot}%{_sysconfdir}/sane.d \ %{buildroot}%{_docdir} @@ -140,38 +128,27 @@ rm -f %{buildroot}%{_bindir}/foomatic-rip \ %{buildroot}%{_libdir}/cups/filter/foomatic-rip \ %{buildroot}%{_libdir}/*.la \ %{buildroot}%{_libdir}/*.so \ + %{buildroot}%{_libdir}/sane/*.la \ %{buildroot}%{_datadir}/cups/model/foomatic-ppds \ %{buildroot}%{_datadir}/applications/hplip.desktop mkdir -p %{buildroot}%{_datadir}/applications -echo 'NoDisplay=true' >> %{buildroot}%{_datadir}/hplip/data/hplip.desktop -sed -i -e '/^Categories=/d' %{buildroot}%{_datadir}/hplip/data/hplip.desktop +echo 'NoDisplay=true' >> hplip.desktop +sed -i -e '/^Categories=/d' hplip.desktop desktop-file-install --vendor HP \ --dir %{buildroot}%{_datadir}/applications \ - --add-category X-Red-Hat-Extra \ --add-category System \ + --add-category Settings \ + --add-category HardwareSettings \ --add-category Application \ - %{buildroot}%{_datadir}/hplip/data/hplip.desktop - -# Move initscript -mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d -mv %{buildroot}%{_sysconfdir}/{init.d,rc.d/init.d}/hplip + hplip.desktop # Remove files we don't want to package. -rm -f %{buildroot}%{_datadir}/hplip/COPYING -rm -f %{buildroot}%{_datadir}/hplip/hplip -rm -f %{buildroot}%{_datadir}/hplip/hplip.conf -rm -f %{buildroot}%{_datadir}/hplip/hplip_overview.png -rm -f %{buildroot}%{_datadir}/hplip/hplip_readme.html -rm -f %{buildroot}%{_datadir}/hplip/hplip.sh -rm -f %{buildroot}%{_datadir}/hplip/data/hplip.desktop rm -f %{buildroot}%{_bindir}/hp-check -rm -f %{buildroot}%{_datadir}/hplip/check +rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc +rm -f %{buildroot}%{_datadir}/hplip/check.py rm -f %{buildroot}%{_datadir}/hplip/hplip-install rm -rf %{buildroot}%{_datadir}/hplip/install* -rm -f %{buildroot}%{_datadir}/hplip/hpaio.desc -rm -rf %{buildroot}%{_datadir}/hplip/fax/ppd -rm -rf %{buildroot}%{_datadir}/hplip/fax/backend %clean rm -rf %{buildroot} @@ -179,9 +156,9 @@ rm -rf %{buildroot} %files %defattr(-,root,root) %doc COPYING doc/* +%{_sysconfdir}/udev/rules.d/* %dir %{_sysconfdir}/hp %config(noreplace) %{_sysconfdir}/hp/hplip.conf -%config(noreplace) %{_sysconfdir}/rc.d/init.d/hplip %{_bindir}/hp-align %{_bindir}/hp-clean %{_bindir}/hp-colorcal @@ -192,37 +169,41 @@ rm -rf %{buildroot} %{_bindir}/hp-makecopies %{_bindir}/hp-makeuri %{_bindir}/hp-probe +%{_bindir}/hp-scan %{_bindir}/hp-sendfax %{_bindir}/hp-setup %{_bindir}/hp-testpage %{_bindir}/hp-timedate %{_bindir}/hp-unload -%{_sbindir}/hpiod # Note: this must be /usr/lib not %{_libdir}, since that's the # CUPS serverbin directory. /usr/lib/cups/backend/hp /usr/lib/cups/backend/hpfax +# Python extension %{_libdir}/python*/site-packages/* +# Libraries +%{_libdir}/libhpmud.so* %dir %{_datadir}/hplip # Files -%{_datadir}/hplip/align -%{_datadir}/hplip/clean -%{_datadir}/hplip/colorcal -%{_datadir}/hplip/fab +%{_datadir}/hplip/align.py* +%{_datadir}/hplip/clean.py* +%{_datadir}/hplip/colorcal.py* +%{_datadir}/hplip/fab.py* %{_datadir}/hplip/fax -%{_datadir}/hplip/firmware +%{_datadir}/hplip/firmware.py* %{_datadir}/hplip/hpssd* -%{_datadir}/hplip/info -%{_datadir}/hplip/__init__* -%{_datadir}/hplip/levels -%{_datadir}/hplip/makecopies -%{_datadir}/hplip/makeuri -%{_datadir}/hplip/probe -%{_datadir}/hplip/sendfax -%{_datadir}/hplip/setup -%{_datadir}/hplip/testpage -%{_datadir}/hplip/timedate -%{_datadir}/hplip/unload +%{_datadir}/hplip/info.py* +%{_datadir}/hplip/__init__.py* +%{_datadir}/hplip/levels.py* +%{_datadir}/hplip/makecopies.py* +%{_datadir}/hplip/makeuri.py* +%{_datadir}/hplip/probe.py* +%{_datadir}/hplip/scan.py* +%{_datadir}/hplip/sendfax.py* +%{_datadir}/hplip/setup.py* +%{_datadir}/hplip/testpage.py* +%{_datadir}/hplip/timedate.py* +%{_datadir}/hplip/unload.py* # Directories %{_datadir}/hplip/base %{_datadir}/hplip/copier @@ -239,40 +220,28 @@ rm -rf %{buildroot} %files gui %{_bindir}/hp-print %{_bindir}/hp-toolbox -# Files -%{_datadir}/hplip/data/images -%{_datadir}/hplip/print -%{_datadir}/hplip/toolbox -# Directories -%{_datadir}/hplip/ui -%{_datadir}/hplip/plugins %{_datadir}/applications/*.desktop +# Files +%{_datadir}/hplip/print.py* +%{_datadir}/hplip/toolbox.py* +# Directories +%{_datadir}/hplip/data/images +%{_datadir}/hplip/plugins +%{_datadir}/hplip/ui %files -n hpijs %defattr(-,root,root) -%doc prnt/hpijs/COPYING %{_libdir}/libhpip.so* %{_bindir}/hpijs %{_datadir}/foomatic/db/source/PPD/HP -#%{_bindir}/hppgsz %files -n libsane-hpaio %defattr(-,root,root) %{_libdir}/sane/libsane-*.so* -%post -/sbin/chkconfig --add hplip || : -if [ "$1" -ge "1" ]; then - /sbin/service hplip condrestart >/dev/null 2>&1 || : -fi -exit 0 - -%preun -if [ "$1" == "0" ]; then - /sbin/service hplip stop >/dev/null 2>&1 || : - /sbin/chkconfig --del hplip -fi -exit 0 +%pre +# No daemons any more. +[ -x /etc/init.d/hplip ] && /sbin/service hplip stop %post gui /usr/bin/update-desktop-database &>/dev/null ||: @@ -289,6 +258,9 @@ fi exit 0 %changelog +* Fri Jun 29 2007 Tim Waugh 2.7.6-1 +- 2.7.6. + * Thu Jun 28 2007 Tim Waugh 1.7.4a-3 - Another go at avoiding AVC messages on boot (bug #244205). diff --git a/sources b/sources index eed142e..9ac6afd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -210e948d1f1f376426a2cca0ed9d1e6c hplip-1.7.4a.tar.gz +7493f4d53ec98123d69c9b36318cc1f5 hplip-2.7.6.tar.gz