rpms/xscreensaver/devel xscreensaver-4.21-use-hack-basename.patch, NONE, 1.1 xscreensaver.spec, 1.48, 1.49

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/xscreensaver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6551

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-4.21-use-hack-basename.patch 
Log Message:
- Allow configuration gui to support hacks with absolute paths
  (bug 157417). 


xscreensaver-4.21-use-hack-basename.patch:
 demo-Gtk-conf.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE xscreensaver-4.21-use-hack-basename.patch ---
--- xscreensaver-4.21/driver/demo-Gtk-conf.c.use-hack-basename	2004-09-04 22:58:54.000000000 -0400
+++ xscreensaver-4.21/driver/demo-Gtk-conf.c	2005-05-11 10:17:56.000000000 -0400
@@ -18,6 +18,7 @@
 
 #include <xscreensaver-intl.h>
 
+#include <libgen.h>
 #include <stdlib.h>
 
 #ifdef HAVE_UNISTD_H
@@ -1815,6 +1816,8 @@ load_configurator_1 (const char *program
 
   if (L == 0) return 0;
 
+  program = (const char *) basename (program);
+
   file = (char *) malloc (L + strlen (program) + 10);
   data = (conf_data *) calloc (1, sizeof(*data));
 


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/dist/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xscreensaver.spec	9 May 2005 14:05:31 -0000	1.48
+++ xscreensaver.spec	11 May 2005 14:42:49 -0000	1.49
@@ -4,7 +4,7 @@
 Summary:	X screen saver and locker
 Name:		%{name}
 Version:	%{version}
-Release:	3
+Release:	4
 Epoch:		1
 License:	BSD
 Group:		Amusements/Graphics
@@ -15,6 +15,7 @@
 Patch1:		xscreensaver-4.16-sanitize-hacks.patch
 Patch2:         xscreensaver-4.21-dont-ping-if-not-root.patch
 Patch3:		xscreensaver-4.21-make-hack-paths-absolute.patch
+Patch4:         xscreensaver-4.21-use-hack-basename.patch
 Buildroot:	%{_tmppath}/%{name}-root
 
 # find_lang
@@ -72,6 +73,7 @@
 %patch1 -p1 -b .sanitize-hacks
 %patch2 -p1 -b .dont-ping-if-not-root
 %patch3 -p1 -b .make-hack-paths-absolute
+%patch4 -p1 -b .use-hack-basename
 
 if [ -x %{_datadir}/libtool/config.guess ]; then
   # use system-wide copy
@@ -200,6 +202,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Wed May 11 2005 Ray Strode <rstrode at redhat.com> 1:4.21-3
+- Allow configuration gui to support hacks with absolute paths
+  (bug 157417). 
+
 * Mon May 09 2005 Ray Strode <rstrode at redhat.com> 1:4.21-3
 - Use @libexecdir@/xscreensaver instead of @HACKDIR@ in
   default configuration file so that the path gets expanded