rpms/xscreensaver/devel xscreensaver-5.08-po-recreate.patch, NONE, 1.1 xscreensaver.spec, 1.80, 1.81
Mamoru Tasaka
mtasaka at fedoraproject.org
Mon Dec 29 15:34:22 UTC 2008
- Previous message (by thread): rpms/quassel/F-10 quassel.png, NONE, 1.1 quassel.desktop, 1.1, 1.2 quassel.spec, 1.5, 1.6 quasselclient.desktop, 1.1, 1.2 quasselcore.desktop, 1.1, 1.2
- Next message (by thread): rpms/netgen/EL-5 import.log,NONE,1.1 netgen.spec,1.1,1.2
- 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-serv25574
Modified Files:
xscreensaver.spec
Added Files:
xscreensaver-5.08-po-recreate.patch
Log Message:
* Mon Dec 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-2
- Fix the process of "make update-po -C po", reported by jwz
xscreensaver-5.08-po-recreate.patch:
--- NEW FILE xscreensaver-5.08-po-recreate.patch ---
--- xscreensaver-5.08/aclocal.m4.debug 2002-05-11 10:44:33.000000000 +0900
+++ xscreensaver-5.08/aclocal.m4 2008-12-29 19:04:02.000000000 +0900
@@ -252,7 +252,10 @@
AC_OUTPUT_COMMANDS(
[case "$CONFIG_FILES" in *po/Makefile.in*)
+ rm -f po/stamp-it po/stamp-it.tmp
+ > po/stamp-it.tmp
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ mv po/stamp-it.tmp po/stamp-it
esac])
dnl These rules are solely for the distribution goal. While doing this
--- xscreensaver-5.08/po/Makefile.in.in.debug 2007-11-11 09:44:42.000000000 +0900
+++ xscreensaver-5.08/po/Makefile.in.in 2008-12-29 21:52:49.000000000 +0900
@@ -190,7 +190,7 @@
all-yes: $(CATALOGS)
all-no:
-$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
+$(GETTEXT_PACKAGE).pot: POTFILES
@INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) ; \
export INTLTOOL_EXTRACT ; \
echo top_srcdir=$(top_srcdir) $(GENPOT) ; \
@@ -274,6 +274,7 @@
distclean: clean
rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m *.gmo *.pot
+ rm -f stamp-it
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@@ -282,8 +283,8 @@
depend:
# fuck off. love, jwz.
-#distdepend: generate_potfiles_in update-po $(DISTFILES)
-distdepend::
+distdepend: generate_potfiles_in update-po $(DISTFILES)
+#distdepend::
# jwz: Generates po/POTFILES.in by examining the source tree:
@@ -362,16 +363,25 @@
&& (sed -e '/^#/d' \
-e "s/^\[.*\] +//" \
-e '/^[ ]*$$/d' \
- -e "s at .*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
+ -e "s at .*@ $$posrcprefix& \\\\@" < $@.in \
| sed -e '$$s/\\$$//') > $@-t \
&& chmod a-w $@-t \
&& mv $@-t $@ )
+Makefile: stamp-it
+ @if test ! -f $@; then \
+ rm -f stamp-it; \
+ $(MAKE) stamp-it; \
+ fi
+
+POTFILES.in: stamp-it
+ $(MAKE) generate_potfiles_in
+
# Please to be fucking the hell off. This breaks "make distdepend". -jwz
-#Makefile: Makefile.in.in ../config.status POTFILES
-# cd .. \
-# && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-# $(SHELL) ./config.status
+stamp-it: Makefile.in.in ../config.status
+ cd .. \
+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= \
+ $(SHELL) ./config.status
# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- xscreensaver.spec 28 Dec 2008 15:24:15 -0000 1.80
+++ xscreensaver.spec 29 Dec 2008 15:33:52 -0000 1.81
@@ -5,7 +5,7 @@
%define modular_conf 1
-%define fedora_rel 1
+%define fedora_rel 2
%define extrarel %{nil}
@@ -33,6 +33,7 @@
%endif
Patch1: xscreensaver-5.00b5-sanitize-hacks.patch
Patch21: xscreensaver-5.07-webcollage-default-nonet.patch
+Patch50: xscreensaver-5.08-po-recreate.patch
Requires: xscreensaver-base = %{epoch}:%{version}-%{release}
Requires: xscreensaver-extras = %{epoch}:%{version}-%{release}
Requires: xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -185,6 +186,7 @@
%patch1 -p1 -b .sanitize-hacks
%patch21 -p1 -b .nonet
+%patch50 -p1 -b .po
change_option(){
set +x
@@ -308,7 +310,7 @@
sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
%build
-# autoconf
+autoconf
archdir=`./config.guess`
[ -d $archdir ] || mkdir $archdir
@@ -629,6 +631,9 @@
%defattr(-,root,root,-)
%changelog
+* Mon Dec 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-2
+- Fix the process of "make update-po -C po", reported by jwz
+
* Sun Dec 28 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-1
- Update to 5.08
- All non Fedora-specific patches went upstream
- Previous message (by thread): rpms/quassel/F-10 quassel.png, NONE, 1.1 quassel.desktop, 1.1, 1.2 quassel.spec, 1.5, 1.6 quasselclient.desktop, 1.1, 1.2 quasselcore.desktop, 1.1, 1.2
- Next message (by thread): rpms/netgen/EL-5 import.log,NONE,1.1 netgen.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list