rpms/hplip/devel .cvsignore, 1.23, 1.24 hplip-marker-supply.patch, 1.7, 1.8 hplip.spec, 1.173, 1.174 sources, 1.23, 1.24 hplip-media-empty.patch, 1.4, NONE hplip-unload-traceback.patch, 1.1, NONE
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Tue Mar 4 18:03:00 UTC 2008
Author: twaugh
Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14737
Modified Files:
.cvsignore hplip-marker-supply.patch hplip.spec sources
Removed Files:
hplip-media-empty.patch hplip-unload-traceback.patch
Log Message:
* Tue Mar 4 2008 Tim Waugh <twaugh at redhat.com> 2.8.2-1
- 2.8.2. No longer need alloc, unload-traceback or media-empty patches.
- Ship cupsddk driver. The hpijs sub-package now requires cupsddk-drivers.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 18 Jan 2008 14:42:45 -0000 1.23
+++ .cvsignore 4 Mar 2008 18:02:20 -0000 1.24
@@ -20,3 +20,4 @@
hplip-2.7.9.tar.gz
hplip-2.7.10.tar.gz
hplip-2.7.12.tar.gz
+hplip-2.8.2.tar.gz
hplip-marker-supply.patch:
Index: hplip-marker-supply.patch
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip-marker-supply.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hplip-marker-supply.patch 4 Mar 2008 16:48:32 -0000 1.7
+++ hplip-marker-supply.patch 4 Mar 2008 18:02:20 -0000 1.8
@@ -1,16 +1,17 @@
---- hplip-2.7.6/prnt/hpijs/hpijs.cpp.marker-supply 2007-07-16 18:19:31.000000000 +0100
-+++ hplip-2.7.6/prnt/hpijs/hpijs.cpp 2007-07-16 18:19:43.000000000 +0100
-@@ -534,11 +534,11 @@
+diff -up hplip-2.8.2/prnt/hpijs/hpijs.cpp.marker-supply hplip-2.8.2/prnt/hpijs/hpijs.cpp
+--- hplip-2.8.2/prnt/hpijs/hpijs.cpp.marker-supply 2008-02-08 19:36:38.000000000 +0000
++++ hplip-2.8.2/prnt/hpijs/hpijs.cpp 2008-03-04 17:51:02.000000000 +0000
+@@ -541,11 +541,11 @@ int main (int argc, char *argv[], char *
case WARN_LOW_INK_YELLOW:
case WARN_LOW_INK_MULTIPLE_PENS:
- {
-- bug ("STATE: marker-supply-low\n");
-+ bug ("STATE: +marker-supply-low-warning\n");
- break;
- }
+ {
+- bug ("STATE: marker-supply-low-warning\n");
++ bug ("STATE: +marker-supply-low-warning\n");
+ break;
+ }
default:
-- bug ("STATE: -marker-supply-low");
-+ bug ("STATE: -marker-supply-low-warning\n");
+- bug ("STATE: -marker-supply-low-warning");
++ bug ("STATE: -marker-supply-low-warning\n");
}
}
Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- hplip.spec 4 Mar 2008 16:48:32 -0000 1.173
+++ hplip.spec 4 Mar 2008 18:02:20 -0000 1.174
@@ -1,7 +1,7 @@
Summary: HP Linux Imaging and Printing Project
Name: hplip
-Version: 2.7.12
-Release: 6%{?dist}
+Version: 2.8.2
+Release: 1%{?dist}
License: GPLv2+ and MIT
Group: System Environment/Daemons
Conflicts: system-config-printer < 0.6.132
@@ -19,10 +19,7 @@
Patch3: hplip-quiet.patch
Patch4: hplip-marker-supply.patch
Patch5: hplip-libm.patch
-Patch6: hplip-alloc.patch
Patch8: hplip-libsane.patch
-Patch9: hplip-media-empty.patch
-Patch11: hplip-unload-traceback.patch
Patch12: hplip-no-root-config.patch
Patch13: hplip-ui-optional.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,6 +68,7 @@
Epoch: %{hpijs_epoch}
Requires: python-reportlab
Requires: net-snmp
+Requires: cupsddk-drivers
%description -n hpijs
hpijs is a collection of optimized drivers for HP printers.
@@ -109,18 +107,9 @@
# libhpip should link against libm (bug #197599).
%patch5 -p1 -b .libm
-# The hpijs compression module doesn't allocate enough memory (bug #428536).
-%patch6 -p1 -b .alloc
-
# Link libsane-hpaio against libsane (bug #234813).
%patch8 -p1 -b .libsane
-# Clear the media-empty-error printer state.
-%patch9 -p1 -b .media-empty
-
-# Prevent a traceback when unloading a photo card (bug #238617).
-%patch11 -p1 -b .unload-traceback
-
# Prevent SELinux audit message from the CUPS backends (bug #241776)
%patch12 -p1 -b .no-root-config
@@ -131,7 +120,8 @@
%build
%configure --disable-foomatic-xml-install --disable-cups-install \
- --enable-scan-build --enable-gui-build --enable-fax-build
+ --enable-scan-build --enable-gui-build --enable-fax-build \
+ --disable-foomatic-rip-hplip-install
make hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
%install
@@ -257,6 +247,7 @@
%{_libdir}/libhpmud.so*
%{_bindir}/hpijs
%{_datadir}/foomatic/db/source/PPD/HP
+%{_datadir}/cups/drv/*
%files -n libsane-hpaio
%defattr(-,root,root)
@@ -284,6 +275,10 @@
exit 0
%changelog
+* Tue Mar 4 2008 Tim Waugh <twaugh at redhat.com> 2.8.2-1
+- 2.8.2. No longer need alloc, unload-traceback or media-empty patches.
+- Ship cupsddk driver. The hpijs sub-package now requires cupsddk-drivers.
+
* Tue Mar 4 2008 Tim Waugh <twaugh at redhat.com> 2.7.12-6
- Fixed marker-supply-low strings.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 18 Jan 2008 14:42:45 -0000 1.23
+++ sources 4 Mar 2008 18:02:20 -0000 1.24
@@ -1 +1 @@
-ba00337ccf1b520509518bffbec960db hplip-2.7.12.tar.gz
+ea57b92483622d3eae359994c5fd3dc3 hplip-2.8.2.tar.gz
--- hplip-media-empty.patch DELETED ---
--- hplip-unload-traceback.patch DELETED ---
More information about the fedora-extras-commits
mailing list