rpms/rss-glx/FC-5 rss-glx.spec,1.3,1.4

[Nils Philippsen (nphilipp)]

Author: nphilipp

Update of /cvs/extras/rpms/rss-glx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32637

Modified Files:
	rss-glx.spec 
Log Message:
don't install world-writable documentation files (#200843)
require libtool for building
move gnome-screensaver desktop files to match new location in FC6 (#194862)



Index: rss-glx.spec
===================================================================
RCS file: /cvs/extras/rpms/rss-glx/FC-5/rss-glx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rss-glx.spec	2 Jun 2006 10:35:05 -0000	1.3
+++ rss-glx.spec	1 Aug 2006 12:13:05 -0000	1.4
@@ -1,6 +1,5 @@
 %define xssconfigdir %{_datadir}/xscreensaver/config
 %define xssbindir %{_libexecdir}/xscreensaver
-%define gssconfigdir %{_datadir}/gnome-screensaver/themes
 %define gssbindir %{_libexecdir}/gnome-screensaver
 %define kdessconfigdir %{_datadir}/applnk/System/ScreenSavers
 
@@ -8,13 +7,20 @@
 %if "%{fedora}" <= "4"
 %define modular_x 0%{?_with_modular_x:1}
 %define gss 0
+%define _gssconfigdir %{nil}
 %else
 %define modular_x 0%{!?_without_modular_x:1}
 %define gss 1
+%if "%{fedora}" <= "5"
+%define _gssconfigdir %{!?gssconfigdir:%{_datadir}/gnome-screensaver/themes}%{?gssconfigdir}
+%else
+%define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
+%endif
 %endif
 %else
 %define modular_x 0%{?!_without_modular_x:1}
 %define gss 0%{?!_without_gss:1}
+%define _gssconfigdir %{!?gssconfigdir:%{_datadir}/applications/screensavers}%{?gssconfigdir}
 %endif
 
 %define with_matrixview 0%{?_with_matrixview:1}
@@ -23,7 +29,7 @@
 Summary: Really Slick Screensavers
 Name: rss-glx
 Version: 0.8.1%{patchext}
-Release: 2%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Amusements/Graphics
 URL: http://rss-glx.sourceforge.net/
@@ -51,6 +57,7 @@
 BuildRequires: openal-devel
 BuildRequires: freealut-devel
 BuildRequires: autoconf
+BuildRequires: libtool
 
 %description
 A port of the Really Slick Screensavers to GLX. Provides several visually
@@ -109,7 +116,8 @@
 - with monolithic X
 %endif
 %if %gss
-- with gnome-screensaver support
+- with gnome-screensaver support,
+  theme directory: %{_gssconfigdir}
 %else
 - without gnome-screensaver support
 %endif
@@ -146,7 +154,7 @@
         # generate GNOME screensaver desktop files
 		eval $(echo "$line" | awk -F§ '{print "name=\"" $1 "\"; cmd=\"" $2 "\"; desc=\"" $3 "\""}')
 		trycmd="${cmd%%%% *}"
-		cat << EOF > %{buildroot}%{gssconfigdir}/rss-glx-${cmd}.desktop
+		cat << EOF > %{buildroot}%{_gssconfigdir}/rss-glx-${cmd}.desktop
 
 [Desktop Entry]
 Encoding=UTF-8
@@ -173,11 +181,11 @@
 }
 
 rm -rf %buildroot
-cp -dpf "%SOURCE1" "%SOURCE2" "%SOURCE3" .
+install -m 0644 "%SOURCE1" "%SOURCE2" "%SOURCE3" .
 make DESTDIR=%{buildroot} install
 rm -f %{buildroot}%{_libdir}/lib*.{,l}a %{buildroot}%{_bindir}/rss-glx_install.pl
 %if %gss
-mkdir -p %{buildroot}%{gssconfigdir}
+mkdir -p %{buildroot}%{_gssconfigdir}
 mkdir -p %{buildroot}%{gssbindir}
 mkdir -p %{buildroot}%{xssbindir}
 %endif
@@ -225,8 +233,8 @@
 %if %gss
 %files gnome-screensaver
 %defattr(-, root, root)
-%dir %{gssconfigdir}
-%{gssconfigdir}/*.desktop
+%dir %{_gssconfigdir}
+%{_gssconfigdir}/*.desktop
 %dir %{gssbindir}
 %{gssbindir}/*
 %endif
@@ -237,6 +245,15 @@
 %{kdessconfigdir}/*.desktop
 
 %changelog
+* Tue Aug 01 2006 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-5
+- don't install world-writable documentation files (#200843)
+
+* Mon Jul 24 2006 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-4
+- require libtool for building
+
+* Mon Jun 12 2006 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-3
+- move gnome-screensaver desktop files to match new location in FC6 (#194862)
+
 * Fri Jun 02 2006 Nils Philippsen <nphilipp at redhat.com> 0.8.1.p-2
 - replace symlinked source files with copies to work around #189928
 - honour RPM optflags