X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xscreensaver.spec;h=63a1ad84dc40a52477c2be47104772798e63a81a;hb=72c1f4c1dc6ab07fe121a327ff1c30bf51ef74c1;hp=89dd6d9191b9a9abbbc948df540397619fe052d3;hpb=f65151994eba80ecabcdac6eef6fa0dde7e2d45b;p=xscreensaver

diff --git a/xscreensaver.spec b/xscreensaver.spec
index 89dd6d91..63a1ad84 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.06
+Version: 3.20
 Release: 1
 URL: http://www.jwz.org/xscreensaver/
 Source: xscreensaver-%{version}.tar.gz
@@ -13,22 +13,28 @@ Buildroot: /var/tmp/xscreensaver-root
 A modular screen saver and locker for the X Window System.
 Highly customizable: allows the use of any program that
 can draw on the root window as a display mode.
-More than 80 display modes are included in this package.
+More than 100 display modes are included in this package.
 
 %prep
+
 %setup -q
 
 %build
-./configure --prefix=/usr/X11R6
-make
+
+./configure --prefix=/usr/X11R6 \
+     --enable-subdir=/usr/X11R6/lib/xscreensaver
+make all
 
 %install
-mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
-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 \
      PAM_DIR=$RPM_BUILD_ROOT/etc/pam.d \
      install-strip
 
@@ -43,6 +49,30 @@ install -m 4755 driver/xscreensaver $RPM_BUILD_ROOT/usr/X11R6/bin
 #
 ( cd driver; make PAM_DIR=$RPM_BUILD_ROOT/etc/pam.d install-pam )
 
+# If we built multiple versions of xscreensaver-demo (because multiple
+# toolkits were available) then install them all.
+#
+( cd driver;
+  exes=`echo xscreensaver-demo-*`
+  count=`echo $exes | wc -w`
+  if [ $count -gt 1 ]; then
+    for exe in $exes; do
+      install -c -s $exe $RPM_BUILD_ROOT/usr/X11R6/bin
+    done
+    cd $RPM_BUILD_ROOT/usr/X11R6/bin
+    if [ -x xscreensaver-demo-Xaw   ]; then target=Xaw;   fi
+    if [ -x xscreensaver-demo-Xaw3d ]; then target=Xaw3d; fi
+    if [ -x xscreensaver-demo-Xm    ]; then target=Xm;    fi
+    if [ -x xscreensaver-demo-Gtk   ]; then target=Gtk;   fi
+    rm -f xscreensaver-demo
+    ln -s xscreensaver-demo-$target xscreensaver-demo
+  fi
+ )
+
+
+# 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"
@@ -50,13 +80,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/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/*"