rpms/xscreensaver/devel xscreensaver.spec,1.50,1.51

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

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

Modified Files:
	xscreensaver.spec 
Log Message:
Some cleanup.


Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xscreensaver.spec	19 Sep 2007 03:15:15 -0000	1.50
+++ xscreensaver.spec	23 Sep 2007 07:39:34 -0000	1.51
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    7
+%define fedora_rel    8
 %endif
 
 %define extrarel      %{nil}
@@ -45,45 +45,50 @@
 %package base
 Summary:         A minimal installation of xscreensaver
 Group:           Amusements/Graphics
-BuildRequires:   gettext
-BuildRequires:   desktop-file-utils
-BuildRequires:   sed
-BuildRequires:   libtool
 BuildRequires:   bc
+BuildRequires:   desktop-file-utils
 BuildRequires:   gawk
+BuildRequires:   gettext
+BuildRequires:   libtool
 BuildRequires:   pam-devel > %{pam_ver}
+BuildRequires:   sed
 BuildRequires:   xorg-x11-proto-devel
-BuildRequires:   libX11-devel, libXScrnSaver-devel, libXext-devel
+BuildRequires:   libX11-devel
+BuildRequires:   libXScrnSaver-devel
+BuildRequires:   libXext-devel
 BuildRequires:   libXinerama-devel
 BuildRequires:   libXmu-devel
 BuildRequires:   libXpm-devel
 BuildRequires:   libXt-devel
 BuildRequires:   libXxf86misc-devel
 BuildRequires:   libXxf86vm-devel
+BuildRequires:   gtk2-devel	
 BuildRequires:   libjpeg-devel
-BuildRequires:   gtk2-devel libglade2-devel
+BuildRequires:   libglade2-devel
 %if 0%{?fedora} >= 7
 BuildRequires:   fedora-release-notes
 %else
 BuildRequires:   fedora-release
 %endif
-Requires:        /etc/pam.d/system-auth
+Requires:        %{_sysconfdir}/pam.d/system-auth
 Requires:        pam > %{pam_ver}
 Requires:        xorg-x11-resutils
+Requires:        xorg-x11-fonts-ISO8859-1-100dpi
 
 %package extras
 Summary:         An enhanced set of screensavers
 Group:           Amusements/Graphics
 BuildRequires:   desktop-backgrounds-basic
-Requires:        xscreensaver-base
+Requires:        %{name}-base = %{epoch}:%{version}-%{release}
 
 %package gl-extras
 Summary:         An enhanced set of screensavers that require OpenGL
 Group:           Amusements/Graphics
 Provides:        xscreensaver-gl = %{epoch}:%{version}-%{release}
-Obsoletes:       xscreensaver-gl
-BuildRequires:   libGLU-devel, libGL-devel
-Requires:        xscreensaver-base
+Obsoletes:       xscreensaver-gl <= 1:5.00
+BuildRequires:   libGL-devel
+BuildRequires:   libGLU-devel
+Requires:        %{name}-base = %{epoch}:%{version}-%{release}
 
 %package extras-gss
 Summary:         Desktop files of extras for gnome-screensaver
@@ -447,7 +452,7 @@
    echo "Exec=$COMMAND $ARG" >> $2
    echo "StartupNotify=false" >> $2
    echo "Type=Application" >> $2
-   echo "Categories=Screensaver" >> $2
+   echo "Categories=GNOME;Screensaver;" >> $2
 }
 
 cd $dd
@@ -510,6 +515,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Sep 23 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Some cleanup.
+
 * Wed Sep 19 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-7
 - Remove noreplace flag from XScreenSaver.ad as this is updated
   automatically.