rpms/xscreensaver/devel update-xscreensaver-hacks, 1.1, 1.2 xscreensaver.spec, 1.44, 1.45

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	update-xscreensaver-hacks xscreensaver.spec 
Log Message:
* Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3
- Don't split hack part of XScreenSaver.ad into each hack piece
  and make update script allow multiple config lines
  (along with rss-glx)



Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/update-xscreensaver-hacks,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- update-xscreensaver-hacks	2 Sep 2007 15:24:14 -0000	1.1
+++ update-xscreensaver-hacks	3 Sep 2007 15:24:07 -0000	1.2
@@ -11,7 +11,7 @@
 fix_hackconf ()
 {
 	if [ ! -s $1 ] ; then
-		echo "$1 is empty" &>2
+		echo "$1 is empty" >&2
 		echo ""
 		return 1
 	fi
@@ -37,15 +37,12 @@
 	while [ -s $tmpconf_2 ] ; do
 		sed -n -e '1p' $tmpconf_2 > $tmpconf_3
 		sed -i -e '1d' $tmpconf_2
-		if grep -q '\\..*$' $tmpconf_3 ; then
+		if ! grep -q '\([ \t]\\$\|\\n\\$\)' $tmpconf_3 ; then
 			rm -f $tmpconf $tmpconf_1 $tmpconf_2 $tmpconf_3
 			echo ""
 			echo "ignoring $1" >&2
 			return 1
 		fi
-		if ! grep -q '\\$' $tmpconf_3 ; then
-			sed -i -e 's|\(^.*$\)|\1\\|' $tmpconf_3
-		fi
 		cat $tmpconf_3 >> $tmpconf
 	done
 	cat $tmpconf_1 >> $tmpconf


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- xscreensaver.spec	2 Sep 2007 15:24:14 -0000	1.44
+++ xscreensaver.spec	3 Sep 2007 15:24:07 -0000	1.45
@@ -2,7 +2,7 @@
 
 %define version       5.03
 %define beta_ver      %{nil}
-%define fedora_rel    2
+%define fedora_rel    3
 
 %define extrarel      %{nil}
 
@@ -292,44 +292,9 @@
 
 # Seperate XScreenSaver.ad.hacks into each hacks
 cd $CONFD
-mkdir hacks.conf.d ; cp -p XScreenSaver.ad.hacks hacks.conf.d/ ; cd hacks.conf.d
+mkdir hacks.conf.d ; cp -p XScreenSaver.ad.hacks hacks.conf.d/xscreensaver.conf
+cd ..
 
-while [ -s XScreenSaver.ad.hacks ] ; do
-# cut hacks file by \n
-   sed -n -e '1,1p' XScreenSaver.ad.hacks > .tmp
-   if grep -q '\\n[\\]*$' .tmp ; then
-      sed -i -e '1d' XScreenSaver.ad.hacks
-   else
-      sed -n -e '1,/\\n[\\]*$/p' XScreenSaver.ad.hacks > .tmp
-      sed -i -e '1,/\\n[\\]*$/d' XScreenSaver.ad.hacks
-   fi
-
-# name modular hack conf
-   set +x
-   cp -p .tmp .tmp.2
-   modname='\'
-   while ( echo $modname | grep -q '\\' ) ; do
-      sed -n -e '1,1p' .tmp.2 | sed -e \
-         's|^[-]*[ \t][ \t]*\([a-zA-Z][a-zA-Z-]*:[ \t][ \t]*\)*\("[^"][^"]*"[ \t][ \t]*\)*||' | \
-         sed -e 's|[ \t].*$||' > .mod.name
-      modname=`cat .mod.name`
-      sed -i -e '1,1d' .tmp.2
-   done
-   N=1
-   Filen=$modname.conf
-   while [ -f $Filen ] ; do
-      N=$((N+1))
-      Filen=$modname-$N.conf
-   done
-   sed -e 's|\\n$|\\n\\|' .tmp > $Filen
-   echo "   created: $Filen"
-
-# clean up
-   rm -f .tmp* .mod.name
-
-done
-set -x
-cd ../..
 %endif
 
 %install
@@ -393,7 +358,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d
 cp -p xscreensaver/XScreenSaver.ad* \
    $RPM_BUILD_ROOT%{_sysconfdir}/xscreensaver
-cp -p xscreensaver/hacks.conf.d/*.conf \
+cp -p xscreensaver/hacks.conf.d/xscreensaver.conf \
    $RPM_BUILD_ROOT%{_datadir}/xscreensaver/hacks.conf.d/
 
 for adfile in xscreensaver/XScreenSaver.ad.* ; do
@@ -403,6 +368,8 @@
 echo -n "%%verify(not size md5 mtime) " >> $dd/base.files
 echo "%%config(noreplace) %{_sysconfdir}/xscreensaver/XScreenSaver.ad" >> \
    $dd/base.files
+echo "%{_datadir}/xscreensaver/hacks.conf.d/xscreensaver.conf" \
+   >> $dd/base.files
 
 # check symlink
 rm -f $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
@@ -419,19 +386,6 @@
 ln -sf ../../../..%{_sysconfdir}/xscreensaver/XScreenSaver.ad \
    $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/XScreenSaver
 
-set +x
-for conf in xscreensaver/hacks.conf.d/*.conf ; do
-   modname=`basename $conf | sed -e 's|.conf||' | sed -e 's|-.*||'`
-   if grep -q -i $modname $dd/extras.files ; then
-        hackfile=$dd/extras.files
-   else
-        hackfile=$dd/gl-extras.files
-   fi
-   echo "%{_datadir}/xscreensaver/hacks.conf.d/`basename $conf`" >> $hackfile
-   echo -n " Added: %{_datadir}/xscreensaver/hacks.conf.d/`basename $conf`"
-   echo " >> `basename $hackfile`"
-done
-set -x
 %endif
 
 # add documents
@@ -526,11 +480,7 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %if %{modular_conf}
-%post extras
-%{_bindir}/update-xscreensaver-hacks
-exit 0
-
-%post gl-extras
+%post base
 %{_bindir}/update-xscreensaver-hacks
 exit 0
 %endif
@@ -554,8 +504,13 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Sep  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-3
+- Don't split hack part of XScreenSaver.ad into each hack piece
+  and make update script allow multiple config lines
+  (along with rss-glx)
+
 * Sun Sep  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-2
-- Try to make XScreenSaver.ad modular
+- Try to make XScreenSaver.ad modular (bug 200881)
 
 * Wed Aug 29 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-1
 - Update to 5.03
@@ -565,7 +520,7 @@
   - Don't use include-directory patch anymore
   - Make all xscreensaver related directories owned by -base subpackage
     because now -extras and -gl-extras subpackage require it.
-  - Mark man files as %%doc explicitly, because %_mandir is expanded
+  - Mark man files as %%doc explicitly, because %%_mandir is expanded
     in files list
 - Fix write_long() (actually no_malloc_number_to_string())