rpms/xscreensaver/devel xscreensaver-5.00-po-correctdir.patch, NONE, 1.1 xscreensaver.spec, 1.20, 1.21

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27580

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.00-po-correctdir.patch 
Log Message:
* Mon Jul 17 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-14
- Correct paths to update po files properly and try re-creating po files.
- Rebuild for FC6T2 devel freeze.


xscreensaver-5.00-po-correctdir.patch:

--- NEW FILE xscreensaver-5.00-po-correctdir.patch ---
--- xscreensaver-5.00/intltool-update.in.podir	2002-04-30 21:28:24.000000000 +0900
+++ xscreensaver-5.00/intltool-update.in	2006-07-17 15:46:28.000000000 +0900
@@ -415,6 +415,10 @@
            if (/\.($xml_extension|$ini_extension)$/ || /^\[/){
 	       $_ =~ s/^\[[^\[].*]\s*//;
                my $filename = "../$_";
+               my $srcdir = $ENV{'top_srcdir'};
+               if ($srcdir){
+		   $filename="$srcdir/$_" ;
+               };
 
                if ($VERBOSE){
                    system($EXTRACT, "--update", "--type=$gettext_type", $filename);
@@ -435,6 +439,12 @@
 
     move ("POTFILES.in", "POTFILES.in.old");
 
+    my $srcdir = $ENV{'top_srcdir'};
+    my $adddirectory = "--directory=." ;
+    if ($srcdir){
+        $adddirectory = "--directory=$srcdir";
+    }
+
     open INFILE, "<POTFILES.in.old";
     open OUTFILE, ">POTFILES.in";
     while (<INFILE>) {
@@ -447,6 +457,7 @@
 
     system ("xgettext", "--default-domain\=$MODULE", 
 			"--directory\=\.\.",
+			"$adddirectory" ,
 	   		"--add-comments", 
 			"--keyword\=\_", 
 			"--keyword\=N\_", 
--- xscreensaver-5.00/po/Makefile.in.in.podir	2006-03-28 16:23:30.000000000 +0900
+++ xscreensaver-5.00/po/Makefile.in.in	2006-07-17 04:20:37.000000000 +0900
@@ -192,8 +192,8 @@
 $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
 	@INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) ; \
 	export INTLTOOL_EXTRACT ; \
-	echo $(GENPOT) ; \
-	     $(GENPOT)
+	echo top_srcdir=$(top_srcdir) $(GENPOT) ; \
+	     top_srcdir=$(top_srcdir) $(GENPOT)
 
 install-strip: install
 
@@ -292,7 +292,7 @@
 	@tmp=po.$$$$ ;				\
 	 file=POTFILES.in ;			\
 	 ( cd $(top_srcdir);			\
-	   echo "# Auto-generated: `date`" ;	\
+	   echo "# Auto-generated: `LANG=C date`" ;	\
 	   ( grep -l '_("' driver/*.[ch] ;	\
 	     ls driver/*.glade2			\
 		driver/*.desktop.in		\
@@ -320,6 +320,9 @@
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+          if [ ! -f $$lang.po ] ; then \
+             cp $(srcdir)/$$lang.po . ; \
+          fi ; \
 	  cp $$lang.po $$lang.old.po; \
 	  echo $(MSGMERGE) $$lang; \
 	  if   $(MSGMERGE) $$lang >/dev/null 2>&1; then \


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xscreensaver.spec	3 Jul 2006 15:40:55 -0000	1.20
+++ xscreensaver.spec	17 Jul 2006 16:05:25 -0000	1.21
@@ -1,14 +1,16 @@
 %define	name 		xscreensaver
 
 %define version		5.00
-%define fedora_rel	13
+%define fedora_rel	14
 
-%define fedora_ver	5.90
+%define fedora_ver	5.91
 %define default_text 	%{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt
 
 %define pam_ver		0.80-7
 %define autoconf_ver	2.53
 
+%define update_po	1
+
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Summary:	X screen saver and locker
@@ -31,6 +33,7 @@
 Patch105:	xscreensaver-5.00-text-locale.patch
 Patch110:	xscreensaver-5.00-fix-hacks.patch
 Patch111:	xscreensaver-5.00-kill-getimage.patch
+Patch112:	xscreensaver-5.00-po-correctdir.patch
 
 %package base
 Summary: 	A minimal installation of xscreensaver
@@ -105,6 +108,7 @@
 %patch105 -p1 -b .text-locale
 %patch110 -p1 -b .fix-hacks
 %patch111 -p1 -b .kill-getimage
+%patch112 -p1 -b .po-dir
 
 install -c -m644 -p %{SOURCE10} po/ja.po
 
@@ -148,6 +152,10 @@
 	textProgram=fortune\ -s \
 	passwd.heading.label=Screen\ Locked
 
+# Tweak for FC6T2
+change_option driver/XScreenSaver.ad.in \
+	textFile=%{default_text}
+
 silence_hack driver/XScreenSaver.ad.in \
 	bsod flag
 
@@ -203,6 +211,10 @@
 %configure $CONFIG_OPTS
 rm -f configure
 
+%if %{update_po}
+( cd po ; make generate_potfiles_in update-po )
+%endif
+
 make
 
 %install
@@ -288,6 +300,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Mon Jul 17 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-14
+- Correct paths to update po files properly and try re-creating po files.
+- Rebuild for FC6T2 devel freeze.
+
 * Mon Jul  3 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.00-13
 - Fix for causing SEGV on exit about petri, squiral (total: 22 hacks)
   I hope this will finally fix all hacks' problems.