[system-config-printer/f15] Move files around so the libs sub-package provides the D-Bus service.

Tim Waugh twaugh at fedoraproject.org
Fri Jul 29 15:50:08 UTC 2011


commit 69f5ef781b61b93e0e5ee6dc6c8b60bd8dc05061
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Jul 29 16:30:17 2011 +0100

    Move files around so the libs sub-package provides the D-Bus service.

 system-config-printer.spec |   65 ++++++++++++++++++++++---------------------
 1 files changed, 33 insertions(+), 32 deletions(-)
---
diff --git a/system-config-printer.spec b/system-config-printer.spec
index b82cbdb..be71162 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -101,40 +101,14 @@ rm -rf %buildroot
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
-%dir %{_sysconfdir}/cupshelpers
-%config(noreplace) %{_sysconfdir}/cupshelpers/preferreddrivers.xml
-%dir %{python_sitelib}/cupshelpers
-%{python_sitelib}/cupshelpers/__init__.py*
-%{python_sitelib}/cupshelpers/config.py*
-%{python_sitelib}/cupshelpers/cupshelpers.py*
-%{python_sitelib}/cupshelpers/installdriver.py*
-%{python_sitelib}/cupshelpers/openprinting.py*
-%{python_sitelib}/cupshelpers/ppds.py*
-%{python_sitelib}/cupshelpers/xmldriverprefs.py*
-%{python_sitelib}/*.egg-info
-
-%files udev
-%defattr(-,root,root,-)
-/lib/udev/rules.d/*.rules
-/lib/udev/udev-*-printer
-%ghost %dir %{_localstatedir}/run/udev-configure-printer
-%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %attr(0644,root,root) %{_localstatedir}/run/udev-configure-printer/usb-uris
-%{_unitdir}/udev-configure-printer.service
-
-%files
-%defattr(-,root,root,-)
-%doc ChangeLog README
-%{_bindir}/%{name}
-%{_bindir}/%{name}-applet
-%{_bindir}/scp-dbus-service
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/dbus-1/services/*.service
+%{_bindir}/scp-dbus-service
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/asyncconn.py*
 %{_datadir}/%{name}/asyncipp.py*
 %{_datadir}/%{name}/asyncpk1.py*
 %{_datadir}/%{name}/authconn.py*
-%{_datadir}/%{name}/check-device-ids.py*
 %{_datadir}/%{name}/config.py*
 %{_datadir}/%{name}/cupspk.py*
 %{_datadir}/%{name}/debug.py*
@@ -142,9 +116,9 @@ rm -rf %buildroot
 %{_datadir}/%{name}/errordialogs.py*
 %{_datadir}/%{name}/firewall.py*
 %{_datadir}/%{name}/gtkinklevel.py*
+%{_datadir}/%{name}/gtk_label_autowrap.py*
 %{_datadir}/%{name}/gtkspinner.py*
 %{_datadir}/%{name}/gui.py*
-%{_datadir}/%{name}/HIG.py*
 %{_datadir}/%{name}/installpackage.py*
 %{_datadir}/%{name}/jobviewer.py*
 %{_datadir}/%{name}/monitor.py*
@@ -159,15 +133,41 @@ rm -rf %buildroot
 %{_datadir}/%{name}/probe_printer.py*
 %{_datadir}/%{name}/pysmb.py*
 %{_datadir}/%{name}/scp-dbus-service.py*
-%{_datadir}/%{name}/SearchCriterion.py*
-%{_datadir}/%{name}/serversettings.py*
 %{_datadir}/%{name}/smburi.py*
 %{_datadir}/%{name}/statereason.py*
-%{_datadir}/%{name}/system-config-printer.py*
 %{_datadir}/%{name}/timedops.py*
+%dir %{_sysconfdir}/cupshelpers
+%config(noreplace) %{_sysconfdir}/cupshelpers/preferreddrivers.xml
+%dir %{python_sitelib}/cupshelpers
+%{python_sitelib}/cupshelpers/__init__.py*
+%{python_sitelib}/cupshelpers/config.py*
+%{python_sitelib}/cupshelpers/cupshelpers.py*
+%{python_sitelib}/cupshelpers/installdriver.py*
+%{python_sitelib}/cupshelpers/openprinting.py*
+%{python_sitelib}/cupshelpers/ppds.py*
+%{python_sitelib}/cupshelpers/xmldriverprefs.py*
+%{python_sitelib}/*.egg-info
+
+%files udev
+%defattr(-,root,root,-)
+/lib/udev/rules.d/*.rules
+/lib/udev/udev-*-printer
+%ghost %dir %{_localstatedir}/run/udev-configure-printer
+%ghost %verify(not md5 size mtime) %config(noreplace,missingok) %attr(0644,root,root) %{_localstatedir}/run/udev-configure-printer/usb-uris
+%{_unitdir}/udev-configure-printer.service
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog README
+%{_bindir}/%{name}
+%{_bindir}/%{name}-applet
+%{_datadir}/%{name}/check-device-ids.py*
+%{_datadir}/%{name}/HIG.py*
+%{_datadir}/%{name}/SearchCriterion.py*
+%{_datadir}/%{name}/serversettings.py*
+%{_datadir}/%{name}/system-config-printer.py*
 %{_datadir}/%{name}/ToolbarSearchEntry.py*
 %{_datadir}/%{name}/userdefault.py*
-%{_datadir}/%{name}/gtk_label_autowrap.py*
 %{_datadir}/%{name}/applet.py*
 %{_datadir}/%{name}/troubleshoot
 %{_datadir}/%{name}/icons
@@ -221,6 +221,7 @@ fi
   - Updated translations.
 - Also: applied patch to fix serversettings traceback, from upstream
   post-1.3.5 (bug #726682).
+- Move files around so the libs sub-package provides the D-Bus service.
 
 * Thu Jul 21 2011 Tim Waugh <twaugh at redhat.com> 1.3.4-2
 - No longer requires glade (uses GtkBuilder instead).


More information about the scm-commits mailing list