Hello community,
here is the log from the commit of package system-config-printer for
openSUSE:Factory
checked in at Fri Sep 9 11:53:44 CEST 2011.
--------
--- GNOME/system-config-printer/system-config-printer.changes 2011-08-25
13:35:40.000000000 +0200
+++
/mounts/work_src_done/STABLE/system-config-printer/system-config-printer.changes
2011-09-06 23:48:24.000000000 +0200
@@ -1,0 +2,36 @@
+Tue Sep 6 21:35:44 UTC 2011 - vu...@opensuse.org
+
+- Split the main subpackage in various smaller subpackages, to
+ enable more fine-grained dependencies (gnome-control-center only
+ needs the dbus service, and we don't want to force people to
+ install the whole system-config-printer in that case):
+ - Create common subpackage that contains files common to more
+ than one subpackage.
+ - Create applet subpackage that contains the notification icon
+ monitoring printing stuff when the user is logged in.
+ - Create dbus-service subpackage that contains the dbus service.
+ - Rename lang subpackage to common-lang, so that it gets
+ installed with the common subpackage.
+ - Make all those subpackages depend on the common subpackage, for
+ obvious reasons.
+ - Add other dependencies between those subpackages:
+ . Add applet subpackage Recommends to main subpackage: it makes
+ sense to have the applet if the main tool is installed.
+ . Add dbus-service subpackage Requires to applet subpackage:
+ the applet relies on the dbus service to manage jobs.
+ - Move dbus-1-python, python-cups, python-cupshelpers,
+ python-gnomekeyring, python-gobject, python-gtk, python-notify,
+ python-smbc Requires from main subpackage to common subpackage
+ since all those python modules can be used by the various
+ tools.
++ Remove unneeded dbus-1-x11 and desktop-file-utils Requires.
++ Add a system-config-printer-applet Recommends to
+ udev-configure-printer: the udev tools create a notification for
+ the user if the applet is installed.
++ Make python-cupshelpers noarch.
++ Move the com.redhat.PrinterDriversInstaller.conf dbus
+ configuration file to python-cupshelpers, where it really
+ belongs (since this is where the dbus server is implemented).
++ Drop support for openSUSE <= 11.1.
+
+-------------------------------------------------------------------
@@ -5,2 +41,8 @@
- + Bugs fixed: rh#726682, rh#726996, rh#726938, lp#826958,
- lp#444280, lp#828030, lp#819000.
+ + Allow entering @,?,=,& characters in Device URI text field
+ (lp##826958).
+ + IPPAuthConnection: avoid traceback (Ubuntu #828030).
+ + Removed PackageKit client code in missingPackagesAndExecutables
+ (lp#726938).
+ + Properties dialog: make OK button sensitive even when no
+ changes to save (lp#444280).
+ + Updated translations.
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ system-config-printer.spec ++++++
--- /var/tmp/diff_new_pack.bKzkMI/_old 2011-09-09 11:53:39.000000000 +0200
+++ /var/tmp/diff_new_pack.bKzkMI/_new 2011-09-09 11:53:39.000000000 +0200
@@ -22,7 +22,7 @@
License: GPLv2+
Group: Hardware/Printing
Version: 1.3.6
-Release: 1
+Release: 2
Summary: A printer administration tool
Url: http://cyberelk.net/tim/software/system-config-printer/
Source0:
http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz
@@ -49,9 +49,20 @@
# Only needed because we don't (and won't) support building xz tarballs by
default... See bnc#697467
BuildRequires: xz
Requires: cups
-Requires: dbus-1-x11
+Requires: %{name}-common = %{version}
+# The applet is not strictly necessary, but it really makes sense
+Recommends: %{name}-applet
+%py_requires
+
+%description
+system-config-printer is a graphical user interface that allows the
+user to configure a CUPS print server.
+
+%package common
+License: GPLv2+
+Summary: A printer administration tool -- Common Files
+Group: Hardware/Printing
Requires: dbus-1-python
-Requires: desktop-file-utils
Requires: python-cups
Requires: python-cupshelpers
Requires: python-gnomekeyring
@@ -59,27 +70,61 @@
Requires: python-gtk
Requires: python-notify
Requires: python-smbc
-Recommends: %{name}-lang
+Recommends: %{name}-common-lang
Recommends: cups-pk-helper
+# As soon as this package is installed, it makes sense to have the
+# autoconfiguration too
Recommends: udev-configure-printer
+BuildArch: noarch
+
+%description common
+system-config-printer is a graphical user interface that allows the
+user to configure a CUPS print server.
+
+This package provides files common to various binaries.
+
+%package applet
+License: GPLv2+
+Summary: A printer administration tool -- Notification Icon for Printing
+Group: Hardware/Printing
+Requires: %{name}-common = %{version}
+# Uses the dbus service to interact with print jobs
+Requires: %{name}-dbus-service = %{version}
+BuildArch: noarch
%py_requires
-%if %suse_version <= 1110
-%define python_sitelib %{py_sitedir}
-%endif
-%description
+%description applet
+system-config-printer is a graphical user interface that allows the
+user to configure a CUPS print server.
+
+This package provides a notification icon to configure new printers and
+monitor print jobs.
+
+%package dbus-service
+License: GPLv2+
+Summary: A printer administration tool -- D-Bus Service to Configure
Printing
+Group: Hardware/Printing
+Requires: %{name}-common = %{version}
+BuildArch: noarch
+%py_requires
+
+%description dbus-service
system-config-printer is a graphical user interface that allows the
user to configure a CUPS print server.
+This packages provides a D-Bus service to configure printers and manage
+print jobs.
+
%package -n python-cupshelpers
License: GPLv2+
Summary: High-level Python Bindings for CUPS
Group: Hardware/Printing
Requires: python-cups
+BuildArch: noarch
%py_requires
%description -n python-cupshelpers
-This package contains high-level python bindings for CUPS, and can be
+This package provides high-level python bindings for CUPS, and can be
used on top of python-cups.
%package -n udev-configure-printer
@@ -90,25 +135,21 @@
Requires: dbus-1-python
Requires: python-cups
Requires: python-cupshelpers
+Recommends: %{name}-applet
%py_requires
%description -n udev-configure-printer
This package contains an utility that will ensure printers get
automatically configured when plugged on the computer.
-
-%lang_package
+%lang_package -n system-config-printer-common
%prep
%setup -q
%patch13 -p1
%build
-%if %suse_version > 1110
%configure \
--with-udev-rules
-%else
-%configure
-%endif
%install
%makeinstall udevrulesdir=/lib/udev/rules.d udevhelperdir=/lib/udev
@@ -138,26 +179,37 @@
%defattr(-,root,root,-)
%doc ChangeLog COPYING README
%{_bindir}/%{name}
+%{_datadir}/applications/system-config-printer.desktop
+%{_mandir}/man1/system-config-printer.1%{?ext_man}
+
+%files common
+%defattr(-,root,root,-)
+%{_datadir}/%{name}/
+%{_datadir}/icons/hicolor/*/apps/system-config-printer.png
+
+%files applet
+%defattr(-,root,root,-)
%{_bindir}/%{name}-applet
+%{_mandir}/man1/system-config-printer-applet.1%{?ext_man}
+# The dbus service is provided by applet.py
+%config(noreplace)
%{_sysconfdir}/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
+%{_sysconfdir}/xdg/autostart/print-applet.desktop
+
+%files dbus-service
+%defattr(-,root,root,-)
%{_bindir}/scp-dbus-service
-%{_datadir}/%{name}/
-%{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/dbus-1/interfaces/org.fedoraproject.Config.Printing.xml
%{_datadir}/dbus-1/services/org.fedoraproject.Config.Printing.service
-%config(noreplace)
%{_sysconfdir}/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
-%config(noreplace)
%{_sysconfdir}/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
-%{_sysconfdir}/xdg/autostart/*.desktop
-%{_mandir}/man1/*
%files -n python-cupshelpers
%defattr(-,root,root,-)
%dir %{_sysconfdir}/cupshelpers
%config(noreplace) %{_sysconfdir}/cupshelpers/preferreddrivers.xml
%exclude %{python_sitelib}/cupshelpers/*.pyc
+# The dbus service is provided by cupshelpers/installdriver.py
+%config(noreplace)
%{_sysconfdir}/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf
%{python_sitelib}/cupshelpers
%{python_sitelib}/cupshelpers*.egg-info
-%if %suse_version > 1110
%files -n udev-configure-printer
%defattr(-,root,root,-)
@@ -166,8 +218,7 @@
/lib/udev/rules.d/*.rules
/lib/udev/udev-add-printer
/lib/udev/udev-configure-printer
-%endif
-%files lang -f %{name}.lang
+%files common-lang -f %{name}.lang
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
