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

add foomatic and disable polkit

Browse source
This commit is contained in:
akdengi 2013-04-15 09:59:51 +04:00
parent 53af0c7c59
commit 252af24bb2
2 changed files with 37 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
hplip-apply-udev-rules-on-action-change.patch
View file

@ -1,5 +1,7 @@
--- hplip-3.12.6/data/rules/40-hplip.rules.udev~ 2012-06-18 12:43:22.000000000 +0200
+++ hplip-3.12.6/data/rules/40-hplip.rules 2012-06-26 18:09:27.640268427 +0200
Index: hplip-3.12.6/data/rules/40-hplip.rules
===================================================================
--- hplip-3.12.6/data/rules/40-hplip.rules
+++ hplip-3.12.6/data/rules/40-hplip.rules 2012-09-19 22:33:00.601844136 +0200
@@ -4,7 +4,7 @@
# For older distros that use HAL ACL support use the 55-hpmud.rules.
#
@ -9,8 +11,10 @@
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test"
SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
--- hplip-3.12.6/data/rules/55-hpmud.rules.udev~ 2012-06-18 12:43:22.000000000 +0200
+++ hplip-3.12.6/data/rules/55-hpmud.rules 2012-06-26 18:09:27.640268427 +0200
Index: hplip-3.12.6/data/rules/55-hpmud.rules
===================================================================
--- hplip-3.12.6/data/rules/55-hpmud.rules
+++ hplip-3.12.6/data/rules/55-hpmud.rules 2012-09-19 22:33:00.601844136 +0200
@@ -13,7 +13,7 @@
# changes are not distro specific please send your patch to us. 2/11/2009, D Suffield
#
@ -20,8 +24,10 @@
SUBSYSTEM=="ppdev", OWNER="root", GROUP="lp", MODE="0660"
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="hplip_pid_test"
SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
--- hplip-3.12.6/data/rules/56-hpmud_support.rules.udev~ 2012-06-18 12:43:22.000000000 +0200
+++ hplip-3.12.6/data/rules/56-hpmud_support.rules 2012-06-26 18:09:27.640268427 +0200
Index: hplip-3.12.6/data/rules/56-hpmud_support.rules
===================================================================
--- hplip-3.12.6/data/rules/56-hpmud_support.rules
+++ hplip-3.12.6/data/rules/56-hpmud_support.rules 2012-09-19 22:33:00.601844136 +0200
@@ -1,6 +1,6 @@
# HPLIP udev rules file. Notify console user if plugin support is required for this device.
@ -30,8 +36,10 @@
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GOTO="pid_test"
SUBSYSTEM!="usb_device", GOTO="hpmud_rules_end"
--- hplip-3.12.6/data/rules/86-hpmud_plugin.rules.udev~ 2012-06-18 12:43:22.000000000 +0200
+++ hplip-3.12.6/data/rules/86-hpmud_plugin.rules 2012-06-26 18:10:47.103264684 +0200
Index: hplip-3.12.6/data/rules/86-hpmud_plugin.rules
===================================================================
--- hplip-3.12.6/data/rules/86-hpmud_plugin.rules
+++ hplip-3.12.6/data/rules/86-hpmud_plugin.rules 2012-09-19 22:33:00.601844136 +0200
@@ -1,6 +1,6 @@
# Load hp firmware for this printer.

23
hplip.spec
View file

@ -18,7 +18,7 @@
Summary: HP printer/all-in-one driver infrastructure
Name: hplip
Version: 3.12.10
Release: 3
Release: 4
License: GPLv2+ and MIT
Group: System/Printing
Source0: http://heanet.dl.sourceforge.net/sourceforge/hplip/%{name}-%{version}%{extraversion}.tar.gz
@ -60,6 +60,7 @@ Patch128: hplip-wifisetup.patch
# recreated from makefile-chgrp.patch against Makefile.am
Patch129: hplip-3.12.9-makefile-chgrp.patch
Patch130: hplip-hpaio-localonly.patch
Patch131: hplip-3.12.9-CVE-2013-0200.patch
# Debian/Ubuntu patches
# taken from http://patch-tracker.debian.org/package/hplip/3.11.7-1
@ -87,6 +88,10 @@ 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
Patch228: hpaio-option-duplex.diff
# OpenSUSE patches
Patch301: fix-uninitialized-variables.patch
Url: http://hplip.sourceforge.net/
%if %{sane_backend}
@ -107,6 +112,7 @@ BuildRequires: udev-devel
BuildRequires: polkit
BuildRequires: pkgconfig(libgphoto2)
BuildRequires: libv4l-devel
Requires(post): systemd
Requires: cups
# For dynamic ppd generation.
Requires: foomatic-filters
@ -131,6 +137,8 @@ Requires: wget
Requires: %{hpip_libname} = %{version}
# Some HP ppds are in foomatic-db and foomatic-db-hpijs (mdv bug #47415)
Suggests: foomatic-db-hpijs
# (cg) needed by at least hp-check
Requires: acl
# foomatic-db-hpijs drivers are provided by hp and by this package now
# NOTE: remove the foomatic-db-hpijs deps sometime in 2010-10-?? ?
@ -356,6 +364,9 @@ sed -i.duplex-constraints \
-e 's,\(UIConstraints.* \*Duplex\),//\1,' \
prnt/drv/hpcups.drv.in
# Use mkstemp to create temporary files to avoid symlink attacks (RH#902163).
%patch131 -p1 -b .CVE-2013-0200
# Debian/Ubuntu patches
# This patch tries to make sure that black is printed with just
@ -415,6 +426,10 @@ sed -i.duplex-constraints \
%patch227 -p1 -b .hp-systray-make-menu-appear-in-sni-qt-indicator-with-kde
%patch228 -p1 -b .hpaio-option-duplex
# OpenSUSE patches
%patch301 -p0 -b .fix-uninitialized-variables
# Use filter foomatic-rip instead of foomatic-rip-hplip (fix from Mandriva)
for PPDGZ in ppd/hpijs/*.ppd.gz
@ -451,9 +466,10 @@ WITHOUT_SANE="--without-sane"
--enable-hpcups-install \
--enable-cups-drv-install \
--enable-cups-ppd-install \
--enable-foomatic-drv-install \
--enable-hpijs-install \
--enable-udev-acl-rules \
--enable-policykit \
--disable-policykit \
--with-mimedir=%{_datadir}/cups/mime
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -573,6 +589,9 @@ pushd %{buildroot}%{_datadir}/%{name}
python -m compileall .
popd
%post
%_tmpfilescreate %{name}
%triggerin -- hplip < 2.7.7
chkconfig --del hplip