rpms/hplip/devel .cvsignore, 1.18, 1.19 hplip-desktop.patch, 1.2, 1.3 hplip-libm.patch, 1.2, 1.3 hplip-libsane.patch, 1.1, 1.2 hplip-media-empty.patch, 1.2, 1.3 hplip-quiet.patch, 1.3, 1.4 hplip.spec, 1.134, 1.135 sources, 1.18, 1.19 hplip-cups-backend.patch, 1.1, NONE hplip-ipv6.patch, 1.1, NONE
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Fri Jun 29 16:54:16 UTC 2007
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12966
Modified Files:
.cvsignore hplip-desktop.patch hplip-libm.patch
hplip-libsane.patch hplip-media-empty.patch hplip-quiet.patch
hplip.spec sources
Removed Files:
hplip-cups-backend.patch hplip-ipv6.patch
Log Message:
* Fri Jun 29 2007 Tim Waugh <twaugh at redhat.com> 2.7.6-1
- 2.7.6.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 13 Jun 2007 12:00:08 -0000 1.18
+++ .cvsignore 29 Jun 2007 16:53:39 -0000 1.19
@@ -15,3 +15,4 @@
hplip-1.7.1.tar.gz
hplip-1.7.2.tar.gz
hplip-1.7.4a.tar.gz
+hplip-2.7.6.tar.gz
hplip-desktop.patch:
Index: hplip-desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-desktop.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hplip-desktop.patch 13 Jun 2007 13:20:45 -0000 1.2
+++ hplip-desktop.patch 29 Jun 2007 16:53:39 -0000 1.3
@@ -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
hplip-libm.patch:
Index: hplip-libm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-libm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hplip-libm.patch 10 Jan 2007 15:58:14 -0000 1.2
+++ hplip-libm.patch 29 Jun 2007 16:53:39 -0000 1.3
@@ -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 at cupsext_la_LDFLAGS = -module -avoid-version
+ @HPLIP_BUILD_TRUE at cupsext_la_SOURCES = prnt/cupsext/cupsext.c
+ @HPLIP_BUILD_TRUE at cupsext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
+- at HPLIP_BUILD_TRUE@libhpip_la_LDFLAGS = -version-info 0:1:0
++ at HPLIP_BUILD_TRUE@libhpip_la_LDFLAGS = -lm -version-info 0:1:0
+ @HPLIP_BUILD_TRUE at 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 at 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
-
hplip-libsane.patch:
Index: hplip-libsane.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-libsane.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hplip-libsane.patch 3 Apr 2007 12:53:42 -0000 1.1
+++ hplip-libsane.patch 29 Jun 2007 16:53:39 -0000 1.2
@@ -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 at libsane_hpaio_la_LDFLAGS = -version-info $(MAJORVER):$(MINORVER):$(AGEVER)
+ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at libsane_hpaio_la_LDFLAGS = -version-info 1:0:0
# The following is a interlibrary dependency that must be compiled first.
-- at SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la
-+ at SCAN_BUILD_TRUE@libsane_hpaio_la_LIBADD = libhpip.la libhplip-api.la -lsane
+- 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_CFLAGS = -DWITH_NONAMESPACES -DSOAP_DEBUG
- @SCAN_BUILD_TRUE at libsane_hpaio_la_CFLAGS = -DWITH_NONAMESPACES -DWITH_LEAN
+ @HPLIP_BUILD_TRUE@@SCAN_BUILD_TRUE at 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
hplip-media-empty.patch:
Index: hplip-media-empty.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-media-empty.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hplip-media-empty.patch 5 Apr 2007 15:39:29 -0000 1.2
+++ hplip-media-empty.patch 29 Jun 2007 16:53:39 -0000 1.3
@@ -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;
hplip-quiet.patch:
Index: hplip-quiet.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-quiet.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hplip-quiet.patch 13 Mar 2006 11:26:01 -0000 1.3
+++ hplip-quiet.patch 29 Jun 2007 16:53:39 -0000 1.4
@@ -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:
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- hplip.spec 28 Jun 2007 15:34:25 -0000 1.134
+++ hplip.spec 29 Jun 2007 16:53:39 -0000 1.135
@@ -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 @@
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 @@
# 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 @@
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 @@
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 @@
%{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 @@
%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 @@
%{_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 @@
%files gui
%{_bindir}/hp-print
%{_bindir}/hp-toolbox
+%{_datadir}/applications/*.desktop
# Files
-%{_datadir}/hplip/data/images
-%{_datadir}/hplip/print
-%{_datadir}/hplip/toolbox
+%{_datadir}/hplip/print.py*
+%{_datadir}/hplip/toolbox.py*
# Directories
-%{_datadir}/hplip/ui
+%{_datadir}/hplip/data/images
%{_datadir}/hplip/plugins
-%{_datadir}/applications/*.desktop
+%{_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 @@
exit 0
%changelog
+* Fri Jun 29 2007 Tim Waugh <twaugh at redhat.com> 2.7.6-1
+- 2.7.6.
+
* Thu Jun 28 2007 Tim Waugh <twaugh at redhat.com> 1.7.4a-3
- Another go at avoiding AVC messages on boot (bug #244205).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 13 Jun 2007 12:00:08 -0000 1.18
+++ sources 29 Jun 2007 16:53:39 -0000 1.19
@@ -1 +1 @@
-210e948d1f1f376426a2cca0ed9d1e6c hplip-1.7.4a.tar.gz
+7493f4d53ec98123d69c9b36318cc1f5 hplip-2.7.6.tar.gz
--- hplip-cups-backend.patch DELETED ---
--- hplip-ipv6.patch DELETED ---
More information about the fedora-extras-commits
mailing list