Author: arekm Date: Thu Feb 9 14:59:03 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 3.12.2
---- Files affected:
packages/hplip:
hplip-build.patch (1.1 -> 1.2) , hplip.spec (1.93 -> 1.94)
---- Diffs:
================================================================
Index: packages/hplip/hplip-build.patch
diff -u packages/hplip/hplip-build.patch:1.1
packages/hplip/hplip-build.patch:1.2
--- packages/hplip/hplip-build.patch:1.1 Wed Jul 15 09:08:53 2009
+++ packages/hplip/hplip-build.patch Thu Feb 9 15:58:58 2012
@@ -1,26 +1,15 @@
---- hplip-2.8.10/prnt/hpijs/registry.cpp~ 2008-10-31 23:27:44.000000000
+0100
-+++ hplip-2.8.10/prnt/hpijs/registry.cpp 2009-07-15 09:05:58.048526893
+0200
-@@ -285,10 +285,10 @@
- device = eDJ3320;
- match = TRUE;
- }
-- char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
-+ char *cmdStr = (char *)strstr ((const char *) DevIDBuffer+2,
"CMD:");
- if (!cmdStr)
- {
-- cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND
SET:");
-+ cmdStr = (char *)strstr ((const char *) DevIDBuffer+2,
"COMMAND SET:");
- }
- if (!match && cmdStr && (strstr ((const char *) cmdStr+4,
"POSTSCRIPT") ||
- strstr ((const char *) cmdStr+4,
"PostScript") ||
---- hplip-2.8.10/prnt/hpijs/dj3320.cpp~ 2008-10-31 23:27:44.000000000
+0100
-+++ hplip-2.8.10/prnt/hpijs/dj3320.cpp 2009-07-15 09:07:37.832654493 +0200
-@@ -429,7 +429,7 @@
- pLDLEncap->bNewStatus = FALSE;
+--- hplip-3.12.2/Makefile.am~ 2012-02-09 15:31:02.000000000 +0100
++++ hplip-3.12.2/Makefile.am 2012-02-09 15:32:46.074765870 +0100
+@@ -506,12 +506,10 @@
+ install-dist_hplip_LogDATA:
+ if FULL_BUILD
+ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p
$(DESTDIR)$(hplip_Logdir)
+- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+ chmod 774 $(DESTDIR)$(hplip_Logdir)
+ endif #FULL_BUILD
+ if HPLIP_BUILD
+ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p
$(DESTDIR)$(hplip_Logdir)
+- chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+ chmod 774 $(DESTDIR)$(hplip_Logdir)
+ endif #FULL_BUILD
- // First 10 bytes of m_pbyReadBuff are packet header. Status
query from printer has $S:
-- if ((pcStr = strstr((const char*)pLDLEncap->byStatusBuff + 10,
"$S:")) == NULL)
-+ if ((pcStr = (char *)strstr((const char*)pLDLEncap->byStatusBuff
+ 10, "$S:")) == NULL)
- {
- m_dsCurrentStatus = DISPLAY_COMM_PROBLEM;
- return DISPLAY_COMM_PROBLEM;
================================================================
Index: packages/hplip/hplip.spec
diff -u packages/hplip/hplip.spec:1.93 packages/hplip/hplip.spec:1.94
--- packages/hplip/hplip.spec:1.93 Wed Nov 30 20:07:40 2011
+++ packages/hplip/hplip.spec Thu Feb 9 15:58:58 2012
@@ -11,16 +11,17 @@
Summary: Hewlett-Packard Linux Imaging and Printing suite - printing and
scanning using HP devices
Summary(pl.UTF-8): Narzędzia Hewlett-Packard Linux Imaging and Printing -
drukowanie i skanowanie przy użyciu urządzeń HP
Name: hplip
-Version: 3.11.10
-Release: 2
+Version: 3.12.2
+Release: 1
License: BSD (hpijs), MIT (low-level scanning and printing code), GPL v2
(the rest)
Group: Applications/System
Source0: http://downloads.sourceforge.net/hplip/%{name}-%{version}.tar.gz
-# Source0-md5: 6143f30f3b6905ef22105176a3b80db0
+# Source0-md5: 6572ec99c1818cc92d97b793bff08633
Patch0: %{name}-desktop.patch
Patch1: unresolved.patch
Patch2: pld-distro.patch
Patch3: %{name}-binary-fixup.patch
+Patch4: %{name}-build.patch
URL: http://hplipopensource.com/
BuildRequires: autoconf
BuildRequires: automake
@@ -159,6 +160,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%{__sed} -i -e's,^#!/usr/bin/env python$,#!/usr/bin/python,' *.py
%{__sed} -i -e 's#test -d /usr/share/polkit-1#true#' configure.in
@@ -231,8 +233,10 @@
%attr(755,root,root) %{_bindir}/hpijs
%attr(755,root,root) %{_bindir}/hp-align
%attr(755,root,root) %{_bindir}/hp-check
+%attr(755,root,root) %{_bindir}/hp-check-plugin
%attr(755,root,root) %{_bindir}/hp-clean
%attr(755,root,root) %{_bindir}/hp-colorcal
+%attr(755,root,root) %{_bindir}/hp-diagnose_plugin
%attr(755,root,root) %{_bindir}/hp-firmware
%attr(755,root,root) %{_bindir}/hp-info
%attr(755,root,root) %{_bindir}/hp-levels
@@ -255,8 +259,10 @@
%{_datadir}/hplip/copier/*.py
%attr(755,root,root) %{_datadir}/hplip/align.py
%attr(755,root,root) %{_datadir}/hplip/check.py
+%attr(755,root,root) %{_datadir}/hplip/check-plugin.py
%attr(755,root,root) %{_datadir}/hplip/clean.py
%attr(755,root,root) %{_datadir}/hplip/colorcal.py
+%attr(755,root,root) %{_datadir}/hplip/diagnose_plugin.py
%attr(755,root,root) %{_datadir}/hplip/firmware.py
%attr(755,root,root) %{_datadir}/hplip/hpdio.py
%attr(755,root,root) %{_datadir}/hplip/hpssd.py
@@ -297,6 +303,7 @@
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/hp/hplip.conf
/etc/udev/rules.d/40-hplip.rules
/etc/udev/rules.d/56-hpmud_support.rules
+/etc/udev/rules.d/86-hpmud_plugin.rules
/etc/dbus-1/system.d/com.hp.hplip.conf
%{_datadir}/dbus-1/system-services/com.hp.hplip.service
%{_datadir}/polkit-1/actions/com.hp.hplip.policy
@@ -323,7 +330,6 @@
%attr(755,root,root) %{_datadir}/hplip/printsettings.py
%attr(755,root,root) %{_datadir}/hplip/systray.py
%attr(755,root,root) %{_datadir}/hplip/toolbox.py
-#%{_datadir}/hplip/plugins
%{_datadir}/hplip/ui4
%{_datadir}/hplip/data/images
%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
@@ -378,6 +384,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.94 2012/02/09 14:58:58 arekm
+- up to 3.12.2
+
Revision 1.93 2011/11/30 19:07:40 arekm
- rel 2; patch binary plugin for 64bit, too
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hplip/hplip-build.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hplip/hplip.spec?r1=1.93&r2=1.94&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
