rpms/xscreensaver/F-7 xscreensaver-5.03-compiler-warning.patch, NONE, 1.1 xscreensaver.spec, 1.45, 1.46

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Added Files:
	xscreensaver-5.03-compiler-warning.patch 
Log Message:
* Thu Oct 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-12
- Create -gl-base subpackage and split xscreensaver-gl-helper 
  into -gl-base subpackage so that external GL screensavers can
  use it (bug 336331)


xscreensaver-5.03-compiler-warning.patch:

--- NEW FILE xscreensaver-5.03-compiler-warning.patch ---
--- xscreensaver-5.03/driver/xscreensaver.c.orig	2007-03-15 17:33:00.000000000 +0900
+++ xscreensaver-5.03/driver/xscreensaver.c	2007-10-15 14:16:02.000000000 +0900
@@ -1406,7 +1406,9 @@
   if (!spasswd)
     {
       fprintf(stderr, "Could not figure out who the current user is!\n");
+#if 0
       fprintf(stderr, "spasswd is %x\n", (unsigned int) spasswd);
+#endif
       return 1;
     }
 


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-7/xscreensaver.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xscreensaver.spec	6 Oct 2007 14:10:06 -0000	1.45
+++ xscreensaver.spec	19 Oct 2007 11:46:50 -0000	1.46
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    10
+%define fedora_rel    12
 %endif
 
 %define extrarel      %{nil}
@@ -39,6 +39,7 @@
 Patch21:         xscreensaver-5.03-webcollage-default-nonet.patch
 Patch40:         xscreensaver-5.02-pidnumber-write_long.patch
 Patch41:         xscreensaver-5.03-demo-conf-maxvalue-plus1.patch
+Patch42:         xscreensaver-5.03-compiler-warning.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -84,6 +85,11 @@
 BuildRequires:   desktop-backgrounds-basic
 Requires:        %{name}-base = %{epoch}:%{version}-%{release}
 
+%package gl-base
+Summary:         A base package for screensavers that require OpenGL
+Group:           Amusements/Graphics
+Requires:        %{name}-base = %{epoch}:%{version}-%{release}
+
 %package gl-extras
 Summary:         An enhanced set of screensavers that require OpenGL
 Group:           Amusements/Graphics
@@ -91,7 +97,7 @@
 Obsoletes:       xscreensaver-gl <= 1:5.00
 BuildRequires:   libGL-devel
 BuildRequires:   libGLU-devel
-Requires:        %{name}-base = %{epoch}:%{version}-%{release}
+Requires:        %{name}-gl-base = %{epoch}:%{version}-%{release}
 
 %package extras-gss
 Summary:         Desktop files of extras for gnome-screensaver
@@ -143,6 +149,11 @@
 Ce paquet contient une pléthore d'économiseurs d'écran graphiques
 pour votre plaisir des yeux.
 
+%description gl-base
+A modular screen saver and locker for the X Window System.
+This package contains minimal files to make screensaver hacks
+that require OpenGL work for XScreenSaver.
+
 %description gl-extras
 A modular screen saver and locker for the X Window System.
 This package contains a variety of OpenGL-based (3D) screen
@@ -171,6 +182,7 @@
 %patch21 -p1 -b .nonet
 %patch40 -p1 -b .pidnum_debug
 %patch41 -p1 -b .conf_max
+%patch42 -p1 -b .warn
 
 change_option(){
    set +x
@@ -372,6 +384,18 @@
 (  cd hacks/glx ; list_files install ) >  $dd/gl-extras.files
 (  cd driver    ; list_files install ) >  $dd/base.files
 
+# Move %%{_bindir}/xscreensaver-gl-helper to gl-base
+# (bug 336331).
+echo "%%defattr(-,root,root,-)" >> $dd/gl-base.files
+
+sed -i -e '/xscreensaver-gl-helper/d' $dd/gl-extras.files
+pushd $RPM_BUILD_ROOT
+for dir in `find . -name \*xscreensaver-gl-helper\*` ; do
+   echo "${dir#.}" >> $dd/gl-base.files
+done
+popd
+sed -i -e 's|^\(%{_mandir}.*\)$|\1*|' $dd/gl-base.files
+
 %if %{modular_conf}
 # install update script
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
@@ -519,6 +543,9 @@
 %files -f extras.files extras
 %defattr(-,root,root,-)
 
+%files -f gl-base.files gl-base
+%defattr(-,root,root,-)
+
 %files -f gl-extras.files gl-extras
 %defattr(-,root,root,-)
 
@@ -529,9 +556,17 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Oct 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-12
+- Create -gl-base subpackage and split xscreensaver-gl-helper 
+  into -gl-base subpackage so that external GL screensavers can
+  use it (bug 336331)
+
+* Mon Oct 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-11
+- Suppress compiler warning
+
 * Sat Oct  6 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-10
 - Fix the maximum value on demo configuration dialog
-- Change the encoding of XScreenSaver.ad and man files
+- Change the encoding of XScreenSaver.ad and man files (bug 319101)
 
 * Tue Oct  2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-9
 - Change the default browser to xdg-open