rpms/xscreensaver/devel xscreensaver-5.08-po-recreate.patch, 1.1, 1.2 xscreensaver.spec, 1.81, 1.82

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23785

Modified Files:
	xscreensaver-5.08-po-recreate.patch xscreensaver.spec 
Log Message:
fix po recreate patch

xscreensaver-5.08-po-recreate.patch:

Index: xscreensaver-5.08-po-recreate.patch
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver-5.08-po-recreate.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xscreensaver-5.08-po-recreate.patch	29 Dec 2008 15:33:52 -0000	1.1
+++ xscreensaver-5.08-po-recreate.patch	29 Dec 2008 17:46:48 -0000	1.2
@@ -1,5 +1,5 @@
 --- 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
++++ xscreensaver-5.08/aclocal.m4	2008-12-30 02:12:29.000000000 +0900
 @@ -252,7 +252,10 @@
  
      AC_OUTPUT_COMMANDS(
@@ -12,13 +12,13 @@
  
      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
++++ xscreensaver-5.08/po/Makefile.in.in	2008-12-30 02:12:29.000000000 +0900
 @@ -190,7 +190,7 @@
  all-yes: $(CATALOGS)
  all-no:
  
 -$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
-+$(GETTEXT_PACKAGE).pot: POTFILES
++$(GETTEXT_PACKAGE).pot: $(POTFILES)
  	@INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) ; \
  	export INTLTOOL_EXTRACT ; \
  	echo top_srcdir=$(top_srcdir) $(GENPOT) ; \
@@ -41,7 +41,7 @@
  
  
  # jwz: Generates po/POTFILES.in by examining the source tree:
-@@ -362,16 +363,25 @@
+@@ -362,16 +363,22 @@
  	    && (sed -e '/^#/d' 						\
  		    -e "s/^\[.*\] +//" 					\
  		    -e '/^[ 	]*$$/d' 				\
@@ -57,15 +57,12 @@
 +		$(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
++stamp-it: Makefile.in.in ../config.status POTFILES
 +	cd .. \
 +	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= \
 +	       $(SHELL) ./config.status


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- xscreensaver.spec	29 Dec 2008 15:33:52 -0000	1.81
+++ xscreensaver.spec	29 Dec 2008 17:46:48 -0000	1.82
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    2
+%define fedora_rel    3
 
 %define extrarel      %{nil}
 
@@ -631,7 +631,7 @@
 %defattr(-,root,root,-)
 
 %changelog
-* Mon Dec 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-2
+* Mon Dec 29 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.08-3
 - 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