rpms/xscreensaver/devel xscreensaver.spec,1.34,1.35

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Log Message:
* Sat Feb  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-6
- Make hack packages require base package (#227017)
- Create xscreensaver metapackage



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xscreensaver.spec	21 Nov 2006 09:01:11 -0000	1.34
+++ xscreensaver.spec	3 Feb 2007 04:38:54 -0000	1.35
@@ -2,7 +2,7 @@
 
 %define version       5.01
 %define beta_ver      %{nil}
-%define fedora_rel    5
+%define fedora_rel    6
 
 %define default_text  %{_datadir}/eula/eula.en_US
 
@@ -27,13 +27,18 @@
 Patch8:          xscreensaver-5.00b5-include-directory.patch
 Patch21:         xscreensaver-5.01-webcollage-default-nonet.patch
 Patch114:        xscreensaver-5.01a1-pam-popup-passwindow.patch
+Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
+Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
+Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
 
 %package base
 Summary:         A minimal installation of xscreensaver
 Group:           Amusements/Graphics
 BuildRequires:   gettext
 BuildRequires:   desktop-file-utils
+%if %{allow_non_passwd}
 BuildRequires:   autoconf >= %{autoconf_ver}
+%endif
 BuildRequires:   sed
 BuildRequires:   libtool
 BuildRequires:   bc
@@ -52,13 +57,12 @@
 Requires:        /etc/pam.d/system-auth
 Requires:        pam > %{pam_ver}
 Requires:        xorg-x11-resutils
-Provides:        xscreensaver = %{epoch}:%{version}-%{release}
-Obsoletes:       xscreensaver
 
 %package extras
 Summary:         An enhanced set of screensavers
 Group:           Amusements/Graphics
 BuildRequires:   desktop-backgrounds-basic
+Requires:        xscreensaver-base
 
 %package gl-extras
 Summary:         An enhanced set of screensavers that require OpenGL
@@ -66,6 +70,7 @@
 Provides:        xscreensaver-gl = %{epoch}:%{version}-%{release}
 Obsoletes:       xscreensaver-gl
 BuildRequires:   libGLU-devel, libGL-devel
+Requires:        xscreensaver-base
 
 %package extras-gss
 Summary:         Desktop files of extras for gnome-screensaver
@@ -84,10 +89,16 @@
 A modular screen saver and locker for the X Window System.
 More than 200 display modes are included in this package.
 
+This is a metapackage for installing all default packages
+related to XScreenSaver.
+
 %description -l fr
 Un économiseur d'écran modulaire pour le système X Window.
 Plus de 200 modes d'affichages sont inclus dans ce paquet.
 
+This is a metapackage for installing all default packages
+related to XScreenSaver.
+
 %description base
 A modular screen saver and locker for the X Window System.
 This package contains the bare minimum needed to blank and
@@ -233,7 +244,9 @@
 fi
 
 %build
+%if %{allow_non_passwd}
 autoconf
+%endif
 archdir=`./config.guess`
 mkdir $archdir
 cd $archdir
@@ -398,6 +411,9 @@
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%files
+%defattr(-,root,root)
+
 %files -f base.files base
 %defattr(-,root,root)
 
@@ -414,6 +430,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Sat Feb  3 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-6
+- Make hack packages require base package (#227017)
+- Create xscreensaver metapackage
+
 * Mon Nov 20 2006 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.01-5
 - Require xorg-x11-resutils (#216245)