2015-03-20 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* hplip: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9445 ec354946-7b23-47d6-9f5a-488ba84defc7

h/hplip/hplip-vl.spec

@@ -1,69 +1,91 @@
 # %define python_platlib %(python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)')
 Summary:	HP printer drivers & utilities for Linux
-Summary(ja): 	HP プリンタ用の Linux 向けドライバとユーティリティ
+Summary(ja): 	HP プリンタの Linux 向けドライバとユーティリティ
 Name:		hplip
-Version:	3.11.5
+Version:	3.15.2
-Release: 	5%{?_dist_release}
+Release: 	1%{?_dist_release}
-Source0:	%{name}-%{version}.tar.gz
+
-Source1:	hplip.desktop.vine
+License:	GPLv2+, MIT and BSD
-Patch0:		hplip-3.11.5-gksu.patch
-Patch1:		hplip-udev-rules.patch
-License:	GPL/MIT
 Group:		Applications/Publishing
-URL:		http://hplipopensource.com/hplip-web/index.html
+URL:		http://hplip.sourceforge.net/
 
+Source0:	http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}.tar.gz
+#Source1:	hpcups-update-ppds.sh
+Source1:	hplip.desktop.vine
+Source2:	copy-deviceids.py
+
+Patch1:		hplip-pstotiff-is-rubbish.patch
+Patch2: 	hplip-strstr-const.patch
+Patch3: 	hplip-ui-optional.patch
+Patch4: 	hplip-no-asm.patch
+Patch5: 	hplip-deviceIDs-drv.patch
+Patch6: 	hplip-udev-rules.patch
+Patch7: 	hplip-retry-open.patch
+Patch8: 	hplip-snmp-quirks.patch
+Patch9: 	hplip-hpijs-marker-supply.patch
+Patch10: 	hplip-clear-old-state-reasons.patch
+Patch11: 	hplip-hpcups-sigpipe.patch
+Patch12: 	hplip-logdir.patch
+Patch13: 	hplip-bad-low-ink-warning.patch
+Patch14: 	hplip-deviceIDs-ppd.patch
+Patch15: 	hplip-ppd-ImageableArea.patch
+Patch16: 	hplip-scan-tmp.patch
+Patch17: 	hplip-log-stderr.patch
+Patch18: 	hplip-avahi-parsing.patch
+Patch19: 	hplip-reportlab.patch
+Patch20: 	hplip-dj990c-margin.patch
+Patch21: 	hplip-strncpy.patch
+Patch22: 	hplip-no-write-bytecode.patch
+Patch23: 	hplip-silence-ioerror.patch
+
+# Vine Patches
+Patch70:	hplip-3.11.5-gksu.patch
+#Patch1:		hplip-udev-rules.patch
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Requires:	cups
 Requires:	dbus
+Requires:	dbus-python
 Requires:	foomatic
 Requires:	ghostscript
-Requires:	libjpeg
 Requires:	openssl
 Requires:	python-imaging
-Requires:	dbus-python
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	gksu
 BuildRequires:	cups-devel
 BuildRequires:	dbus-devel
-BuildRequires:	libusb-devel
+BuildRequires:	desktop-file-utils
+BuildRequires:	libusb1-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	net-snmp-devel
 BuildRequires:	openssl-devel
 BuildRequires:	python-devel >= 2.3
+BuildRequires:	python-cups, cups
 BuildRequires:	sane-devel
-BuildRequires:	PyQt4
+BuildRequires:	PyQt4-devel
 # to force to use PyQt4
 BuildConflicts:	PyQt
 
-Provides:	hpijs
+Provides:	hpijs = %{version}-%{release}
-Obsoletes:	hpijs < 3.10
+Obsoletes:	hpijs < %{version}-%{release}
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
+Vendor:		Project Vine
+Distribution:	Vine Linux
 Packager:	kazutaka
 
-# When below files are included in %files section,
-# find-requires shows strange error. 
-#  %{_datadir}/hplip/base/kirbybase.py and pexpect.py
-# So, below option is added to aboid this.
-#AutoReq:	False
-
 %description
-HPLIP is an HP developed solution for printing, scanning, and
+The Hewlett-Packard Linux Imaging and Printing Project provides
-faxing with HP inkjet and laser based printers in Linux.
+drivers for HP printers and multi-function peripherals.
 
-The HPLIP project provides printing support for 1,151 printer
+It supports the DeskJet 350C, 600C, 600C Photo, 630C, Apollo 2000,
-models, including Deskjet, Officejet, Photosmart, PSC (Print Scan
+Apollo 2100, Apollo 2560, DeskJet 800C, DeskJet 825, DeskJet 900,
-Copy), Business Inkjet, LaserJet, Edgeline MFP, and LaserJet MFP.
+PhotoSmart, DeskJet 990C, and PhotoSmart 100 series.
 
 %description -l ja
-HPLIP は HP が開発した HP インクジェット及びレーザープリンタ向けの、
+Hewlett-Packard Linux Imaging and Printing Project は HP 製プリンタ及びプリンタ複合機用のドライバを提供します。
-プリンタ/スキャナ/FAX 機能を Linux 上で利用する為のソリューション
-です。
 
-HPLIP プロジェクトでは1,151種類のプリンタをサポートしています。
+これには DeskJet 350C, 600C, 600C Photo, 630C, Apollo 2000, Apollo 2100, Apollo 2560, DeskJet 800C, DeskJet 825, DeskJet 900, PhotoSmart, DeskJet 990C, and PhotoSmart 100 シリーズ等が含まれます。
-これには Deskjet、 Officejet、 Photosmart、 PSC (Print Scan Copy)、
-Business Inkjet、 LaserJet、 Edgeline MFP 及び LaserJet MFP が
-含まれます。
 
 #---------------------------------------------------------------------
 
@@ -71,7 +93,8 @@ Business Inkjet、 LaserJet、 Edgeline MFP 及び LaserJet MFP が
 Summary:	HPLIP libraries
 Summary(ja):	HPLIP ライブラリ
 Group:		System Environment/Libraries
-License:	GPL/MIT
+License:	GPLv2+ and MIT
+Requires:	python3
 
 %description libs
 Libraries needed by HPLIP.
@@ -85,7 +108,7 @@ HPLIP 用のライブラリです。
 Summary:	HPLIP graphical tools
 Summary(ja):	HPLIP 用 GUI ツール
 Group:		Applications/System
-License:	GPL/MIT
+License:	BSD
 Requires:	%{name} = %{version}-%{release}
 Requires:	PyQt4
 Requires:	notify-python
@@ -104,7 +127,7 @@ HP デバイスマネージャ (toolbox) は、各種設定やインクや紙の
 Summary:	SANE driver for scanners in HP's multi-function devices
 Summary(ja):	HP 複合機のスキャナ用 SANE ドライバ
 Group:		System Environment/Libraries
-License:	GPL/MIT
+License:	GPLv2+
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	sane
 
@@ -120,81 +143,236 @@ HP インクジェット及びレーザープリンタ複合機のスキャナ
 
 %prep
 %setup -q
-%patch0 -p1 -b .gksu
+#patch1 -p1 -b .udev-rules
-%patch1 -p1 -b .udev-rules
+
+# The pstotiff filter is rubbish so replace it (launchpad #528394).
+%patch1 -p1 -b .pstotiff-is-rubbish
+
+# Fix compilation.
+%patch2 -p1 -b .strstr-const
+
+# Make utils.checkPyQtImport() look for the gui sub-package (bug #243273).
+%patch3 -p1 -b .ui-optional
+
+# Make sure to avoid handwritten asm.
+%patch4 -p1 -b .no-asm
+
+# Corrected several IEEE 1284 Device IDs using foomatic data.
+# Color LaserJet 2500 series (bug #659040)
+# LaserJet 4100 Series/2100 Series (bug #659039)
+%patch5 -p1 -b .deviceIDs-drv
+chmod +x %{SOURCE2}
+mv prnt/drv/hpijs.drv.in{,.deviceIDs-drv-hpijs}
+%{SOURCE2} prnt/drv/hpcups.drv.in \
+           prnt/drv/hpijs.drv.in.deviceIDs-drv-hpijs \
+           > prnt/drv/hpijs.drv.in
+
+# Don't add printer queue, just check plugin.
+# Move udev rules from /etc/ to /usr/lib/ (bug #748208).
+%patch6 -p1 -b .udev-rules
+
+# Retry when connecting to device fails (bug #532112).
+%patch7 -p1 -b .retry-open
+
+# Mark SNMP quirks in PPD for HP OfficeJet Pro 8500 (bug #581825).
+%patch8 -p1 -b .snmp-quirks
+
+# Fixed bogus low ink warnings from hpijs driver (bug #643643).
+%patch9 -p1 -b .hpijs-marker-supply
+
+# Clear old printer-state-reasons we used to manage (bug #510926).
+%patch10 -p1 -b .clear-old-state-reasons
+
+# Avoid busy loop in hpcups when backend has exited (bug #525944).
+%patch11 -p1 -b .hpcups-sigpipe
+
+# CUPS filters should use TMPDIR when available (bug #865603).
+%patch12 -p1 -b .logdir
+
+# Fixed Device ID parsing code in hpijs's dj9xxvip.c (bug #510926).
+%patch13 -p1 -b .bad-low-ink-warning
+
+# Add Device ID for
+# HP LaserJet Color M451dn (bug #1159380)
+for ppd_file in $(grep '^diff' %{PATCH14} | cut -d " " -f 4);
+do
+  gunzip ${ppd_file#*/}.gz
+done
+%patch14 -p1 -b .deviceIDs-ppd
+for ppd_file in $(grep '^diff' %{PATCH14} | cut -d " " -f 4);
+do
+  gzip -n ${ppd_file#*/}
+done
+
+# Fix ImageableArea for Laserjet 8150/9000 (bug #596298).
+for ppd_file in $(grep '^diff' %{PATCH15} | cut -d " " -f 4);
+do
+  gunzip ${ppd_file#*/}.gz
+done
+%patch15 -p1 -b .ImageableArea
+for ppd_file in $(grep '^diff' %{PATCH15} | cut -d " " -f 4);
+do
+  gzip -n ${ppd_file#*/}
+done
+
+# Scan to /var/tmp instead of /tmp (bug #1076954).
+%patch16 -p1 -b .scan-tmp
+
+# Treat logging before importing of logger module (bug #984699).
+%patch17 -p1 -b .log-stderr
+
+# Fix parsing of avahi-daemon output (bug #1096939).
+%patch18 -p1 -b .parsing
+
+# Fixed version comparisons for x.y.z-style versions such as
+# reportlab (bug #1121433).
+%patch19 -p1 -b .reportlab
+
+# Fixed left/right margins for HP DeskJet 990C (LP #1405212).
+%patch20 -p1 -b .dj990c-margin
+
+# Fixed uses of strncpy throughout.
+%patch21 -p1 -b .strncpy
+
+# Don't try to write bytecode cache for hpfax backend (bug #1192761).
+%patch22 -p1 -b .no-write-bytecode
+
+# Ignore IOError when logging output (bug #712537).
+%patch23 -p1 -b .silence-ioerror
+
+%patch70 -p1 -b .gksu
+
+sed -i.duplex-constraints \
+    -e 's,\(UIConstraints.* \*Duplex\),//\1,' \
+    prnt/drv/hpcups.drv.in
+
+# Change shebang /usr/bin/env python -> /usr/bin/python3 (bug #618351).
+#find -name '*.py' -print0 | xargs -0 \
+#    sed -i.env-python -e 's,^#!/usr/bin/env python,#!%{__python3},'
 
 %build
-%configure --enable-doc-build \
+%configure \
-           --enable-network-build \
+        --enable-scan-build --enable-gui-build --enable-fax-build \
-           --disable-pp-build \
+        --disable-foomatic-rip-hplip-install --enable-pp-build \
-           --enable-scan-build \
+        --enable-qt4 --enable-hpcups-install --enable-cups-drv-install \
-           --enable-gui-build \
+        --enable-foomatic-drv-install --enable-dbus-build \
-           --enable-fax-build \
+        --enable-hpijs-install \
-           --enable-dbus-build \
+	--disable-policykit \
-           --enable-qt4 \
+	--with-mimedir=%{_datadir}/cups/mime \
-           --disable-qt3 \
+	--with-cupsbackenddir=%{_libdir}/cups/backend \
-           --enable-hpijs-install \
+	--with-cupsfilterdir=%{_libdir}/cups/filter \
-           --enable-hpcups-install \
+	--with-hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
-           --enable-cups-drv-install \
+
-           --enable-foomatic-drv-install \
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-           --disable-cups-ppd-install \
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-           --disable-foomatic-ppd-install \
+
-           --with-cupsbackenddir=%{_libdir}/cups/backend \
+make
-           --with-cupsfilterdir=%{_libdir}/cups/filter \
-           --with-hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
-%{__make}
 
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=${RPM_BUILD_ROOT}
+make install DESTDIR=$RPM_BUILD_ROOT rulesdir=/lib/udev/rules.d
 
-# install modified .desktop
+# Create /run/hplip
-%{__install} -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_datadir}/applications/hplip.desktop
+mkdir -p $RPM_BUILD_ROOT/run/hplip
 
-# remove unpacked files.
+# install modified .desktop
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{_sysconfdir}/sane.d
+#{__install} -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_datadir}/applications/hplip.desktop
 
-# remove unnecessary files.
+# install /usr/lib/tmpfiles.d/hplip.conf (bug #1015831)
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{_libdir}/libhpip.la
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{_libdir}/libhpmud.la
+cat > $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/hplip.conf <<EOF
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{python_sitearch}/cupsext.la
+# See tmpfiles.d(5) for details
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{python_sitearch}/hpmudext.la
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{python_sitearch}/pcardext.la
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{python_sitearch}/scanext.la
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{_libdir}/sane/libsane-hpaio.la
 
-%clean
+d /run/hplip 0775 root lp -
-%__rm -rf ${RPM_BUILD_ROOT}
+EOF
 
+# remove unpacked files.
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/sane.d \
+        $RPM_BUILD_ROOT%{_docdir} \
+        $RPM_BUILD_ROOT%{_datadir}/hal/fdi \
+        $RPM_BUILD_ROOT%{_datadir}/hplip/pkservice.py \
+        $RPM_BUILD_ROOT%{_bindir}/hp-pkservice
+rm -f   $RPM_BUILD_ROOT%{_bindir}/hp-logcapture \
+        $RPM_BUILD_ROOT%{_bindir}/hp-doctor \
+        $RPM_BUILD_ROOT%{_datadir}/hplip/logcapture.py \
+        $RPM_BUILD_ROOT%{_datadir}/hplip/doctor.py
+
+rm -f   $RPM_BUILD_ROOT%{_bindir}/foomatic-rip \
+        $RPM_BUILD_ROOT%{_libdir}/cups/filter/foomatic-rip \
+        $RPM_BUILD_ROOT%{_libdir}/*.la \
+        $RPM_BUILD_ROOT%{python_sitearch}/*.la \
+        $RPM_BUILD_ROOT%{_libdir}/libhpip.so \
+        $RPM_BUILD_ROOT%{_libdir}/sane/*.la \
+        $RPM_BUILD_ROOT%{_datadir}/cups/model/foomatic-ppds \
+        $RPM_BUILD_ROOT%{_datadir}/applications/hplip.desktop \
+        $RPM_BUILD_ROOT%{_datadir}/ppd/HP/*.ppd
+
+
+cp -p %{SOURCE1} hplip.desktop
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+sed -i -e '/^Categories=/d' hplip.desktop
+# Encoding key is deprecated
+sed -i -e '/^Encoding=/d' hplip.desktop
+desktop-file-install --vendor ""                                \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications              \
+        --add-category System                                   \
+        --add-category Settings                                 \
+        --add-category HardwareSettings                         \
+        hplip.desktop
+
+# Regenerate hpcups PPDs on upgrade if necessary (bug #579355).
+#install -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/hpcups-update-ppds
+
+%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/sane.d/dll.d
+echo hpaio > $RPM_BUILD_ROOT%{_sysconfdir}/sane.d/dll.d/hpaio
+
+# Images in docdir should not be executable (bug #440552).
+find doc/images -type f -exec chmod 644 {} \;
+
+# Create an empty plugins directory to make sure it gets the right
+# SELinux file context (bug #564551).
+%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/hplip/prnt/plugins
+
+# Remove files we don't want to package.
+rm -f $RPM_BUILD_ROOT%{_datadir}/hplip/hpaio.desc
+rm -f $RPM_BUILD_ROOT%{_datadir}/hplip/hplip-install
+rm -rf $RPM_BUILD_ROOT%{_datadir}/hplip/install.*
+rm -f $RPM_BUILD_ROOT%{_datadir}/hplip/uninstall.*
+rm -f $RPM_BUILD_ROOT%{_bindir}/hp-uninstall
+rm -f $RPM_BUILD_ROOT%{_datadir}/hplip/upgrade.*
+rm -f $RPM_BUILD_ROOT%{_bindir}/hp-upgrade
+rm -f $RPM_BUILD_ROOT%{_bindir}/hp-config_usb_printer
+rm -f $RPM_BUILD_ROOT%{_unitdir}/hplip-printer@.service
+rm -f $RPM_BUILD_ROOT%{_datadir}/hplip/config_usb_printer.*
+rm -f $RPM_BUILD_ROOT%{_datadir}/hplip/hpijs.drv.in.template
+rm -f $RPM_BUILD_ROOT%{_datadir}/cups/mime/pstotiff.types
+rm -f $RPM_BUILD_ROOT%{_datadir}/hplip/fax/pstotiff*
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/systemd
+
+# The systray applet doesn't work properly (displays icon as a
+# window), so don't ship the launcher yet.
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 
-%post libs
-/sbin/ldconfig
 
-%postun libs
+%clean
-/sbin/ldconfig
+rm -rf $RPM_BUILD_ROOT
 
-%post gui
-/usr/bin/update-desktop-database &>/dev/null ||:
 
-%postun gui
+%post libs -p /sbin/ldconfig
-/usr/bin/update-desktop-database &>/dev/null ||:
 
-%post -n libsane-hpaio
+%postun libs -p /sbin/ldconfig
-/sbin/ldconfig
-if [ -f /etc/sane.d/dll.conf ] && \
-   ! grep ^hpaio /etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
-        echo hpaio >> /etc/sane.d/dll.conf; \
-fi
 
 %files
 %defattr(-,root,root)
-%doc %{_datadir}/doc/%{name}-%{version}
+%doc COPYING doc/*
+#%doc %{_datadir}/doc/%{name}-%{version}
 %{_bindir}/hp-align
-%{_bindir}/hp-check
 %{_bindir}/hp-clean
 %{_bindir}/hp-colorcal
 %{_bindir}/hp-devicesettings
+%{_bindir}/hp-diagnose_plugin
+%{_bindir}/hp-diagnose_queues
 %{_bindir}/hp-fab
 %{_bindir}/hp-faxsetup
 %{_bindir}/hp-firmware
@@ -203,113 +381,127 @@ fi
 %{_bindir}/hp-linefeedcal
 %{_bindir}/hp-makecopies
 %{_bindir}/hp-makeuri
-%{_bindir}/hp-mkuri
 %{_bindir}/hp-plugin
 %{_bindir}/hp-pqdiag
-%{_bindir}/hp-pkservice
 %{_bindir}/hp-printsettings
 %{_bindir}/hp-probe
 %{_bindir}/hp-query
 %{_bindir}/hp-scan
 %{_bindir}/hp-sendfax
 %{_bindir}/hp-setup
-%{_bindir}/hp-systray
 %{_bindir}/hp-testpage
 %{_bindir}/hp-timedate
 %{_bindir}/hp-unload
 %{_bindir}/hp-wificonfig
-%{_bindir}/hpijs
+%{_libdir}/cups/backend/hp
-%{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
+%{_libdir}/cups/backend/hpfax
-%{_datadir}/hplip/__init__.py
+%{_libdir}/cups/filter/hpcups
-%{_datadir}/hplip/align.py
+%{_libdir}/cups/filter/hpcupsfax
+%{_libdir}/cups/filter/hpps
+%{_libdir}/cups/filter/pstotiff
+%{_datadir}/cups/mime/pstotiff.convs
+
+# Files
+%{_datadir}/hplip/align.py*
+%{_datadir}/hplip/check-plugin.py*
+%{_datadir}/hplip/clean.py*
+%{_datadir}/hplip/colorcal.py*
+%{_datadir}/hplip/devicesettings.py*
+%{_datadir}/hplip/diagnose_plugin.py*
+%{_datadir}/hplip/diagnose_queues.py*
+%{_datadir}/hplip/fab.py*
+%{_datadir}/hplip/fax
+%{_datadir}/hplip/faxsetup.py*
+%{_datadir}/hplip/firmware.py*
+%{_datadir}/hplip/hpdio.py*
+%{_datadir}/hplip/hplip_clean.sh
+%{_datadir}/hplip/hpssd*
+%{_datadir}/hplip/info.py*
+%{_datadir}/hplip/__init__.py*
+%{_datadir}/hplip/levels.py*
+%{_datadir}/hplip/linefeedcal.py*
+%{_datadir}/hplip/makecopies.py*
+%{_datadir}/hplip/makeuri.py*
+%{_datadir}/hplip/plugin.py*
+%{_datadir}/hplip/pqdiag.py*
+%{_datadir}/hplip/printsettings.py*
+%{_datadir}/hplip/probe.py*
+%{_datadir}/hplip/query.py*
+%{_datadir}/hplip/scan.py*
+%{_datadir}/hplip/sendfax.py*
+%{_datadir}/hplip/setup.py*
+%{_datadir}/hplip/testpage.py*
+%{_datadir}/hplip/timedate.py*
+%{_datadir}/hplip/unload.py*
+%{_datadir}/hplip/wificonfig.py*
+# Directories
 %{_datadir}/hplip/base
-%{_datadir}/hplip/check.py
-%{_datadir}/hplip/clean.py
-%{_datadir}/hplip/colorcal.py
 %{_datadir}/hplip/copier
 %{_datadir}/hplip/data/ldl
-%{_datadir}/hplip/data/models
+%{_datadir}/hplip/data/localization
 %{_datadir}/hplip/data/pcl
 %{_datadir}/hplip/data/ps
-%{_datadir}/hplip/devicesettings.py
-%{_datadir}/hplip/fax
-%{_datadir}/hplip/faxsetup.py
-%{_datadir}/hplip/firmware.py
-%{_datadir}/hplip/hpdio.py
-%{_datadir}/hplip/hpssd.py
-%{_datadir}/hplip/info.py
 %{_datadir}/hplip/installer
-%{_datadir}/hplip/levels.py
-%{_datadir}/hplip/linefeedcal.py
-%{_datadir}/hplip/makecopies.py
-%{_datadir}/hplip/makeuri.py
 %{_datadir}/hplip/pcard
-%{_datadir}/hplip/pkservice.py
-%{_datadir}/hplip/plugin.py
-%{_datadir}/hplip/pqdiag.py
-%{_datadir}/hplip/printsettings.py
 %{_datadir}/hplip/prnt
-%{_datadir}/hplip/probe.py
-%{_datadir}/hplip/query.py
 %{_datadir}/hplip/scan
-%{_datadir}/hplip/testpage.py
-%{_datadir}/hplip/timedate.py
-%{_datadir}/hplip/unload.py
-%{_datadir}/hplip/wificonfig.py
-%{_datadir}/cups/drv/hp/hpcups.drv
-%{_datadir}/cups/drv/hp/hpijs.drv
-%{_datadir}/foomatic/db/source/PPD/HP
-%{_libdir}/cups/backend/hp
-%{_libdir}/cups/backend/hpfax
-%{_libdir}/cups/filter/hpcups
-%{_libdir}/cups/filter/hpcac
-%{_libdir}/cups/filter/hpcupsfax
-%{_libdir}/cups/filter/hplipjs
-%{_libdir}/cups/filter/hpps
-%{_libdir}/cups/filter/pstotiff
-%config(noreplace) %{_sysconfdir}/hp/hplip.conf
-%{_sysconfdir}/cups/pstotiff.convs
-%{_sysconfdir}/cups/pstotiff.types
-%{_sysconfdir}/udev/rules.d/55-hpmud.rules
-%{_sysconfdir}/udev/rules.d/56-hpmud_support.rules
 %{_localstatedir}/lib/hp
+%dir %attr(0775,root,lp) /run/hplip
+%{_prefix}/lib/tmpfiles.d/hplip.conf
+
+%dir %{_sysconfdir}/hp
+%config(noreplace) %{_sysconfdir}/hp/hplip.conf
+/lib/udev/rules.d/56-hpmud.rules
+%dir %{_datadir}/hplip
+%dir %{_datadir}/hplip/data
+%{_datadir}/hplip/data/models
+
+%{_bindir}/hpijs
+#{_bindir}/hpcups-update-ppds
+%{_datadir}/cups/drv/*
+%dir %{_datadir}/foomatic/db/source/PPD/HP
+%{_datadir}/foomatic/db/source/PPD/HP/*
 
 %files libs
 %defattr(-,root,root)
-%{_libdir}/libhpip.so*
+%{_libdir}/libhpip.so.*
+# The so symlink is required here (see bug #489059).
 %{_libdir}/libhpmud.so*
-%{python_sitearch}/cupsext.so
+# Python extension
-%{python_sitearch}/hpmudext.so
+%{python_sitearch}/*
-%{python_sitearch}/pcardext.so
-%{python_sitearch}/scanext.so
 
 %files gui
 %defattr(-,root,root)
-%{_bindir}/hp-fab
+%{_bindir}/hp-check
 %{_bindir}/hp-print
-%{_bindir}/hp-scan
+%{_bindir}/hp-systray
-%{_bindir}/hp-sendfax
-%{_bindir}/hp-setup
 %{_bindir}/hp-toolbox
+%{_datadir}/applications/*.desktop
+# Files
+%{_datadir}/hplip/check.py*
+%{_datadir}/hplip/print.py*
+%{_datadir}/hplip/systray.py*
+%{_datadir}/hplip/toolbox.py*
+# Directories
 %{_datadir}/hplip/data/images
-%{_datadir}/hplip/data/localization
-%{_datadir}/hplip/fab.py
-%{_datadir}/hplip/print.py
-%{_datadir}/hplip/scan.py
-%{_datadir}/hplip/sendfax.py
-%{_datadir}/hplip/setup.py
-%{_datadir}/hplip/systray.py
-%{_datadir}/hplip/toolbox.py
 %{_datadir}/hplip/ui4
-%{_datadir}/applications/hplip.desktop
-%{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 
 %files -n libsane-hpaio
 %defattr(-,root,root)
 %{_libdir}/sane/libsane-hpaio*
-
+%config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
 %changelog
+* Thu Mar 19 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.15.2-1
+- updated to 3.15.2
+- updated Source1
+- renumbered former Patch 0 and 1 to Patch 70 and 6
+- built with libusb1
+- added BR: desktop-file-utils
+
+* Wed Mar 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.11.5-5
+- rebuild with net-snmp-5.7.1
+
 * Wed Mar 07 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.11.5-5
 - rebuild with net-snmp-5.7.1