rpms/xscreensaver/F-7 update-xscreensaver-hacks, NONE, 1.1 xscreensaver.spec, 1.42, 1.43
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Sat Sep 15 02:08:32 UTC 2007
- Previous message (by thread): rpms/xscreensaver/devel update-xscreensaver-hacks, 1.3, 1.4 xscreensaver.spec, 1.47, 1.48
- Next message (by thread): rpms/eclipse-egit/devel eclipse-egit-add-feature.patch, NONE, 1.1 eclipse-egit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2265
Modified Files:
xscreensaver.spec
Added Files:
update-xscreensaver-hacks
Log Message:
Again I forgot to add sources. orz
--- NEW FILE update-xscreensaver-hacks ---
#!/bin/bash
_SYSCONFDIR=${sysconfdir:-/etc}
_PREFIX=${prefix:-/usr}
_DATADIR=${datadir:-${_PREFIX}/share}
ADDIR=${ADDIR:-${install_prefix}${_SYSCONFDIR}/xscreensaver}
CONFDIR=${CONFDIR:-${install_prefix}${_DATADIR}/xscreensaver/hacks.conf.d}
ADFILE=${ADFILE:-$ADDIR/XScreenSaver.ad}
fix_hackconf ()
{
if [ ! -s $1 ] ; then
echo "$1 is empty" >&2
echo ""
return 1
fi
tmpconf=`mktemp /tmp/hackconf.XXXXXXXX`
tmpconf_1=`mktemp /tmp/hackconf.XXXXXXXX`
tmpconf_2=`mktemp /tmp/hackconf.XXXXXXXX`
tmpconf_3=`mktemp /tmp/hackconf.XXXXXXXX`
sed -n -e '$p' $1 > $tmpconf_1
sed -e '$d' $1 > $tmpconf_2
for file in $tmpconf_1 $tmpconf_2 ; do
if ( [ -s $file ] && grep -q '\\n\(\|\\\)[^\\].*$' $file ) ; then
rm -f $tmpconf $tmpconf_1 $tmpconf_2 $tmpconf_3
echo ""
echo "ignoring $1" >&2
return 1
fi
done
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
sed -n -e '1p' $tmpconf_2 > $tmpconf_3
sed -i -e '1d' $tmpconf_2
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
cat $tmpconf_3 >> $tmpconf
done
cat $tmpconf_1 >> $tmpconf
rm -f $tmpconf_1 $tmpconf_2 $tmpconf_3
echo $tmpconf
return 0
}
for suffix in header tail ; do
if [ ! -r $ADDIR/XScreenSaver.ad.$suffix ] ; then
echo "$ADDIR/XScreenSaver.ad.$suffix missing"
exit 1
fi
done
tmpfile=`mktemp /tmp/XScreenSaver.ad.XXXXXXXX`
echo "! Don't edit this file directly by yourself!!" > $tmpfile
echo "! This file will be updated automatically." >> $tmpfile
echo "!" >> $tmpfile
echo "! Instread, please edit /etc/xscreensaver/XScreenSaver.ad.header," >> $tmpfile
echo "! /etc/xscreensaver/XScreenSaver.ad.tail and add files under" >> $tmpfile
echo "! /usr/share/xscreensaver/hacks.conf.d if you want." >> $tmpfile
echo >> $tmpfile
cat $ADDIR/XScreenSaver.ad.header >> $tmpfile
for hackconf in $CONFDIR/*.conf ; do
hackconf_fixed=`fix_hackconf $hackconf`
if [ -n "$hackconf_fixed" ] ; then
cat $hackconf >> $tmpfile
rm -f $hackconf_fixed
fi
done
sed -i -e '$s|\\n\\$|\\n|' $tmpfile
cat $ADDIR/XScreenSaver.ad.tail >> $tmpfile
install -c -p -m 644 $tmpfile $ADFILE
rm -f $tmpfile
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-7/xscreensaver.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- xscreensaver.spec 15 Sep 2007 01:53:04 -0000 1.42
+++ xscreensaver.spec 15 Sep 2007 02:08:00 -0000 1.43
@@ -28,7 +28,7 @@
Summary: X screen saver and locker
Name: %{name}
Version: %{version}
-Release: %{fedora_rel}%{?dist}%{?extrarel}
+Release: %{fedora_rel}%{?dist}%{?extrarel}.1
Epoch: 1
License: BSD
Group: Amusements/Graphics
- Previous message (by thread): rpms/xscreensaver/devel update-xscreensaver-hacks, 1.3, 1.4 xscreensaver.spec, 1.47, 1.48
- Next message (by thread): rpms/eclipse-egit/devel eclipse-egit-add-feature.patch, NONE, 1.1 eclipse-egit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list