rpms/gtk2/devel gtk+-2.7.0-themename.patch, 1.1, 1.2 gtk2.spec, 1.79, 1.80

[fedora-cvs-commits redhat com]

Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15002

Modified Files:
	gtk+-2.7.0-themename.patch gtk2.spec 
Log Message:
Update a patch


gtk+-2.7.0-themename.patch:
 Makefile.am   |   12 ++++++------
 gtksettings.c |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

Index: gtk+-2.7.0-themename.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk+-2.7.0-themename.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk+-2.7.0-themename.patch	21 Jun 2005 16:52:42 -0000	1.1
+++ gtk+-2.7.0-themename.patch	1 Jul 2005 20:51:54 -0000	1.2
@@ -1,6 +1,6 @@
---- gtk+-2.3.2/gtk/gtksettings.c.themename	2004-01-22 15:13:47.000000000 -0500
-+++ gtk+-2.3.2/gtk/gtksettings.c	2004-01-23 02:53:25.000000000 -0500
-@@ -209,7 +299,7 @@
+--- gtk+-2.7.1/gtk/gtksettings.c.themename	2005-07-01 16:49:33.798469000 -0400
++++ gtk+-2.7.1/gtk/gtksettings.c	2005-07-01 16:49:48.077175000 -0400
+@@ -320,7 +320,7 @@
                                               g_param_spec_string ("gtk-theme-name",
  								   P_("Theme Name"),
  								   P_("Name of theme RC file to load"),
@@ -9,16 +9,28 @@
  								  GTK_PARAM_READWRITE),
                                               NULL);
    g_assert (result == PROP_THEME_NAME);
---- gtk+-2.3.2/gtk/Makefile.am.themename	2003-10-23 00:22:27.000000000 -0400
-+++ gtk+-2.3.2/gtk/Makefile.am	2004-01-23 02:53:25.000000000 -0500
-@@ -637,8 +637,8 @@
+--- gtk+-2.7.1/gtk/Makefile.am.themename	2005-07-01 16:50:14.652573000 -0400
++++ gtk+-2.7.1/gtk/Makefile.am	2005-07-01 16:51:09.082089000 -0400
+@@ -677,16 +677,16 @@
  
  # Install a RC file for the default GTK+ theme, and key themes
- install-data-local: install-ms-lib install-libtool-import-lib
+ install-data-local: install-ms-lib install-def-file
 -	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
 -	$(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key
+-	$(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
 +	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0
 +	$(INSTALL_DATA) $(srcdir)/gtkrc.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc
- 	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key
- 	$(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0-key
++	$(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0-key/gtkrc
  	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key
+ 	$(INSTALL_DATA) $(srcdir)/gtkrc.key.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
+ 
+ uninstall-local: uninstall-ms-lib uninstall-def-file
+-	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
+-	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0-key/gtkrc
++	rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0/gtkrc
++	rm -f $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0-key/gtkrc
+ 	rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-2.0-key/gtkrc
+ 
+ # if srcdir!=builddir, clean out maintainer-clean files from builddir


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- gtk2.spec	1 Jul 2005 20:29:22 -0000	1.79
+++ gtk2.spec	1 Jul 2005 20:51:54 -0000	1.80
@@ -84,8 +84,8 @@
 
 (cd .. && tar xzf %{SOURCE1})
 
-%patch1 -p1 -b .themename
-%patch2 -p1 -b .lib64
+#%patch1 -p1 -b .themename
+#%patch2 -p1 -b .lib64
 
 for i in config.guess config.sub ; do
 	test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .