X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xscreensaver.spec;h=2f95d91f431d3d2a2be64badf4538d5b813da954;hb=2d04c4f22466851aedb6ed0f2919d148f726b889;hp=088bacbc1f453d06322272c036a044d984777d4d;hpb=13dbc569cdc6e29019722c0ef9b932a925efbcad;p=xscreensaver

diff --git a/xscreensaver.spec b/xscreensaver.spec
index 088bacbc..2f95d91f 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,10 +1,9 @@
 %define	name		xscreensaver
-%define	version		4.04
+%define	version		4.20
 %define	release		1
-%define	serial		1
+%define	epoch		1
 %define	x11_prefix	/usr/X11R6
 %define	gnome_prefix	/usr
-%define	kde_prefix	/usr
 %define gnome_datadir	%{gnome_prefix}/share
 
 # By default, builds the basic, non-GL package.
@@ -14,13 +13,14 @@
 # %define	USE_GL		yes
 
 Summary:	X screen saver and locker
+Summary(fr):	Economiseur d'écran et verrouillage de terminaux X
 Name:		%{name}
 Version:	%{version}
 Release:	%{release}
-Serial:		%{serial}
+Epoch:		%{epoch}
 Group:		Amusements/Graphics
-Copyright:	BSD
-URL:		http://www.jwz.org/xscreensaver
+License:	BSD
+URL:		http://www.jwz.org/xscreensaver/
 Vendor:		Jamie Zawinski <jwz@jwz.org>
 Source:		%{name}-%{version}.tar.gz
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
@@ -33,14 +33,23 @@ Buildroot:	%{_tmppath}/%{name}-%{version}-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 140 display modes are included in this package.
+More than 190 display modes are included in this package.
 %{?USE_GL:See also the xscreensaver-gl package, which}
 %{?USE_GL:includes optional OpenGL display modes.}
 
+%description -l fr
+Un économiseur d'écran et verrouillage modulaire pour X-Window.
+Hautement configurable: permet l'utilisation de n'importe quel programme
+qui peut dessiner dans la fenêtre root.
+Plus de 190 modes d'affichage sont inclus dans ce paquet.
+%{?USE_GL:Voir aussi le paquet xscreensaver-gl, qui inclut}
+%{?USE_GL:des modules optionnels OpenGL.}
+
 %{?USE_GL:%package gl}
 %{?USE_GL:Group:	Amusements/Graphics}
-%{?USE_GL:Requires:	xscreensaver = %{version}}
+%{?USE_GL:Requires:     xscreensaver = %{epoch}:%{version}-%{release}}
 %{?USE_GL:Summary:	A set of GL screensavers}
+%{?USE_GL:Summary(fr):	Un ensemble d'économiseurs d'écran OpenGL}
 %{?USE_GL:%description gl}
 %{?USE_GL:The xscreensaver-gl package contains even more screensavers for your}
 %{?USE_GL:mind-numbing, ambition-eroding, time-wasting, hypnotized viewing}
@@ -49,6 +58,13 @@ More than 140 display modes are included in this package.
 %{?USE_GL:Install the xscreensaver-gl package if you need more screensavers}
 %{?USE_GL:for use with the X Window System and you have OpenGL or Mesa}
 %{?USE_GL:installed.}
+%{?USE_GL:%description -l fr gl}
+%{?USE_GL:Le paquet xscreensaver-gl contient encore plus d'économiseurs}
+%{?USE_GL:d'écran pour votre plaisir visuel.}
+%{?USE_GL: }
+%{?USE_GL:Ces économiseurs d'écran nécessitent OpenGL ou Mesa.}
+%{?USE_GL:Installez le paquet xscreensaver-gl si vous désirez plus}
+%{?USE_GL:d'économiseur d'écran et que vous avez OpenGL ou Mesa installé.}
 
 %prep
 %setup -q
@@ -84,8 +100,6 @@ archdir=`./config.guess`
 # We have to make sure these directories exist,
 # or nothing will be installed into them.
 #
-export KDEDIR=%{kde_prefix}
-mkdir -p $RPM_BUILD_ROOT$KDEDIR/bin
 mkdir -p $RPM_BUILD_ROOT%{gnome_datadir}
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 
@@ -110,13 +124,12 @@ list_files() {
 }
 
 # Collect the names of the non-GL executables and scripts...
-# (Including the names of all of the Gnome, KDE, and L10N-related files,
+# (Including the names of all of the Gnome and L10N-related files,
 # whereever they might have gotten installed...)
 # For the translation catalogs, prepend an appropriate %lang(..) tag.
 #
 (  cd    hacks ; list_files install ; \
-   cd ../driver; list_files install-program install-scripts \
-                            install-gnome install-kde ; \
+   cd ../driver; list_files install-program install-scripts install-gnome ; \
  ( cd ../po;     list_files install | grep '\.' \
     | sed 's@^\(.*/\([^/]*\)/LC.*\)$@%lang(\2) \1@' ) \
 ) > $RPM_BUILD_DIR/xscreensaver-%{version}/exes-non-gl
@@ -147,7 +160,7 @@ 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`
+pids=`/sbin/pidof xscreensaver`
 if [ -n "$pids" ]; then
   echo "sending SIGHUP to running xscreensaver ($pids)..." >&2
   kill -HUP $pids