X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=xscreensaver.spec;h=0542d3fdd3bc8a68fd56207c609e4057420d9b2f;hp=bf5b664952ba9b0905b77bba63644e1ed67f6a74;hb=59ac4e9a0de290e4275a7bbb890ad16abd09d68f;hpb=f54438ea00f152166e68073e98000fd3a00f65cd

diff --git a/xscreensaver.spec b/xscreensaver.spec
index bf5b6649..0542d3fd 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,7 +1,7 @@
 Name: xscreensaver
 Summary: X screen saver and locker
 Vendor: Jamie Zawinski <jwz@jwz.org>
-Version: 3.07
+Version: 3.08
 Release: 1
 URL: http://www.jwz.org/xscreensaver/
 Source: xscreensaver-%{version}.tar.gz
@@ -16,7 +16,9 @@ can draw on the root window as a display mode.
 More than 80 display modes are included in this package.
 
 %prep
+
 %setup -q
+
 %build
 
 ./configure --prefix=/usr/X11R6 \
@@ -25,11 +27,11 @@ make
 
 %install
 
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/xscreensaver
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/man/man1
-mkdir -p $RPM_BUILD_ROOT/etc/X11/wmconfig
+# This is the only directory that "make install" won't make as needed
+# (since Linux uses /etc/pam.d/* and Solaris uses /etc/pam.conf).
+#
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
+
 make  prefix=$RPM_BUILD_ROOT/usr/X11R6 \
       AD_DIR=$RPM_BUILD_ROOT/usr/X11R6/lib/X11/app-defaults \
      HACKDIR=$RPM_BUILD_ROOT/usr/X11R6/lib/xscreensaver \
@@ -47,6 +49,9 @@ install -m 4755 driver/xscreensaver $RPM_BUILD_ROOT/usr/X11R6/bin
 #
 ( cd driver; make PAM_DIR=$RPM_BUILD_ROOT/etc/pam.d install-pam )
 
+# This is for wmconfig, a tool that generates init files for window managers.
+#
+mkdir -p $RPM_BUILD_ROOT/etc/X11/wmconfig
 cat > $RPM_BUILD_ROOT/etc/X11/wmconfig/xscreensaver <<EOF
 xscreensaver name "xscreensaver (1min timeout)"
 xscreensaver description "xscreensaver"
@@ -54,14 +59,31 @@ xscreensaver group "Amusements/Screen Savers"
 xscreensaver exec "xscreensaver -timeout 1 -cycle 1 &"
 EOF
 
+# This is for the GNOME desktop:
+#
+mkdir -p "$RPM_BUILD_ROOT/usr/share/apps/Amusements/Screen Savers"
+cat > "$RPM_BUILD_ROOT/usr/share/apps/Amusements/Screen Savers/xscreensaver.desktop" <<EOF
+[Desktop Entry]
+Name=xscreensaver (1min timeout)
+Description=xscreensaver
+Exec=xscreensaver -timeout 1 -cycle 1
+EOF
+
+# Make sure all files are readable by all, and writable only by owner.
+#
+chmod -R a+r,u+w,og-w $RPM_BUILD_ROOT
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-/usr/X11R6/bin/*
-/usr/X11R6/lib/xscreensaver/*
-%config /usr/X11R6/lib/X11/app-defaults/*
-/usr/X11R6/man/man1/*
-%config(missingok) /etc/X11/wmconfig/*
-%config(missingok) /etc/pam.d/*
+
+%doc                README README.debugging
+                    /usr/X11R6/bin/*
+                    /usr/X11R6/lib/xscreensaver/*
+%config             /usr/X11R6/lib/X11/app-defaults/*
+                    /usr/X11R6/man/man1/*
+                    /etc/pam.d/*
+%config(missingok)  /etc/X11/wmconfig/*
+%config(missingok)  "/usr/share/apps/Amusements/Screen Savers/*"