rpms/gtk2/devel gtk+-2.7.0-themename.patch, 1.2, 1.3 gtk2.spec, 1.80, 1.81

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

Modified Files:
	gtk+-2.7.0-themename.patch gtk2.spec 
Log Message:
Make it build


gtk+-2.7.0-themename.patch:
 Makefile.am   |    6 +++---
 gtksettings.c |    2 +-
 2 files changed, 4 insertions(+), 4 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk+-2.7.0-themename.patch	1 Jul 2005 20:51:54 -0000	1.2
+++ gtk+-2.7.0-themename.patch	5 Jul 2005 16:46:19 -0000	1.3
@@ -1,5 +1,5 @@
---- 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
+--- gtk+-2.7.1/gtk/gtksettings.c.themename	2005-06-15 15:25:48.000000000 -0400
++++ gtk+-2.7.1/gtk/gtksettings.c	2005-07-05 11:30:04.443688000 -0400
 @@ -320,7 +320,7 @@
                                               g_param_spec_string ("gtk-theme-name",
  								   P_("Theme Name"),
@@ -9,28 +9,24 @@
  								  GTK_PARAM_READWRITE),
                                               NULL);
    g_assert (result == PROP_THEME_NAME);
---- 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 @@
+--- gtk+-2.7.1/gtk/Makefile.am.themename	2005-06-26 15:01:33.000000000 -0400
++++ gtk+-2.7.1/gtk/Makefile.am	2005-07-05 12:30:18.091988000 -0400
+@@ -677,15 +677,15 @@
  
  # Install a RC file for the default GTK+ theme, and key themes
  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/Raleigh/gtk-2.0-key
-+	$(INSTALL_DATA) $(srcdir)/gtkrc.key.default $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0-key/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/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/Default/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.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- gtk2.spec	1 Jul 2005 20:51:54 -0000	1.80
+++ gtk2.spec	5 Jul 2005 16:46:19 -0000	1.81
@@ -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 .