rpms/gedit/devel gedit-2.23.1-python.patch, NONE, 1.1 gedit.spec, 1.158, 1.159 icon-names.patch, 1.1, 1.2 gedit-2.15.1-python.patch, 1.1, NONE

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	gedit.spec icon-names.patch 
Added Files:
	gedit-2.23.1-python.patch 
Removed Files:
	gedit-2.15.1-python.patch 
Log Message:
one more icon


gedit-2.23.1-python.patch:

--- NEW FILE gedit-2.23.1-python.patch ---
diff -up gedit-2.23.1/configure.ac.python gedit-2.23.1/configure.ac
--- gedit-2.23.1/configure.ac.python	2008-05-12 11:32:44.000000000 -0400
+++ gedit-2.23.1/configure.ac	2008-08-09 22:35:22.000000000 -0400
@@ -203,10 +203,6 @@ if test "x$have_python" != "xno"; then
 fi
 
 if test "x$have_python" != "xno"; then
-	AM_CHECK_PYTHON_HEADERS([],[have_python=no])
-fi
-
-if test "x$have_python" != "xno"; then
 	PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'`
 	PY_EXEC_PREFIX=`$PYTHON -c 'import sys ; print sys.exec_prefix'`
 	PYTHON_LIBS="-lpython$PYTHON_VERSION"
@@ -329,8 +325,6 @@ dnl ====================================
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
 			      
-GNOME_COMPILE_WARNINGS(yes)
-
 AC_ARG_ENABLE(deprecations,
               [AC_HELP_STRING([--enable-deprecations],
                               [warn about deprecated usages [default=no]])],,


Index: gedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/gedit.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- gedit.spec	10 Jul 2008 03:53:08 -0000	1.158
+++ gedit.spec	10 Aug 2008 02:39:14 -0000	1.159
@@ -18,7 +18,7 @@
 Summary:	gEdit is a small but powerful text editor for GNOME
 Name:		gedit
 Version: 	2.23.1
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:		1
 License:	GPLv2+ and GFDL
 Group:		Applications/Editors
@@ -44,9 +44,10 @@
 
 # po/LINGUAS disaster forces us to regenerate configure
 # and I needed this patch to make autoconf happy
-Patch2: gedit-2.15.1-python.patch
+Patch2: gedit-2.23.1-python.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=542300
+# http://bugzilla.gnome.org/show_bug.cgi?id=547129
 Patch3: icon-names.patch
 
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -198,6 +199,9 @@
 
 
 %changelog
+* Sat Aug  9 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.1-3
+- One more icon name fix
+
 * Wed Jul  9 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.23.1-2
 - Use standard icon names
 

icon-names.patch:

Index: icon-names.patch
===================================================================
RCS file: /cvs/extras/rpms/gedit/devel/icon-names.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icon-names.patch	10 Jul 2008 03:53:08 -0000	1.1
+++ icon-names.patch	10 Aug 2008 02:39:14 -0000	1.2
@@ -34,3 +34,16 @@
  		}
  
  		model_add_node (model, node, parent);
+Index: gedit-2.23.1/plugins/filebrowser/gedit-file-browser-plugin.c
+===================================================================
+--- gedit-2.23.1/plugins/filebrowser/gedit-file-browser-plugin.c	(revision 6372)
++++ gedit-2.23.1/plugins/filebrowser/gedit-file-browser-plugin.c	(working copy)
+@@ -723,7 +723,7 @@
+ 			  window);			  
+ 
+ 	panel = gedit_window_get_side_panel (window);
+-	pixbuf = gedit_file_browser_utils_pixbuf_from_theme("file-manager",  
++	pixbuf = gedit_file_browser_utils_pixbuf_from_theme("system-file-manager",  
+ 	                                                    GTK_ICON_SIZE_MENU);
+ 	
+ 	if (pixbuf) {


--- gedit-2.15.1-python.patch DELETED ---