X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xscreensaver.spec;h=a7280bfeccf7f56ceac75a290c221f770f790855;hb=5832fe184606766fef23369159306c0a5799aeb0;hp=610bda51782772ec44b9cebd53c1694e1930e8b1;hpb=278c59e14c53fd412b734e699bd4f314f766f804;p=xscreensaver

diff --git a/xscreensaver.spec b/xscreensaver.spec
index 610bda51..a7280bfe 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.12
+Version: 3.18
 Release: 1
 URL: http://www.jwz.org/xscreensaver/
 Source: xscreensaver-%{version}.tar.gz
@@ -13,7 +13,7 @@ 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 90 display modes are included in this package.
+More than 100 display modes are included in this package.
 
 %prep
 
@@ -23,7 +23,7 @@ More than 90 display modes are included in this package.
 
 ./configure --prefix=/usr/X11R6 \
      --enable-subdir=/usr/X11R6/lib/xscreensaver
-make
+make all
 
 %install
 
@@ -49,6 +49,27 @@ 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-Xaw3d ]; then target=Xaw3d; fi
+    if [ -x xscreensaver-demo-Xaw   ]; then target=Xaw;   fi
+    if [ -x xscreensaver-demo-Gtk   ]; then target=Gtk;   fi
+    if [ -x xscreensaver-demo-Xm    ]; then target=Xm;    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