rpms/xscreensaver/devel update-xscreensaver-hacks, 1.4, 1.5 xscreensaver.spec, 1.48, 1.49

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	update-xscreensaver-hacks xscreensaver.spec 
Log Message:
* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-6
- Fix update script to treat the ending character of conf file
  correctly.



Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/update-xscreensaver-hacks,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- update-xscreensaver-hacks	15 Sep 2007 01:53:07 -0000	1.4
+++ update-xscreensaver-hacks	15 Sep 2007 14:47:28 -0000	1.5
@@ -30,8 +30,8 @@
 			return 1
 		fi
 	done
-	if ! grep -q '\\n[^\\]*$' $tmpconf_1 ; then
-		sed -i -e 's|\(^.*$\)|\1\\n\\|' $tmpconf_1
+	if ! grep -q '\\n[\\]*$' $tmpconf_1 ; then
+		sed -i -e 's|\(^.*$\)|\1 \\n\\|' $tmpconf_1
 	fi
 	sed -i -e 's|\\n$|\\n\\|' $tmpconf_1
 	while [ -s $tmpconf_2 ] ; do
@@ -74,7 +74,7 @@
 for hackconf in $CONFDIR/*.conf ; do
 	hackconf_fixed=`fix_hackconf $hackconf`
 	if [ -n "$hackconf_fixed" ] ; then
-		cat $hackconf >> $tmpfile
+		cat $hackconf_fixed >> $tmpfile
 		rm -f $hackconf_fixed
 	fi
 done


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- xscreensaver.spec	15 Sep 2007 01:53:07 -0000	1.48
+++ xscreensaver.spec	15 Sep 2007 14:47:28 -0000	1.49
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    5
+%define fedora_rel    6
 %endif
 
 %define extrarel      %{nil}
@@ -510,6 +510,10 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-6
+- Fix update script to treat the ending character of conf file
+  correctly.
+
 * Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-5
 - Add some comments on update script.