X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xscreensaver.spec;h=6d7a6cb1fe6b6781b4b02986cf1e178701a48548;hb=a94197e76a5dea5cb60542840809d6c20d0abbf3;hp=4cac483c84753800e051c5c9f1a9cca68a7a111b;hpb=3d9140a05b5272fed0883a0af0a71e30ef44d47f;p=xscreensaver diff --git a/xscreensaver.spec b/xscreensaver.spec index 4cac483c..6d7a6cb1 100644 --- a/xscreensaver.spec +++ b/xscreensaver.spec @@ -1,12 +1,22 @@ -%define name xscreensaver -%define version 3.29 -%define release 1 -%define serial 1 -%define prefix /usr/X11R6 +%define name xscreensaver +%define version 4.01 +%define release 1 +%define serial 1 +%define x11_prefix /usr/X11R6 +%define gnome_prefix /usr +%define kde_prefix /usr + +%define gnome_datadir %{gnome_prefix}/share +%define gnome_ccdir_1 %{gnome_datadir}/control-center/Desktop +%define gnome_ccdir_2 %{gnome_datadir}/control-center/capplets +%define gnome_paneldir %{gnome_datadir}/gnome/apps/Settings/Desktop +%define gnome_icondir %{gnome_datadir}/pixmaps # By default, builds the basic, non-GL package. # To build both the basic and GL-add-on packages: # rpm --define "USE_GL yes" ... +# or uncomment the following line. +# %define USE_GL yes Summary: X screen saver and locker Name: %{name} @@ -18,13 +28,17 @@ Copyright: BSD URL: http://www.jwz.org/xscreensaver Vendor: Jamie Zawinski Source: %{name}-%{version}.tar.gz -Buildroot: /var/tmp/%{name}-%{version}-root +Buildroot: %{_tmppath}/%{name}-%{version}-root + +# This package really should be made to depend on +# control-center >= 1.4.0.2 -OR- control-center >= 1.5.12 +# but there's no way to express that. %description 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 100 display modes are included in this package. +More than 140 display modes are included in this package. %{?USE_GL:See also the xscreensaver-gl package, which} %{?USE_GL:includes optional OpenGL display modes.} @@ -65,59 +79,66 @@ RPMOPTS="" %{!?USE_GL:RPMOPTS="$RPMOPTS --without-gl"} CFLAGS="$RPM_OPT_FLAGS" \ - ./configure --prefix=%{prefix} \ - --enable-subdir=../lib/xscreensaver \ + ./configure --prefix=%{x11_prefix} \ + --with-setuid-hacks \ $RPMOPTS make %install -# This is a directory that "make install" won't make as needed -# (since Linux uses /etc/pam.d/* and Solaris uses /etc/pam.conf). +# Most xscreensaver executables go in the X bin directory (/usr/X11R6/bin/) +# but some of them (e.g., the control panel capplet) go in the GNOME bin +# directory instead (/usr/bin/). # -mkdir -p $RPM_BUILD_ROOT/etc/pam.d +mkdir -p $RPM_BUILD_ROOT%{gnome_prefix}/bin +mkdir -p $RPM_BUILD_ROOT%{gnome_ccdir_1} +mkdir -p $RPM_BUILD_ROOT%{gnome_ccdir_2} +mkdir -p $RPM_BUILD_ROOT%{gnome_paneldir} -# This is another (since "make install" doesn't try to install -# the xscreensaver.kss file unless $KDEDIR is set.) +# Likewise for KDE: the .kss file goes in the KDE bin directory (/usr/bin/). # -if [ -z "$KDEDIR" ]; then export KDEDIR=/usr; fi +export KDEDIR=%{kde_prefix} mkdir -p $RPM_BUILD_ROOT$KDEDIR/bin -# And two more for Gnome (same reason...) +# This is a 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/usr/share/control-center/Desktop -mkdir -p $RPM_BUILD_ROOT/usr/share/gnome/apps/Settings/Desktop +mkdir -p $RPM_BUILD_ROOT/etc/pam.d make install_prefix=$RPM_BUILD_ROOT \ - AD_DIR=%{prefix}/lib/X11/app-defaults \ + AD_DIR=%{x11_prefix}/lib/X11/app-defaults \ + GNOME_BINDIR=%{gnome_prefix}/bin \ install-strip -# Make a pair of lists, of the GL and non-GL executable. +# Make a pair of lists, of the GL and non-GL executables. # Do this by parsing the output of a dummy run of "make install" # in the driver/, hacks/ and hacks/glx/ directories. # list_files() { - make -s install_prefix=$RPM_BUILD_ROOT INSTALL=true $1 | - sed -n -e 's@.* /\([^ ]*\)$@/\1@p' | - sed -e "s@^$RPM_BUILD_ROOT@@" \ - -e "s@/bin/\.\./@/@" | - sed -e 's@\(.*/man/.*\)@\1\*@' | + make -s install_prefix=$RPM_BUILD_ROOT INSTALL=true \ + GNOME_BINDIR=%{gnome_prefix}/bin \ + "$@" | + sed -n -e 's@.* /\([^ ]*\)$@/\1@p' | + sed -e "s@^$RPM_BUILD_ROOT@@" \ + -e "s@/bin/\.\./@/@" | + sed -e 's@\(.*/man/.*\)@\1\*@' | sort } -( cd hacks ; list_files install ; cd ../driver; list_files install-program ) \ +( cd hacks ; list_files install ; \ + cd ../driver; list_files install-program install-scripts ) \ > $RPM_BUILD_DIR/xscreensaver-%{version}/exes-non-gl ( cd hacks/glx ; list_files install ) \ + | grep -v man1/xscreensaver-gl-helper \ > $RPM_BUILD_DIR/xscreensaver-%{version}/exes-gl - # This line is redundant, except that it causes the "xscreensaver" # executable to be installed unstripped (while all others are stripped.) # You should install it this way so that jwz gets useful bug reports. # -install -m 4755 driver/xscreensaver $RPM_BUILD_ROOT%{prefix}/bin +install -m 4755 driver/xscreensaver $RPM_BUILD_ROOT%{x11_prefix}/bin # Even if we weren't compiled with PAM support, make sure to include # the PAM module file in the RPM anyway, just in case. @@ -129,6 +150,15 @@ install -m 4755 driver/xscreensaver $RPM_BUILD_ROOT%{prefix}/bin # chmod -R a+r,u+w,og-w $RPM_BUILD_ROOT +%post +# This part runs on the end user's system, when the RPM is installed. + +pids=`pidof xscreensaver` +if [ -n "$pids" ]; then + echo "sending SIGHUP to running xscreensaver ($pids)..." >&2 + kill -HUP $pids +fi + %clean if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT ; fi if [ -d $RPM_BUILD_ROOT-gl ]; then rm -r $RPM_BUILD_ROOT-gl ; fi @@ -139,14 +169,18 @@ if [ -d $RPM_BUILD_ROOT-gl ]; then rm -r $RPM_BUILD_ROOT-gl ; fi # Files for the "xscreensaver" package: # %doc README README.debugging -%dir %{prefix}/lib/xscreensaver -%config %{prefix}/lib/X11/app-defaults/* - %{prefix}/man/man1/xscreensaver* +%dir %{x11_prefix}/lib/xscreensaver +%config %{x11_prefix}/lib/X11/app-defaults/* + %{x11_prefix}/man/man1/xscreensaver* /etc/pam.d/* -%config(missingok) /usr/bin/*.kss -%config(missingok) /usr/share/control-center/Desktop/screensaver-properties.desktop -%config(missingok) /usr/share/gnome/apps/Settings/Desktop/screensaver-properties.desktop -%config(missingok) /usr/share/pixmaps/* + +%config(missingok) %{kde_prefix}/bin/*.kss + +%config(missingok) %{gnome_prefix}/bin/*-capplet +%config(missingok) %{gnome_ccdir_1}/*.desktop +%config(missingok) %{gnome_ccdir_2}/*.desktop +%config(missingok) %{gnome_paneldir}/*.desktop +%config(missingok) %{gnome_icondir}/* # Files for the "xscreensaver-gl" package: #