rpms/gnome-screensaver/devel path.patch, NONE, 1.1 gnome-screensaver.spec, 1.204, 1.205

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31144

Modified Files:
	gnome-screensaver.spec 
Added Files:
	path.patch 
Log Message:
Make all hacks work again


path.patch:

--- NEW FILE path.patch ---
Index: src/gs-theme-manager.c
===================================================================
--- src/gs-theme-manager.c	(revision 1610)
+++ src/gs-theme-manager.c	(working copy)
@@ -75,17 +75,33 @@
 {
         int i;
 
-        for (i = 0; known_engine_locations [i]; i++){
-                char *path;
+        if (g_path_is_absolute (command)) {
+                char *dirname;
 
-                path = g_build_filename (known_engine_locations [i], command, NULL);
+                dirname = g_path_get_dirname (command);
+                for (i = 0; known_engine_locations [i]; i++) {
+                        if (strcmp (dirname, known_engine_locations [i]) == 0) {
+                                if (g_file_test (command, G_FILE_TEST_IS_EXECUTABLE)
+                                    && ! g_file_test (command, G_FILE_TEST_IS_DIR)) {
+                                        g_free (dirname);
+                                        return g_strdup (command);
+                                }
+                        }
+                }
+                g_free (dirname);
+        } else {
+                for (i = 0; known_engine_locations [i]; i++){
+                        char *path;
 
-                if (g_file_test (path, G_FILE_TEST_IS_EXECUTABLE)
-                    && ! g_file_test (path, G_FILE_TEST_IS_DIR)) {
-                        return path;
+                        path = g_build_filename (known_engine_locations [i], command, NULL);
+
+                        if (g_file_test (path, G_FILE_TEST_IS_EXECUTABLE)
+                            && ! g_file_test (path, G_FILE_TEST_IS_DIR)) {
+                                return path;
+                        }
+
+                        g_free (path);
                 }
-
-                g_free (path);
         }
 
         return NULL;


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- gnome-screensaver.spec	20 Feb 2009 17:07:11 -0000	1.204
+++ gnome-screensaver.spec	21 Feb 2009 05:39:22 -0000	1.205
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.25.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.25/%{name}-%{version}.tar.bz2
@@ -29,6 +29,8 @@
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=567111
 Patch9: password-entry.patch
+# fixed upstream
+Patch10: path.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -85,6 +87,7 @@
 %patch7 -p1 -b .blank-by-default
 %patch8 -p1 -b .selinux-permit
 %patch9 -p1 -b .password-entry
+%patch10 -p0 -b .path
 libtoolize --force --copy
 
 %build
@@ -153,6 +156,9 @@
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Sat Feb 21 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.2-4
+- Make all hacks work again
+
 * Fri Feb 20 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.2-3
 - Show menuitem in Xfce