rpms/xscreensaver/devel .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 update-xscreensaver-hacks, 1.5, 1.6 xscreensaver.spec, 1.74, 1.75
Mamoru Tasaka
mtasaka at fedoraproject.org
Thu Sep 11 16:22:49 UTC 2008
- Previous message (by thread): rpms/xscreensaver/F-9 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 update-xscreensaver-hacks, 1.5, 1.6 xscreensaver.spec, 1.73, 1.74
- Next message (by thread): rpms/ssmtp/devel ssmtp-unitialized-strdup.patch, NONE, 1.1 ssmtp-md5auth-non-rsa, 1.1, 1.2 ssmtp-password-leak.patch, 1.1, 1.2 ssmtp.spec, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29635/devel
Modified Files:
.cvsignore sources update-xscreensaver-hacks xscreensaver.spec
Log Message:
* Fri Sep 12 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-2
- Update ja.po
- Fix the explanation in XScreenSaver.ad (bug 461415)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 20 Aug 2008 18:08:54 -0000 1.9
+++ .cvsignore 11 Sep 2008 16:22:19 -0000 1.10
@@ -1 +1,2 @@
xscreensaver-5.07.tar.gz
+ja.po.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 20 Aug 2008 18:08:54 -0000 1.9
+++ sources 11 Sep 2008 16:22:19 -0000 1.10
@@ -1 +1,2 @@
55a12fcb5d3a7231c9850ef9d9f82918 xscreensaver-5.07.tar.gz
+43d35c0a54c80d16c6476d0b841bb92c ja.po.gz
Index: update-xscreensaver-hacks
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/update-xscreensaver-hacks,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- update-xscreensaver-hacks 15 Sep 2007 14:47:28 -0000 1.5
+++ update-xscreensaver-hacks 11 Sep 2008 16:22:19 -0000 1.6
@@ -61,13 +61,18 @@
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 > $tmpfile <<EOF
+! Don't edit this file directly by yourself!!
+! This file is not meant to be edited directly.
+!
+! Instread, please edit /etc/xscreensaver/XScreenSaver.ad.header,
+! /etc/xscreensaver/XScreenSaver.ad.tail and add files under
+! /usr/share/xscreensaver/hacks.conf.d if you want.
+!
+! Then call /usr/sbin/update-xscreensaver-hacks to
+! update this file.
+!
+EOF
cat $ADDIR/XScreenSaver.ad.header >> $tmpfile
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- xscreensaver.spec 20 Aug 2008 18:08:54 -0000 1.74
+++ xscreensaver.spec 11 Sep 2008 16:22:19 -0000 1.75
@@ -5,7 +5,7 @@
%define modular_conf 1
-%define fedora_rel 1
+%define fedora_rel 2
%define extrarel %{nil}
@@ -14,7 +14,7 @@
%define pam_ver 0.80-7
%define autoconf_ver 2.53
-%define update_po 0
+%define update_po 1
%define build_tests 0
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,6 +31,7 @@
%if %{modular_conf}
Source10: update-xscreensaver-hacks
%endif
+Source20: ja.po.gz
Patch1: xscreensaver-5.00b5-sanitize-hacks.patch
Patch21: xscreensaver-5.07-webcollage-default-nonet.patch
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
@@ -186,6 +187,8 @@
%patch1 -p1 -b .sanitize-hacks
%patch21 -p1 -b .nonet
+gzip -dc %SOURCE20 > po/ja.po
+
change_option(){
set +x
ADFILE=$1
@@ -308,7 +311,7 @@
sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
%build
-autoconf
+#autoconf
archdir=`./config.guess`
mkdir $archdir
@@ -334,7 +337,8 @@
( cd po ; make generate_potfiles_in update-po )
%endif
-make %{?_smp_mflags}
+make %{?_smp_mflags} \
+ GMSGFMT="msgfmt --statistics"
%if %{modular_conf}
# Make XScreenSavar.ad modular
@@ -607,6 +611,10 @@
%defattr(-,root,root,-)
%changelog
+* Fri Sep 12 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-2
+- Update ja.po
+- Fix the explanation in XScreenSaver.ad (bug 461415)
+
* Thu Aug 21 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.07-1
- Update to 5.07
- Fix the license tag: BSD -> MIT
- Previous message (by thread): rpms/xscreensaver/F-9 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 update-xscreensaver-hacks, 1.5, 1.6 xscreensaver.spec, 1.73, 1.74
- Next message (by thread): rpms/ssmtp/devel ssmtp-unitialized-strdup.patch, NONE, 1.1 ssmtp-md5auth-non-rsa, 1.1, 1.2 ssmtp-password-leak.patch, 1.1, 1.2 ssmtp.spec, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list