rpms/xscreensaver/F-9 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xscreensaver.spec, 1.69, 1.70 xscreensaver-5.05-penetrate-font.patch, 1.2, NONE

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15887/F-9

Modified Files:
	.cvsignore sources xscreensaver.spec 
Removed Files:
	xscreensaver-5.05-penetrate-font.patch 
Log Message:
* Thu Jul 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.06-1
- Update to 5.06



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Mar 2008 14:20:06 -0000	1.7
+++ .cvsignore	17 Jul 2008 01:59:34 -0000	1.8
@@ -1 +1 @@
-xscreensaver-5.05.tar.gz
+xscreensaver-5.06.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Mar 2008 14:20:06 -0000	1.7
+++ sources	17 Jul 2008 01:59:34 -0000	1.8
@@ -1 +1 @@
-d759262b10d76f87f1a7fc50ae8664d4  xscreensaver-5.05.tar.gz
+c6b2cab02aaea32684d37a9a76488e0f  xscreensaver-5.06.tar.gz


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-9/xscreensaver.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- xscreensaver.spec	31 May 2008 17:33:19 -0000	1.69
+++ xscreensaver.spec	17 Jul 2008 01:59:34 -0000	1.70
@@ -1,11 +1,11 @@
 %define name          xscreensaver
 
-%define version       5.05
+%define mainversion   5.06
 %define beta_ver      %{nil}
 
 
 %define modular_conf  1
-%define fedora_rel    4
+%define fedora_rel    1
 
 %define extrarel      %{nil}
 
@@ -20,21 +20,18 @@
 
 Summary:         X screen saver and locker
 Name:            %{name}
-Version:         %{version}
+Version:         %{mainversion}
 Release:         %{fedora_rel}%{?dist}%{?extrarel}
 Epoch:           1
 License:         BSD
 Group:           Amusements/Graphics
 URL:             http://www.jwz.org/xscreensaver/
-Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{version}%{?beta_ver}.tar.gz
+Source0:         http://www.jwz.org/xscreensaver/xscreensaver-%{mainversion}%{?beta_ver}.tar.gz
 %if %{modular_conf}
 Source10:        update-xscreensaver-hacks
 %endif
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
-Patch3:          xscreensaver-5.05-addopts-jwz.patch
-Patch4:          xscreensaver-5.05-fix-compile.patch
 Patch21:         xscreensaver-5.05-webcollage-default-nonet.patch
-Patch22:         xscreensaver-5.05-penetrate-font.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -172,13 +169,10 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta_ver}
+%setup -q -n %{name}-%{mainversion}%{?beta_ver}
 
 %patch1 -p1 -b .sanitize-hacks
-%patch3 -p1 -b .opts
-%patch4 -p1 -b .compile
 %patch21 -p1 -b .nonet
-%patch22 -p1 -b .font
 
 change_option(){
    set +x
@@ -350,7 +344,7 @@
 
 make install_prefix=$RPM_BUILD_ROOT INSTALL="install -c -p" install
 
-desktop-file-install --vendor gnome --delete-original    \
+desktop-file-install --vendor "" --delete-original    \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
    --add-only-show-in GNOME                              \
    --add-category    DesktopSettings                     \
@@ -379,7 +373,7 @@
 
 # Generate three lists of files for the three packages.
 #
-dd=%{_builddir}/%{name}-%{version}%{?beta_ver}
+dd=%{_builddir}/%{name}-%{mainversion}%{?beta_ver}
 
 # In case rpm -bi --short-circuit is tried multiple times:
 rm -f $dd/*.files
@@ -564,6 +558,12 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Jul 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.06-1
+- Update to 5.06
+
+* Wed Jul  9 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.05.90.3-3
+- Apply a experimental randr 1.2 patch by jwz
+
 * Mon Jun  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.05-4
 - Fix compilation error with GLib 2.17+
 


--- xscreensaver-5.05-penetrate-font.patch DELETED ---