Djam/hplip
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/hplip.git synced 2025-02-24 08:53:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 3.12.9-1

Browse source
This commit is contained in:
Rosa 2012-09-13 04:19:03 +00:00
parent 6816aac1b8
commit d7bb40d6a5
7 changed files with 87 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
"hplip-3.12.6.tar.gz": f3d7f66fb5eff2158ac42bb5a115f8ef8bd7a383
"hplip-3.12.9.tar.gz": e7c16d788d9c4c493ea97f1d9cc995439d6f4206

15
hplip-3.11.12-mga-makefile-chgrp.patch
View file

@ -1,15 +0,0 @@
--- hplip-3.12.6/Makefile.am.chgrp 2012-06-18 12:44:13.000000000 +0200
+++ hplip-3.12.6/Makefile.am 2012-06-26 18:19:09.477241026 +0200
@@ -543,12 +543,10 @@ endif
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

10
hplip-3.12.9-addprinter.patch Normal file
View file

@ -0,0 +1,10 @@
--- hplip-3.12.9/prnt/cupsext/cupsext.c.addprinter 2012-09-04 14:31:10.000000000 +0200
+++ hplip-3.12.9/prnt/cupsext/cupsext.c 2012-09-11 16:42:26.229950718 +0200
@@ -324,6 +324,7 @@ PyObject * getPrinters( PyObject * self,
};
/* Connect to the HTTP server */
+ cupsSetUser ("root");
if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
{
goto abort;

52
hplip-3.12.9-makefile-chgrp.patch Normal file
View file

@ -0,0 +1,52 @@
--- hplip-3.12.9/Makefile.am.chgrp 2012-09-11 17:10:08.359579504 +0200
+++ hplip-3.12.9/Makefile.am 2012-09-11 17:10:25.370821335 +0200
@@ -552,24 +552,20 @@ endif
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
install-dist_hplip_tmpDATA:
if FULL_BUILD
test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
- chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
chmod 1774 $(DESTDIR)$(hplip_tmpdir)
endif #FULL_BUILD
if HPLIP_BUILD
test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
- chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
chmod 1774 $(DESTDIR)$(hplip_tmpdir)
endif #FULL_BUILD
--- hplip-3.12.9/Makefile.in.chgrp 2012-09-04 14:35:24.000000000 +0200
+++ hplip-3.12.9/Makefile.in 2012-09-11 17:09:13.179795069 +0200
@@ -8841,18 +8841,18 @@ uninstall-am: uninstall-binPROGRAMS unin
install-dist_hplip_LogDATA:
@FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+#@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
@FULL_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir)
@HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
+#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
@HPLIP_BUILD_TRUE@ chmod 774 $(DESTDIR)$(hplip_Logdir)
install-dist_hplip_tmpDATA:
@FULL_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+#@FULL_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
@FULL_BUILD_TRUE@ chmod 1774 $(DESTDIR)$(hplip_tmpdir)
@HPLIP_BUILD_TRUE@ test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
+#@HPLIP_BUILD_TRUE@ chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
@HPLIP_BUILD_TRUE@ chmod 1774 $(DESTDIR)$(hplip_tmpdir)
install-dist_cronDATA:$(dist_cron_DATA)

6
hplip-syslog-fix-debug-messages-to-error.dpatch → hplip-3.12.9-syslog-fix-debug-messages-to-error.dpatch
View file

@ -1,7 +1,5 @@
Index: hplip-3.11.12/prnt/hpcups/CommonDefinitions.h
===================================================================
--- hplip-3.11.12/prnt/hpcups/CommonDefinitions.h
+++ hplip-3.11.12/prnt/hpcups/CommonDefinitions.h 2011-12-20 13:32:00.990358274 +0100
--- hplip-3.12.9/prnt/hpcups/CommonDefinitions.h.hplip-syslog-fix-debug-messages-to-error 2012-09-04 14:31:10.000000000 +0200
+++ hplip-3.12.9/prnt/hpcups/CommonDefinitions.h 2012-09-11 16:45:05.873220203 +0200
@@ -68,7 +68,7 @@
#define _STRINGIZE(x) #x
#define STRINGIZE(x) _STRINGIZE(x)

10
hplip-addprinter.patch
View file

@ -1,10 +0,0 @@
--- hplip-3.11.1/prnt/cupsext/cupsext.c~ 2011-01-18 22:15:27.000000000 -0700
+++ hplip-3.11.1/prnt/cupsext/cupsext.c 2011-02-07 10:59:31.370530033 -0700
@@ -323,6 +323,7 @@
};
/* Connect to the HTTP server */
+ cupsSetUser ("root");
if ( ( http = httpConnectEncrypt( cupsServer(), ippPort(), cupsEncryption() ) ) == NULL )
{
goto abort;

20
hplip.spec
View file

@ -17,7 +17,7 @@
Summary: HP printer/all-in-one driver infrastructure
Name: hplip
Version: 3.12.6
Version: 3.12.9
Release: 1
License: GPLv2+ and MIT
Group: System/Printing
@ -52,13 +52,13 @@ Patch119: hplip-dbglog-newline.patch
Patch121: hplip-ppd-ImageableArea.patch
Patch122: hplip-raw_deviceID-traceback.patch
Patch123: hplip-UnicodeDecodeError.patch
Patch124: hplip-addprinter.patch
Patch124: hplip-3.12.9-addprinter.patch
Patch125: hplip-dbus-exception.patch
Patch126: hplip-notification-exception.patch
Patch127: hplip-CVE-2010-4267.patch
Patch128: hplip-wifisetup.patch
# recreated from makefile-chgrp.patch against Makefile.am
Patch129: hplip-3.11.12-mga-makefile-chgrp.patch
Patch129: hplip-3.12.9-makefile-chgrp.patch
Patch130: hplip-hpaio-localonly.patch
# Debian/Ubuntu patches
@ -83,7 +83,7 @@ Patch217: hplip-3.11.10-mga-remove-duplicate-entry-for-cp1700-in-drv-files.patch
Patch219: try_libhpmud.so.0.dpatch
Patch220: add-lidil-two-cartridge-modes.dpatch
Patch221: add_missing_newline_for_error_log.dpatch
Patch224: hplip-syslog-fix-debug-messages-to-error.dpatch
Patch224: hplip-3.12.9-syslog-fix-debug-messages-to-error.dpatch
Patch225: hpfax-bug-function-used-before-importing-log.dpatch
Patch226: hp-systray-make-menu-title-visible-in-sni-qt-indicator.dpatch
Patch227: hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde.dpatch
@ -105,7 +105,7 @@ BuildRequires: desktop-file-utils
BuildRequires: dbus-devel
BuildRequires: udev-devel
BuildRequires: polkit
BuildRequires: gphoto2-devel
BuildRequires: pkgconfig(libgphoto2)
BuildRequires: libv4l-devel
Requires: cups
# For dynamic ppd generation.
@ -299,7 +299,7 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}%{extraversion}
%patch114 -p1 -b .hpcups-sigpipe
# Use correct fax PPD name for Qt3 UI.
%patch115 -p1 -b .fax-ppd
#patch115 -p1 -b .fax-ppd
# Fixed Device ID parsing code in hpijs's dj9xxvip.c (RH bug #510926).
%patch116 -p1 -b .bad-low-ink-warning
@ -627,6 +627,7 @@ fi
%{_bindir}/hp-info
%{_bindir}/hp-levels
%{_bindir}/hp-linefeedcal
%{_bindir}/hp-logcapture
%{_bindir}/hp-makecopies
%{_bindir}/hp-makeuri
%{_bindir}/hp-mkuri
@ -684,6 +685,7 @@ fi
%{_datadir}/hplip/__init__.py*
%{_datadir}/hplip/levels.py*
%{_datadir}/hplip/linefeedcal.py*
%{_datadir}/hplip/logcapture.py*
%{_datadir}/hplip/makecopies.py*
%{_datadir}/hplip/makeuri.py*
%{_datadir}/hplip/pkservice.py*
@ -718,6 +720,7 @@ fi
%{_datadir}/dbus-1/system-services/com.hp.hplip.service
#%{_localstatedir}/lib/hp/hplip.state
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.hp.hplip.conf
%{_sysconfdir}/cron.daily/hplip_cron
%files doc
%doc %{_docdir}/%{name}-doc-%{version}%{extraversion}
@ -773,6 +776,11 @@ fi
%changelog
* Tue Sep 11 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 3.12.9-1
+ Revision: 816799
- new version
- update buildrequires
* Tue Jun 26 2012 Bernhard Rosenkraenzer <bero@bero.eu> 3.12.6-1
+ Revision: 807062
- Update to 3.12.6