rpms/xscreensaver/devel update-xscreensaver-hacks, 1.2, 1.3 xscreensaver.spec, 1.46, 1.47
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Sat Sep 15 01:42:47 UTC 2007
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28241/devel
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-4
- Add some comments on update script.
Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/update-xscreensaver-hacks,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- update-xscreensaver-hacks 3 Sep 2007 15:24:07 -0000 1.2
+++ update-xscreensaver-hacks 15 Sep 2007 01:42:15 -0000 1.3
@@ -60,7 +60,12 @@
done
tmpfile=`mktemp /tmp/XScreenSaver.ad.XXXXXXXX`
-cat $ADDIR/XScreenSaver.ad.header > $tmpfile
+
+echo "! Don't edit this file by yourself!!" > $tmpfile
+echo "! This file will be updated automatically." >> $tmpfile
+echo >> $tmpfile
+
+cat $ADDIR/XScreenSaver.ad.header >> $tmpfile
for hackconf in $CONFDIR/*.conf ; do
hackconf_fixed=`fix_hackconf $hackconf`
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xscreensaver.spec 3 Sep 2007 15:34:39 -0000 1.46
+++ xscreensaver.spec 15 Sep 2007 01:42:15 -0000 1.47
@@ -2,7 +2,13 @@
%define version 5.03
%define beta_ver %{nil}
-%define fedora_rel 3
+%if 0%{?fedora} <= 6
+%define modular_conf 0
+%define fedora_rel 1.1
+%else
+%define modular_conf 1
+%define fedora_rel 4
+%endif
%define extrarel %{nil}
@@ -16,7 +22,6 @@
%define autoconf_ver 2.53
%define update_po 1
-%define modular_conf 1
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -505,6 +510,9 @@
%defattr(-,root,root,-)
%changelog
+* Sat Sep 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-4
+- Add some comments on update script.
+
* 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 hacks in one config file
More information about the fedora-extras-commits
mailing list