From eb296ede8c8f3d8504d9e42daef4886134967625 Mon Sep 17 00:00:00 2001 From: Elan Ruusamäe Date: Sat, 3 Mar 2012 17:27:23 +0000 Subject: - up to 1.3.9, enable udev/systemd Changed files: pyc.patch -> 1.1 system-config-printer.spec -> 1.57 diff --git a/pyc.patch b/pyc.patch new file mode 100644 index 0000000..3f555f4 --- /dev/null +++ b/pyc.patch @@ -0,0 +1,7 @@ +--- system-config-printer-1.3.9/system-config-printer.in~ 2011-08-15 13:23:51.000000000 +0300 ++++ system-config-printer-1.3.9/system-config-printer.in 2012-03-03 19:25:01.247446831 +0200 +@@ -1,3 +1,3 @@ + #!/bin/sh + prefix=@prefix@ +-exec @datarootdir@/@PACKAGE@/system-config-printer.py "$@" ++exec python @datarootdir@/@PACKAGE@/system-config-printer.pyc "$@" diff --git a/system-config-printer.spec b/system-config-printer.spec index 47918dd..6d10bf2 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -1,12 +1,15 @@ +# TODO +# - check(finish) scriptlets for -udev Summary: A graphical interface for configuring printers Summary(pl.UTF-8): Graficzny interfejs do zarządzania drukarkami Name: system-config-printer -Version: 1.3.8 +Version: 1.3.9 Release: 1 License: GPL v2+ Group: X11/Applications Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz -# Source0-md5: ca04568dd7ff1ef7a381ad637d4e915b +# Source0-md5: df424f127eede63965608e5ec5e27519 +Patch0: pyc.patch URL: http://cyberelk.net/tim/software/system-config-printer/ BuildRequires: autoconf BuildRequires: automake @@ -24,7 +27,6 @@ BuildRequires: xmlto BuildRequires: xz >= 1:4.999.7 %pyrequires_eq python-libs Requires: python-PyXML -Requires: python-pycups >= 1.9.60 Requires: python-pycurl Requires: python-pygtk-glade Requires: python-pynotify @@ -47,55 +49,163 @@ lokalnej) przy użyciu API CUPS-a. Narzędzie jest napisane w Pythonie z użyciem pygtk do części graficznych i dowiązań Pythona (pycups) do API CUPS-a. +%package libs +Summary: Libraries and shared code for printer administration tool +Group: Base +Requires: python +Requires: python-pycups >= 1.9.60 +Conflicts: %{name} < 1.3.9 + +%description libs +The common code used by both the graphical and non-graphical parts of +the configuration tool. + +%package udev +Summary: Rules for udev for automatic configuration of USB printers +Group: Base +Requires: %{name}-libs = %{version}-%{release} +Provides: hal-cups-utils = 0.6.20 +Obsoletes: hal-cups-utils < 0.6.20 + +%description udev +The udev rules and helper programs for automatically configuring USB +printers. + %prep %setup -q +%patch0 -p1 %build %{__intltoolize} %{__aclocal} %{__autoconf} %{__automake} -%configure -%{__make} -j 1 +%configure \ + --with-udev-rules +%{__make} %install rm -rf $RPM_BUILD_ROOT - %{__make} install \ + udevhelperdir=/lib/udev \ + udevrulesdir=/lib/udev/rules.d \ DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} -%py_comp $RPM_BUILD_ROOT%{_datadir}/system-config-printer -%py_ocomp $RPM_BUILD_ROOT%{_datadir}/system-config-printer +%py_comp $RPM_BUILD_ROOT%{_datadir}/%{name} +%py_ocomp $RPM_BUILD_ROOT%{_datadir}/%{name} %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}/cupshelpers %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}/cupshelpers -%py_postclean +%py_postclean %{_datadir}/%{name} %clean rm -rf $RPM_BUILD_ROOT +%if 0 +%post udev +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi + +%preun udev +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable udev-configure-printer.service >/dev/null 2>&1 || : + /bin/systemctl stop udev-configure-printer.service >/dev/null 2>&1 || : +fi + +%postun udev +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart udev-configure-printer.service >/dev/null 2>&1 || : +fi +%endif + %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README -%attr(755,root,root) %{_bindir}/scp-dbus-service +/etc/xdg/autostart/print-applet.desktop %attr(755,root,root) %{_bindir}/system-config-printer %attr(755,root,root) %{_bindir}/system-config-printer-applet -%{_sysconfdir}/xdg/autostart/*.desktop +%dir %{_datadir}/%{name}/ui +%{_datadir}/%{name}/ui/*.ui +%dir %{_datadir}/%{name}/troubleshoot +%{_datadir}/%{name}/troubleshoot/*.py[co] +%dir %{_datadir}/%{name}/xml +%{_datadir}/%{name}/xml/*.rng +%{_datadir}/%{name}/xml/validate.py[co] +%{_datadir}/%{name}/check-device-ids.py[co] +%{_datadir}/%{name}/HIG.py[co] +%{_datadir}/%{name}/SearchCriterion.py[co] +%{_datadir}/%{name}/serversettings.py[co] +%{_datadir}/%{name}/system-config-printer.py[co] +%{_datadir}/%{name}/ToolbarSearchEntry.py[co] +%{_datadir}/%{name}/userdefault.py[co] +%{_datadir}/%{name}/applet.py[co] +%dir %{_datadir}/%{name}/icons +%{_datadir}/%{name}/icons/i-network-printer.png +%{_mandir}/man1/system-config-printer-applet.1* +%{_mandir}/man1/system-config-printer.1* +%{_desktopdir}/*.desktop + +%files libs +%defattr(644,root,root,755) +%dir %{_sysconfdir}/cupshelpers +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/cupshelpers/preferreddrivers.xml /etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf /etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf -%dir %{_datadir}/system-config-printer -%dir %{_datadir}/system-config-printer/ui -%{_datadir}/system-config-printer/ui/*.ui -%attr(755,root,root) %{_datadir}/system-config-printer/*.py* -%dir %{_datadir}/system-config-printer/troubleshoot -%attr(755,root,root) %{_datadir}/system-config-printer/troubleshoot/*.py* -%dir %{_datadir}/system-config-printer/icons -%{_datadir}/system-config-printer/icons/i-network-printer.png -%{_mandir}/man*/* -%{_desktopdir}/*.desktop +%{_datadir}/dbus-1/interfaces/org.fedoraproject.Config.Printing.xml +%{_datadir}/dbus-1/services/org.fedoraproject.Config.Printing.service +%attr(755,root,root) %{_bindir}/scp-dbus-service +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/asyncconn.py[co] +%{_datadir}/%{name}/asyncipp.py[co] +%{_datadir}/%{name}/asyncpk1.py[co] +%{_datadir}/%{name}/authconn.py[co] +%{_datadir}/%{name}/config.py[co] +%{_datadir}/%{name}/cupspk.py[co] +%{_datadir}/%{name}/debug.py[co] +%{_datadir}/%{name}/dnssdresolve.py[co] +%{_datadir}/%{name}/errordialogs.py[co] +%{_datadir}/%{name}/firewall.py[co] +%{_datadir}/%{name}/gtkinklevel.py[co] +%{_datadir}/%{name}/gtk_label_autowrap.py[co] +%{_datadir}/%{name}/gtkspinner.py[co] +%{_datadir}/%{name}/gui.py[co] +%{_datadir}/%{name}/installpackage.py[co] +%{_datadir}/%{name}/jobviewer.py[co] +%{_datadir}/%{name}/monitor.py[co] +%{_datadir}/%{name}/newprinter.py[co] +%{_datadir}/%{name}/options.py[co] +%{_datadir}/%{name}/optionwidgets.py[co] +%{_datadir}/%{name}/PhysicalDevice.py[co] +%{_datadir}/%{name}/ppdcache.py[co] +%{_datadir}/%{name}/ppdippstr.py[co] +%{_datadir}/%{name}/ppdsloader.py[co] +%{_datadir}/%{name}/printerproperties.py[co] +%{_datadir}/%{name}/probe_printer.py[co] +%{_datadir}/%{name}/pysmb.py[co] +%{_datadir}/%{name}/scp-dbus-service.py[co] +%{_datadir}/%{name}/smburi.py[co] +%{_datadir}/%{name}/statereason.py[co] +%{_datadir}/%{name}/timedops.py[co] + %dir %{py_sitescriptdir}/cupshelpers -%{py_sitescriptdir}/cupshelpers/*.py[co] -%if "%{py_ver}" > "2.4" -%{py_sitescriptdir}/cupshelpers-1.0-py*.egg-info -%endif +%{py_sitescriptdir}/cupshelpers/__init__.py[co] +%{py_sitescriptdir}/cupshelpers/config.py[co] +%{py_sitescriptdir}/cupshelpers/cupshelpers.py[co] +%{py_sitescriptdir}/cupshelpers/installdriver.py[co] +%{py_sitescriptdir}/cupshelpers/openprinting.py[co] +%{py_sitescriptdir}/cupshelpers/ppds.py[co] +%{py_sitescriptdir}/cupshelpers/xmldriverprefs.py[co] +%{py_sitescriptdir}/*.egg-info + +%files udev +%defattr(644,root,root,755) +/lib/udev/rules.d/*-printers.rules +%attr(755,root,root) /lib/udev/udev-add-printer +%attr(755,root,root) /lib/udev/udev-configure-printer +%{systemdunitdir}/udev-configure-printer.service -- cgit v0.10.2