rpms/gtk2/devel cups-authstring.patch, NONE, 1.1 .cvsignore, 1.72, 1.73 gtk2.spec, 1.244, 1.245 sources, 1.80, 1.81

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17244

Modified Files:
	.cvsignore gtk2.spec sources 
Added Files:
	cups-authstring.patch 
Log Message:
2.11.6


cups-authstring.patch:

--- NEW FILE cups-authstring.patch ---
Index: configure.in
===================================================================
--- configure.in	(revision 18526)
+++ configure.in	(working copy)
@@ -1572,6 +1572,15 @@
 fi
 AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
 
+gtk_save_cflags="$CFLAGS"
+CFLAGS="$CUPS_CFLAGS"
+AC_TRY_COMPILE([#include <cups/http.h>],
+               [http_t http; char *s = http.authstring;],
+               [AC_DEFINE(HAVE_HTTP_AUTHSTRING,[],[Define if cups http_t authstring field is accessible])],)
+CFLAGS="$gtk_save_cflags"
+
+AC_SUBST(HAVE_HTTP_AUTHSTRING)
+
 gtk_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
 			  
Index: modules/printbackends/cups/gtkcupsutils.c
===================================================================
--- modules/printbackends/cups/gtkcupsutils.c	(revision 18526)
+++ modules/printbackends/cups/gtkcupsutils.c	(working copy)
@@ -30,10 +30,6 @@
 #include <stdlib.h>
 #include <time.h>
 
-#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR > 1) || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR == 1 && CUPS_VERSION_PATCH >= 20)
-#define HAVE_HTTP_AUTHSTRING 1
-#endif
-
 typedef void (*GtkCupsRequestStateFunc) (GtkCupsRequest *request);
 
 static void _connect            (GtkCupsRequest *request);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- .cvsignore	2 Jul 2007 22:58:50 -0000	1.72
+++ .cvsignore	23 Jul 2007 18:35:27 -0000	1.73
@@ -1 +1 @@
-gtk+-2.11.5.tar.bz2
+gtk+-2.11.6.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- gtk2.spec	9 Jul 2007 02:11:13 -0000	1.244
+++ gtk2.spec	23 Jul 2007 18:35:27 -0000	1.245
@@ -1,6 +1,6 @@
 # Note that this is NOT a relocatable package
 
-%define glib2_base_version 2.13.3
+%define glib2_base_version 2.13.7
 %define glib2_version %{glib2_base_version}-1
 %define pango_base_version 1.15.3
 %define pango_version %{pango_base_version}-1
@@ -10,13 +10,13 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.11.5
+%define base_version 2.11.6
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2
@@ -29,6 +29,8 @@
 Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
 # use fam for recent-files
 #Patch2: gtk+-2.10.3-fam.patch
+# fixed in upstream svn
+Patch3: cups-authstring.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -115,6 +117,7 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 #%patch2 -p1 -b .fam
+%patch3 -p0 -b .authstring
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -285,6 +288,13 @@
 %doc tmpdocs/examples
 
 %changelog
+* Mon Jul 23 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.6-1
+- Update to 2.11.6
+- Make it build against recent cups
+
+* Thu Jul 19 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.5-4
+- Up the glib requirement
+
 * Sun Jul  8 2007 Matthias Clasen <mclasen at redhat.com> - 2.11.5-3
 - Own /usr/lib/gtk-2.0/modules
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/sources,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- sources	2 Jul 2007 22:58:50 -0000	1.80
+++ sources	23 Jul 2007 18:35:27 -0000	1.81
@@ -1 +1 @@
-45e8fb0ed2358bffee92ad796d313099  gtk+-2.11.5.tar.bz2
+2b35ce357e138af23c52e4bceb1a63a0  gtk+-2.11.6.tar.bz2