rpms/xscreensaver/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 xscreensaver.spec, 1.108, 1.109

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5013

Modified Files:
	.cvsignore sources xscreensaver.spec 
Log Message:
* Sat Jun  5 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-3.respin1
- Upstream seems to have released new 5.11 tarball
  containing po/ directory, use that tarball
  (detected by Kevin's source audit)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	12 Apr 2010 14:58:42 -0000	1.14
+++ .cvsignore	4 Jun 2010 17:04:51 -0000	1.15
@@ -1,2 +1 @@
-xscreensaver-5.10.tar.gz
 xscreensaver-5.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	12 Apr 2010 14:58:42 -0000	1.14
+++ sources	4 Jun 2010 17:04:51 -0000	1.15
@@ -1,2 +1 @@
-0d7205f9da8e3f1b83bcda549d73a7c4  xscreensaver-5.10.tar.gz
-86cb9d36fd62bba479d1cf45b35457fe  xscreensaver-5.11.tar.gz
+80f981b86734ccb31c5b3b24af3930ae  xscreensaver-5.11.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- xscreensaver.spec	30 Apr 2010 16:59:02 -0000	1.108
+++ xscreensaver.spec	4 Jun 2010 17:04:51 -0000	1.109
@@ -5,9 +5,9 @@
 
 
 %define modular_conf  1
-%define fedora_rel    2
+%define fedora_rel    3
 
-%define extrarel      %{nil}
+%define extrarel      .respin1
 
 %if 0%{?fedora} >= 12
 %define default_text  %{_datadir}/doc/HTML/readme/en_US/README-en_US.txt
@@ -33,8 +33,6 @@ License:         MIT
 Group:           Amusements/Graphics
 URL:             http://www.jwz.org/xscreensaver/
 Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{mainversion}%{?beta_ver}.tar.gz
-# Translation being removed?? Recovering from the previous version
-Source1:         http://www.jwz.org/xscreensaver/xscreensaver-5.10.tar.gz
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
@@ -51,8 +49,6 @@ Patch1:          xscreensaver-5.00b5-san
 # Change webcollage not to access to net
 # Also see bug 472061
 Patch21:         xscreensaver-5.11-webcollage-default-nonet.patch
-# Reuse po again
-Patch22:         xscreensaver-5.11-usepo_again.patch
 #
 ## Patches to be sent to the upsteam
 # Remove "AC_PROG_CC' was expanded before it was required" warning
@@ -212,12 +208,10 @@ This package contains some test programs
 
 
 %prep
-%setup -q -n %{name}-%{mainversion}%{?beta_ver} -a 1
-ln -sf xscreensaver-5.10/po po
+%setup -q -n %{name}-%{mainversion}%{?beta_ver}
 
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
-%patch22 -p1 -b .po
 %patch30 -p1 -b .conf264
 %patch31 -p1 -b .nowin2_sig
 
@@ -691,6 +685,11 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Jun  5 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-3.respin1
+- Upstream seems to have released new 5.11 tarball
+  containing po/ directory, use that tarball
+  (detected by Kevin's source audit)
+
 * Sat May  1 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.11-2
 - Fix crash when not using "pair" mode and when MappingNotify
   or so is received (bug 587537)