rpms/libgnomecups/devel .cvsignore, 1.14, 1.15 libgnomecups-dbus.patch, 1.2, 1.3 libgnomecups.spec, 1.49, 1.50 sources, 1.14, 1.15
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Tue Jan 29 16:21:29 UTC 2008
Author: mclasen
Update of /cvs/extras/rpms/libgnomecups/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32467
Modified Files:
.cvsignore libgnomecups-dbus.patch libgnomecups.spec sources
Log Message:
0.2.3
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libgnomecups/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 30 Sep 2005 04:10:11 -0000 1.14
+++ .cvsignore 29 Jan 2008 16:20:50 -0000 1.15
@@ -1,7 +1 @@
-libgnomecups-0.1.11.tar.bz2
-libgnomecups-0.1.12.tar.bz2
-libgnomecups-0.1.13.tar.bz2
-libgnomecups-0.1.14.tar.bz2
-libgnomecups-0.2.0.tar.bz2
-libgnomecups-0.2.1.tar.bz2
-libgnomecups-0.2.2.tar.bz2
+libgnomecups-0.2.3.tar.bz2
libgnomecups-dbus.patch:
Index: libgnomecups-dbus.patch
===================================================================
RCS file: /cvs/extras/rpms/libgnomecups/devel/libgnomecups-dbus.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgnomecups-dbus.patch 8 Mar 2005 03:19:59 -0000 1.2
+++ libgnomecups-dbus.patch 29 Jan 2008 16:20:50 -0000 1.3
@@ -1,52 +1,25 @@
---- libgnomecups-0.1.11/configure.in.dbus 2004-09-08 20:07:40.093144656 -0400
-+++ libgnomecups-0.1.11/configure.in 2004-09-08 20:07:40.110142072 -0400
-@@ -22,6 +22,26 @@
- AC_SUBST(LIBGNOMECUPS_CFLAGS)
- AC_SUBST(LIBGNOMECUPS_LIBS)
-
-+AC_ARG_WITH(dbus, [--with-dbus Use DBus], ac_dbus=$withval, ac_dbus=auto)
-+if test x"$ac_dbus" != xno; then
-+ PKG_CHECK_MODULES(DBUS, dbus-glib-1, have_dbus=yes, have_dbus=no)
-+else
-+ have_dbus=no
-+fi
-+if test x"$have_dbus" = xno; then
-+ if test x"$ac_dbus" = xyes; then
-+ AC_MSG_ERROR([DBus explicitly requested but not found on system])
-+ fi
-+ ac_dbus=no
-+else
-+ if test x"$ac_dbus" != xno; then
-+ AC_DEFINE(WITH_DBUS, 1, [Define if you have DBus])
-+ DBUS_CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE $DBUS_CFLAGS"
-+ AC_SUBST(DBUS_CFLAGS)
-+ AC_SUBST(DBUS_LIBS)
-+ fi
-+fi
-+
- CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
- CUPS_LIBS=`cups-config --libs`
-
---- libgnomecups-0.1.11/libgnomecups/Makefile.am.dbus 2003-05-02 06:35:23.000000000 -0400
-+++ libgnomecups-0.1.11/libgnomecups/Makefile.am 2004-09-08 20:07:40.114141464 -0400
-@@ -2,6 +2,7 @@
+diff -up libgnomecups-0.2.3/libgnomecups/Makefile.am.dbus libgnomecups-0.2.3/libgnomecups/Makefile.am
+--- libgnomecups-0.2.3/libgnomecups/Makefile.am.dbus 2007-01-01 19:18:51.000000000 -0500
++++ libgnomecups-0.2.3/libgnomecups/Makefile.am 2008-01-29 11:11:37.000000000 -0500
+@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_builddir) \
$(WARN_CFLAGS) \
+ $(DBUS_CFLAGS) \
$(CUPS_CFLAGS) \
$(LIBGNOMECUPS_CFLAGS) \
- -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \
-@@ -12,6 +13,7 @@
+ -DDATADIR=\""$(datadir)"\"
+@@ -9,6 +10,7 @@ INCLUDES = \
lib_LTLIBRARIES=libgnomecups-1.0.la
- libgnomecups_1_0_la_LDFLAGS = \
- $(CUPS_LIBS) \
-+ $(DBUS_LIBS) \
- $(LIBGNOMECUPS_LIBS)
-
- libgnomecups_1_0_la_SOURCES = \
---- libgnomecups-0.1.11/libgnomecups/gnome-cups-printer.c.dbus 2004-09-08 20:07:40.079146784 -0400
-+++ libgnomecups-0.1.11/libgnomecups/gnome-cups-printer.c 2004-09-08 20:11:42.407307304 -0400
+ libgnomecups_1_0_la_LIBADD = \
+ $(LIBGNOMECUPS_LIBS) \
++ $(DBUS_LIBS) \
+ $(CUPS_LIBS)
+ libgnomecups_1_0_la_LDFLAGS = $(LT_VERSION_INFO)
+
+diff -up libgnomecups-0.2.3/libgnomecups/gnome-cups-printer.c.dbus libgnomecups-0.2.3/libgnomecups/gnome-cups-printer.c
+--- libgnomecups-0.2.3/libgnomecups/gnome-cups-printer.c.dbus 2007-01-01 19:18:51.000000000 -0500
++++ libgnomecups-0.2.3/libgnomecups/gnome-cups-printer.c 2008-01-29 11:10:31.000000000 -0500
@@ -25,6 +25,10 @@
#include "gnome-cups-printer.h"
@@ -58,7 +31,7 @@
#include <cups/cups.h>
#include <time.h>
#include <stdlib.h>
-@@ -98,6 +102,7 @@
+@@ -99,6 +103,7 @@ enum {
};
static void update_printers (void);
@@ -66,7 +39,7 @@
static void set_timeout (void);
static GList *printer_names = NULL;
-@@ -608,7 +613,8 @@
+@@ -622,7 +627,8 @@ remove_from_printers (gpointer user_data
char *printer_name = user_data;
g_hash_table_remove (printers, printer_name);
@@ -76,7 +49,7 @@
}
static void
-@@ -741,6 +747,96 @@
+@@ -782,6 +788,96 @@ update_printers_timeout (void)
return TRUE;
}
@@ -173,7 +146,7 @@
static void
set_timeout (void)
{
-@@ -775,7 +871,8 @@
+@@ -816,7 +912,8 @@ gnome_cups_printer_new_printer_notify_ad
add_notifies = g_list_append (add_notifies, notify);
@@ -183,7 +156,7 @@
return notify->id;
}
-@@ -792,7 +889,8 @@
+@@ -859,7 +956,8 @@ gnome_cups_printer_new_printer_notify_re
}
}
@@ -193,7 +166,7 @@
}
guint
-@@ -812,7 +910,8 @@
+@@ -879,7 +977,8 @@ gnome_cups_printer_printer_removed_notif
removed_notifies = g_list_append (removed_notifies, notify);
@@ -203,7 +176,7 @@
return notify->id;
}
-@@ -829,7 +928,8 @@
+@@ -898,7 +997,8 @@ gnome_cups_printer_printer_removed_notif
}
}
@@ -213,7 +186,7 @@
}
GnomeCupsPrinter *
-@@ -884,7 +984,8 @@
+@@ -953,7 +1053,8 @@ gnome_cups_printer_get (const char *prin
key = g_strdup (printer_name);
g_hash_table_insert (printers, key, printer);
g_object_weak_ref (G_OBJECT (printer), remove_from_printers, key);
@@ -223,7 +196,7 @@
if (default_printer && !strcmp (printer_name, default_printer)) {
printer->details->is_default = TRUE;
-@@ -1058,7 +1159,7 @@
+@@ -1157,7 +1258,7 @@ gnome_cups_printer_get_ppd (GnomeCupsPri
gnome_cups_request_file (host, ppdpath, fd, &error);
if (error != NULL) {
@@ -232,3 +205,33 @@
printer->details->printer_name,
error->message);
g_error_free (error);
+diff -up libgnomecups-0.2.3/configure.in.dbus libgnomecups-0.2.3/configure.in
+--- libgnomecups-0.2.3/configure.in.dbus 2008-01-29 11:10:31.000000000 -0500
++++ libgnomecups-0.2.3/configure.in 2008-01-29 11:10:31.000000000 -0500
+@@ -25,6 +25,26 @@ if test "$CUPS_CONFIG" = "no"; then
+ AC_MSG_ERROR([Please install cups development packages])
+ fi
+
++AC_ARG_WITH(dbus, [--with-dbus Use DBus], ac_dbus=$withval, ac_dbus=auto)
++if test x"$ac_dbus" != xno; then
++ PKG_CHECK_MODULES(DBUS, dbus-glib-1, have_dbus=yes, have_dbus=no)
++else
++ have_dbus=no
++fi
++if test x"$have_dbus" = xno; then
++ if test x"$ac_dbus" = xyes; then
++ AC_MSG_ERROR([DBus explicitly requested but not found on system])
++ fi
++ ac_dbus=no
++else
++ if test x"$ac_dbus" != xno; then
++ AC_DEFINE(WITH_DBUS, 1, [Define if you have DBus])
++ DBUS_CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE $DBUS_CFLAGS"
++ AC_SUBST(DBUS_CFLAGS)
++ AC_SUBST(DBUS_LIBS)
++ fi
++fi
++
+ CUPS_CFLAGS=`cups-config --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
+ CUPS_LIBS=`cups-config --libs`
+
Index: libgnomecups.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomecups/devel/libgnomecups.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- libgnomecups.spec 23 Oct 2007 05:10:07 -0000 1.49
+++ libgnomecups.spec 29 Jan 2008 16:20:50 -0000 1.50
@@ -1,7 +1,7 @@
Summary: GNOME library for CUPS integration
Name: libgnomecups
-Version: 0.2.2
-Release: 12%{?dist}
+Version: 0.2.3
+Release: 1%{?dist}
License: LGPLv2
Group: Development/Libraries
URL: http://www.gnome.org
@@ -19,8 +19,6 @@
Patch2: libgnomecups-no-gnome-common.patch
Patch3: libgnomecups-dbus.patch
Patch5: libgnomecups-0.1.14-go-direct.patch
-Patch6: libgnomecups-0.2.2-gfree.patch
-Patch7: libgnomecups-0.2.2-leak.patch
%description
GNOME library for CUPS integration
@@ -40,8 +38,6 @@
%patch2 -p1 -b .no-gnome-common
%patch3 -p1 -b .dbus
%patch5 -p1 -b .go-direct
-%patch6 -p1 -b .gfree
-%patch7 -p1 -b .leak
%build
@@ -76,6 +72,9 @@
%{_libdir}/*.so
%changelog
+* Tue Jan 29 2008 Matthias Clasen <mclasen at redhat.com> - 0.2.3-1
+- Update to 0.2.3
+
* Tue Oct 23 2007 Matthias Clasen <mclasen at redhat.com> - 0.2.2-12
- Rebuild against new dbus-glib
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libgnomecups/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 30 Sep 2005 04:10:11 -0000 1.14
+++ sources 29 Jan 2008 16:20:50 -0000 1.15
@@ -1 +1 @@
-959d5524fe9c37efb55ccfa02e3a063b libgnomecups-0.2.2.tar.bz2
+dc4920c15c9f886f73ea74fbff0ae48b libgnomecups-0.2.3.tar.bz2
More information about the fedora-extras-commits
mailing list