diff --git a/hplip.spec b/hplip.spec index dd1dab0..5d8a6d4 100644 --- a/hplip.spec +++ b/hplip.spec @@ -3,7 +3,7 @@ %define cups_ver %(cups-config --api-version) Name: hplip Version: 3.14.6 -Release: 1mamba +Release: 2mamba Summary: A printer driver for HP inkjet devices Group: System/Spooling Vendor: openmamba @@ -17,7 +17,6 @@ Patch2: hplip-3.14.4-openmamba-AUTH_TYPES-warning.patch Patch3: hplip-3.14.4-systray-hide-when-inactive.patch License: BSD, LGPL ## AUTOBUILDREQ-BEGIN -BuildRequires: cups BuildRequires: glibc-devel BuildRequires: libcups-devel BuildRequires: libdbus-devel @@ -25,12 +24,12 @@ BuildRequires: libgcc BuildRequires: libjpeg-devel BuildRequires: libnetsnmp-devel BuildRequires: libopenssl-devel +BuildRequires: libperl BuildRequires: libpython-devel BuildRequires: libsane-backends-devel BuildRequires: libstdc++6-devel -BuildRequires: libusb-devel +BuildRequires: libusbx-devel BuildRequires: perl-devel -BuildRequires: python-Imaging ## AUTOBUILDREQ-END BuildRequires: gcc-fortran >= 4.0.1 BuildRequires: libieee1284-devel @@ -85,11 +84,11 @@ sed -i "s|chmod 774|/bin/true 774|" Makefile.in # \ # --disable-foomatic_install -%make +%make -j1 rulessystemdir=%{_unitdir} %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall +%makeinstall rulessystemdir=%{_unitdir} # remove conflict with libsane-backends rm -f %{buildroot}%{_sysconfdir}/sane.d/dll.conf @@ -100,7 +99,6 @@ rm -f %{buildroot}%{_sysconfdir}/udev/rules.d/56-hpmud_add_printer.rules %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" - %pre if [ $1 -ge 1 ]; then /usr/sbin/groupadd lp -g %{lp_gid} &>/dev/null @@ -109,6 +107,12 @@ if [ $1 -ge 1 ]; then fi exit 0 +%post +if [ $1 -ge 1 ]; then + systemctl -q daemon-reload +fi +: + %preun # erase if [ $1 -eq 0 ]; then @@ -150,7 +154,7 @@ grep hpaio %{_sysconfdir}/sane.d/dll.conf >/dev/null || #%{_prefix}/lib/cups/filter/hplipjs %{_prefix}/lib/cups/filter/hpps %{_prefix}/lib/cups/filter/pstotiff -%{_prefix}/lib/systemd/system/hplip-printer@.service +%{_unitdir}/hplip-printer@.service %{_libdir}/libhpip.so.* %{_libdir}/libhpmud.so.* %{_libdir}/sane/libsane-hpaio.so.* @@ -187,6 +191,9 @@ grep hpaio %{_sysconfdir}/sane.d/dll.conf >/dev/null || %{_datadir}/doc/* %changelog +* Wed Jun 11 2014 Silvan Calarco 3.14.6-2mamba +- fix systemd service file installation path + * Sun Jun 08 2014 Automatic Build System 3.14.6-1mamba - automatic version update by autodist