Hello community,
here is the log from the commit of package gnome-cups-manager
checked in at Tue Oct 23 10:21:58 CEST 2007.
--------
--- GNOME/gnome-cups-manager/gnome-cups-manager.changes 2007-10-11 16:39:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-cups-manager/gnome-cups-manager.changes 2007-10-22 20:46:07.554895000 +0200
@@ -1,0 +2,7 @@
+Mon Oct 22 20:45:27 CEST 2007 - crivera@suse.de
+
+- Update the source tarball and patch set for 0.32. Also, add
+ gnome-cups-manager-root-queue.patch and
+ gnome-cups-manager-icon-callback.patch
+
+-------------------------------------------------------------------
Old:
----
autodetect-usb-printers.patch
bnc-6238.patch
gnome-cups-manager-0.32cvs20060120.tar.bz2
gnome-cups-manager.desktop
gnome-cups-manager-suse-lp-group.patch
only-once.patch
popt-fix.patch
smb-uri-parser-fix.patch
New:
----
gnome-cups-manager-0.32.tar.bz2
gnome-cups-manager-icon-callback.patch
gnome-cups-manager-root-queue.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-cups-manager.spec ++++++
--- /var/tmp/diff_new_pack.Z15605/_old 2007-10-23 10:21:24.000000000 +0200
+++ /var/tmp/diff_new_pack.Z15605/_new 2007-10-23 10:21:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-cups-manager (Version 0.32cvs20060120)
+# spec file for package gnome-cups-manager (Version 0.32)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,26 +11,21 @@
# norootforbuild
Name: gnome-cups-manager
-BuildRequires: cups cups-devel fdupes gcc-c++ gnome-common gnome-icon-theme gnutls-devel intltool krb5-devel libglade2-devel libgnomecups-devel libgnomeprintui-devel libgnomeui-devel libsmbclient libsmbclient-devel libwnck-devel perl-XML-Parser update-desktop-files
-Version: 0.32cvs20060120
-Release: 175
+BuildRequires: cups cups-devel fdupes gcc-c++ gnome-common gnome-icon-theme gnutls-devel intltool krb5-devel libglade2-devel libgnomecups-devel libgnomeprintui-devel libgnomeui-devel libsmbclient libsmbclient-devel libwnck-devel mDNSResponder-devel perl-XML-Parser update-desktop-files
+Version: 0.32
+Release: 1
Url: http://www.gnome.org/
Group: System/GUI/GNOME
License: GPL v2 or later
Summary: GNOME CUPS Printer Manager
-Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.bz2
Source1: gnome-cups-manager-novell-branded-test-pages.tar.bz2
-Source2: gnome-cups-manager.desktop
Patch0: suse-smbclient-needs-kerberos.patch
-Patch1: popt-fix.patch
-Patch2: only-once.patch
-Patch3: smb-uri-parser-fix.patch
-Patch4: autodetect-usb-printers.patch
-Patch5: bnc-6238.patch
-Patch6: gnome-cups-manager-suse-lp-group.patch
-Patch7: gnome-cups-manager-154299.patch
-Patch8: gnome-cups-manager-relaxed.patch
-Patch9: gnome-cups-manager-start-icon.patch
+Patch1: gnome-cups-manager-154299.patch
+Patch2: gnome-cups-manager-relaxed.patch
+Patch3: gnome-cups-manager-start-icon.patch
+Patch4: gnome-cups-manager-root-queue.patch
+Patch5: gnome-cups-manager-icon-callback.patch
AutoReqProv: on
Requires: gnome-icon-theme
Requires: %{name}-lang = %{version}
@@ -57,29 +52,21 @@
%setup -a 1
%patch0 -p0
%patch1 -p1
-%patch2 -p0
-%patch3 -p0
+%patch2 -p1
+%patch3 -p1
%patch4 -p1
-%patch5
-%patch6
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+%patch5 -p1
%build
-rm po/no.*
sed -i "s/\(ALL_LINGUAS.*\) no /\1 /" configure.in
autoreconf -f -i
-# needed for gnome-cups-manager-0.32cvs20060120:
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure\
--disable-static
make %{?jobs:-j%jobs}
%install
%makeinstall
-mkdir $RPM_BUILD_ROOT%{_datadir}/applications
-cp %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/applications/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
ln -s ../icons/gnome/48x48/stock/io/stock_printers.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
%suse_update_desktop_file gnome-cups-manager X-SuSE-PrintingUtility X-SuSE-ControlCenter-Hardware
%find_lang %{name}
@@ -117,6 +104,10 @@
%{_libdir}/pkgconfig/*.pc
%{_includedir}/libgnomecups-1/libgnomecups/*
%changelog
+* Mon Oct 22 2007 - crivera@suse.de
+- Update the source tarball and patch set for 0.32. Also, add
+ gnome-cups-manager-root-queue.patch and
+ gnome-cups-manager-icon-callback.patch
* Thu Oct 11 2007 - sbrabec@suse.cz
- Removed bogus dependency on mDNSResponder.
* Tue Aug 14 2007 - crivera@suse.de
++++++ gnome-cups-manager-0.32cvs20060120.tar.bz2 -> gnome-cups-manager-0.32.tar.bz2 ++++++
++++ 47275 lines of diff (skipped)
++++++ gnome-cups-manager-icon-callback.patch ++++++
diff -ur /usr/src/packages/BUILD/gnome-cups-manager-0.32cvs20060120/gnome-cups-manager/view-queue.c ./gnome-cups-manager/view-queue.c
--- /usr/src/packages/BUILD/gnome-cups-manager-0.32cvs20060120/gnome-cups-manager/view-queue.c 2007-09-27 08:58:46.000000000 -0400
+++ ./gnome-cups-manager/view-queue.c 2007-09-27 08:58:39.000000000 -0400
@@ -284,30 +285,36 @@
}
static void
+pause_or_resume_async_cb (guint id, const char *path,
+ ipp_t *response, GError **error,
+ gpointer cb_data)
+{
+ GnomeCupsPrinter *printer = cb_data;
+
+ if (!response || response->request.status.status_code > IPP_OK_CONFLICT) {
+ char *action = gnome_cups_printer_get_state (printer) == IPP_PRINTER_STOPPED ? "resume" : "pause";
+ char *msg = g_strdup_printf ("Could not %s '%s'",
+ action,
+ gnome_cups_printer_get_name (printer));
+ gnome_cups_error_dialog (NULL, msg, NULL);
+ g_free (msg);
+ }
+}
+
+static void
pause_or_resume_selected_cb (GtkWidget *item, gpointer user_data)
{
GladeXML *xml = GLADE_XML (user_data);
GnomeCupsPrinter *printer;
GError *error = NULL;
+ ipp_t *request;
printer = g_object_get_data (G_OBJECT (xml), "printer");
- if (gnome_cups_printer_get_state (printer) == IPP_PRINTER_STOPPED) {
- gnome_cups_printer_resume (printer, &error);
- if (error) {
- handle_error (xml,
- _("Could not resume printer"),
- error);
- g_error_free (error);
- }
- } else {
- gnome_cups_printer_pause (printer, &error);
- if (error) {
- handle_error (xml,
- _("Could not resume printer"),
- error);
- g_error_free (error);
- }
- }
+ request = gnome_cups_printer_get_state (printer) == IPP_PRINTER_STOPPED ?
+ gnome_cups_request_new_for_printer (IPP_RESUME_PRINTER, printer) :
+ gnome_cups_request_new_for_printer (IPP_PAUSE_PRINTER, printer);
+ gnome_cups_request_execute_async (request, NULL, "/admin/",
+ pause_or_resume_async_cb, printer, NULL);
}
static void
++++++ gnome-cups-manager-relaxed.patch ++++++
--- /var/tmp/diff_new_pack.Z15605/_old 2007-10-23 10:21:26.000000000 +0200
+++ /var/tmp/diff_new_pack.Z15605/_new 2007-10-23 10:21:26.000000000 +0200
@@ -1,7 +1,7 @@
-diff -ur /usr/src/packages/BUILD/gnome-cups-manager-0.32cvs20060120/gnome-cups-add/add-printer.c ./gnome-cups-add/add-printer.c
---- /usr/src/packages/BUILD/gnome-cups-manager-0.32cvs20060120/gnome-cups-add/add-printer.c 2007-08-13 16:01:30.000000000 -0400
-+++ ./gnome-cups-add/add-printer.c 2007-08-13 15:57:04.000000000 -0400
-@@ -126,10 +126,26 @@
+diff -ur gnome-cups-manager-0.32/gnome-cups-add/add-printer.c gnome-cups-manager-0.32-new/gnome-cups-add/add-printer.c
+--- gnome-cups-manager-0.32/gnome-cups-add/add-printer.c 2007-10-21 10:17:56.000000000 -0400
++++ gnome-cups-manager-0.32-new/gnome-cups-add/add-printer.c 2007-10-21 10:17:44.000000000 -0400
+@@ -127,10 +127,26 @@
return glade_xml_get_widget (xml, "connection_page");
}
@@ -29,7 +29,7 @@
char local_uri [HTTP_MAX_URI+1];
ipp_t *request = gnome_cups_request_new (CUPS_ADD_PRINTER);
-@@ -146,15 +162,8 @@
+@@ -147,15 +163,8 @@
ippAddBoolean (request, IPP_TAG_PRINTER, "printer-is-accepting-jobs", 1);
ippAddInteger(request, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
IPP_PRINTER_IDLE);
@@ -47,7 +47,7 @@
return TRUE;
}
-@@ -196,16 +205,7 @@
+@@ -197,16 +206,7 @@
g_list_foreach (existing, (GFunc)g_free, NULL);
g_list_free (existing);
@@ -65,14 +65,7 @@
g_free (uri);
g_free (name);
-@@ -369,24 +369,24 @@
- fprintf (stdout, "gnome-printer-add version %s\n", PACKAGE_VERSION);
- exit (0);
- }
--
-+
- if (printer_uri && check_printer_configured (printer_uri)) {
- fprintf (stdout, "printer already configured.\n");
+@@ -384,14 +384,6 @@
exit (0);
}
@@ -83,26 +76,13 @@
- else
- exit (1);
- }
--
- glade_init ();
+-
gnome_cups_ui_init (argv[0]);
-- xml = glade_xml_new (GNOME_CUPS_MANAGER_DATADIR "/gnome-cups-add.glade", "add_printer_window", GETTEXT_PACKAGE);
-+ /*if (!gnome_cups_printer_op_authorized (NULL, CUPS_ADD_PRINTER)) {
-+ if (gnome_cups_spawn ("gnome-cups-add", argc - 1,
-+ (char const **)(argv + 1), TRUE, NULL))
-+ exit (0);
-+ else
-+ exit (1);
-+ }*/
-+
-+ xml = glade_xml_new (GNOME_CUPS_MANAGER_DATADIR "/gnome-cups-add.glade", "add_printer_window", GETTEXT_PACKAGE);
-
- window = glade_xml_get_widget (xml, "add_printer_window");
- set_window_icon (window, "gnome-dev-printer-new");
-diff -ur /usr/src/packages/BUILD/gnome-cups-manager-0.32cvs20060120/gnome-cups-manager/gnome-cups-manager.glade ./gnome-cups-manager/gnome-cups-manager.glade
---- /usr/src/packages/BUILD/gnome-cups-manager-0.32cvs20060120/gnome-cups-manager/gnome-cups-manager.glade 2005-03-04 09:36:29.000000000 -0500
-+++ ./gnome-cups-manager/gnome-cups-manager.glade 2007-08-13 15:57:04.000000000 -0400
+ xml = glade_xml_new (GNOME_CUPS_MANAGER_DATADIR "/gnome-cups-add.glade", "add_printer_window", GETTEXT_PACKAGE);
+diff -ur gnome-cups-manager-0.32/gnome-cups-manager/gnome-cups-manager.glade gnome-cups-manager-0.32-new/gnome-cups-manager/gnome-cups-manager.glade
+--- gnome-cups-manager-0.32/gnome-cups-manager/gnome-cups-manager.glade 2007-10-21 10:17:56.000000000 -0400
++++ gnome-cups-manager-0.32-new/gnome-cups-manager/gnome-cups-manager.glade 2007-10-21 10:16:56.000000000 -0400
@@ -18,6 +18,8 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
@@ -202,9 +182,9 @@
<widget class="GtkMenuItem" id="make_default_item">
<property name="visible">True</property>
<property name="label" translatable="yes">Make _Default</property>
-diff -ur /usr/src/packages/BUILD/gnome-cups-manager-0.32cvs20060120/gnome-cups-manager/gnome-printer-list.c ./gnome-cups-manager/gnome-printer-list.c
---- /usr/src/packages/BUILD/gnome-cups-manager-0.32cvs20060120/gnome-cups-manager/gnome-printer-list.c 2005-02-28 14:05:22.000000000 -0500
-+++ ./gnome-cups-manager/gnome-printer-list.c 2007-08-13 16:01:17.000000000 -0400
+diff -ur gnome-cups-manager-0.32/gnome-cups-manager/gnome-printer-list.c gnome-cups-manager-0.32-new/gnome-cups-manager/gnome-printer-list.c
+--- gnome-cups-manager-0.32/gnome-cups-manager/gnome-printer-list.c 2007-10-21 10:17:56.000000000 -0400
++++ gnome-cups-manager-0.32-new/gnome-cups-manager/gnome-printer-list.c 2007-10-21 10:16:56.000000000 -0400
@@ -37,6 +37,7 @@
#include
participants (1)
-
root@Hilbert.suse.de