-Name: xscreensaver
-Summary: X screen saver and locker
-Vendor: Jamie Zawinski <jwz@jwz.org>
-Version: 3.20
-Release: 1
-URL: http://www.jwz.org/xscreensaver/
-Source: xscreensaver-%{version}.tar.gz
-Copyright: BSD
-Group: X11/Utilities
-Buildroot: /var/tmp/xscreensaver-root
+%define name xscreensaver
+%define version 4.21
+
+Summary: X screen saver and locker
+Name: %{name}
+Version: %{version}
+Release: 1
+Epoch: 1
+License: BSD
+Group: Amusements/Graphics
+URL: http://www.jwz.org/xscreensaver/
+Source0: http://www.jwz.org/xscreensaver/xscreensaver-%{version}.tar.gz
+Vendor: Jamie Zawinski <jwz@jwz.org>
+Buildroot: %{_tmppath}/%{name}-root
+
+%package base
+Summary: A minimal installation of xscreensaver.
+Group: Amusements/Graphics
+BuildPrereq: bc, pam-devel, xorg-x11-devel
+BuildPrereq: gtk2-devel libglade2-devel
+Requires: /etc/pam.d/system-auth, htmlview, desktop-backgrounds-basic
+Provides: xscreensaver
+Provides: xscreensaver-base
+Obsoletes: xscreensaver
+
+%package extras
+Summary: An enhanced set of screensavers.
+Group: Amusements/Graphics
+Requires: xscreensaver-base
+
+%package gl-extras
+Summary: An enhanced set of screensavers that require OpenGL.
+Group: Amusements/Graphics
+Requires: xscreensaver-base
+Obsoletes: xscreensaver-gl