- up to 3.17.11

diff --git a/hplip-udev-rules.patch b/hplip-udev-rules.patch
index 9672e4d9e151d24186bd5ae78ecae4f77af28460..eb67997f362d83402dfe7c5a1e380e8f1b0f4abe 100644 (file)
--- a/hplip-udev-rules.patch
+++ b/hplip-udev-rules.patch
@@ -11,12 +11,13 @@
 diff -up hplip-3.13.6/Makefile.am.udev-rules hplip-3.13.6/Makefile.am
 --- hplip-3.13.6/Makefile.am.udev-rules        2013-06-24 10:28:19.868301356 +0200
 +++ hplip-3.13.6/Makefile.am   2013-06-24 10:32:21.272134161 +0200
-@@ -109,7 +109,7 @@
- dist_rulessystem_DATA =data/rules/hplip-printer@.service
+@@ -132,7 +132,7 @@ dist_rulessystem_DATA =data/rules/hplip-
  
  # hpmud.rules
+ if !HPLIP_CLASS_DRIVER
 -rulesdir = /etc/udev/rules.d
 +rulesdir = /lib/udev/rules.d
  if UDEV_SYSFS_RULES
  dist_rules_DATA = data/rules/56-hpmud_sysfs.rules
  else
+

diff --git a/hplip.spec b/hplip.spec
index 1312394a9ca3373b072f3d8e1e9b7a219747c0aa..d146425c204286582a5dd5ad1598cc7aa782ffb9 100644 (file)
--- a/hplip.spec
+++ b/hplip.spec
@@ -13,12 +13,12 @@
 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.16.5
-Release:       2
+Version:       3.17.11
+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: 3f50c45c52b2adaee8d9ff32db8c4e6e
+# Source0-md5: 09f3d50a2ba95e0fb66c78da7bab13ba
 Patch0:                %{name}-desktop.patch
 Patch1:                unresolved.patch
 Patch2:                pld-distro.patch
@@ -324,6 +324,8 @@ fi
 %{_datadir}/hplip/pcard
 %{_datadir}/hplip/prnt
 %{_datadir}/hplip/scan
+%attr(755,root,root) %{_datadir}/hplip/dat2drv
+%attr(755,root,root) %{_datadir}/hplip/locatedriver
 %attr(755,root,root) %{py_sitedir}/cupsext.so
 %attr(755,root,root) %{py_sitedir}/hpmudext.so
 %attr(755,root,root) %{py_sitedir}/pcardext.so

diff --git a/pld-distro.patch b/pld-distro.patch
index 5b125fa8f31222ceea04a19c50683c71a9bcb09b..f4531dcc0eacdf7c414a594470eea8b86ae00022 100644 (file)
--- a/pld-distro.patch
+++ b/pld-distro.patch
@@ -10,9 +10,9 @@
  # ****************************************
  
 @@ -8468,3 +8468,131 @@
+ [lfs:6:epm]
+ packages=epm
  
- [lfs:6:avahi-utils]
- packages=avahi
 +
 +# ****************************************
 +[pld]