[xscreensaver] - From F-14+ (not for F-13), kill perl dependency on -base, move hack related files to -extras-bas

[Mamoru Tasaka]

commit 208fb328843c749bd0d457af241ad1667177ecf6
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Jan 16 02:22:30 2011 +0900

    - From F-14+ (not for F-13), kill perl dependency on -base, move
      hack related files to -extras-base (bug 668427)

 xscreensaver.spec |   49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 47 insertions(+), 2 deletions(-)
---
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 89aadd7..2cd124e 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -5,7 +5,12 @@
 
 
 %define modular_conf  1
-%define fedora_rel    9
+%define split_getimage   0
+%if 0%{?fedora} >= 14
+%define split_getimage   1
+%endif
+
+%define fedora_rel    10
 
 %undefine extrarel
 
@@ -127,18 +132,29 @@ BuildRequires:   fedora-release-notes
 Requires:        %{_sysconfdir}/pam.d/system-auth
 Requires:        pam > %{pam_ver}
 Requires:        xdg-utils
+%if ! %{split_getimage}
 Requires:        xorg-x11-resutils
+%endif
 Requires:        xorg-x11-fonts-ISO8859-1-100dpi
 %if 0%{?build_tests} < 1
 # Obsoletes but not Provides
 Obsoletes:       xscreeensaver-tests < %{epoch}:%{version}-%{release}
 %endif
 
+%package extras-base
+Summary:         A base package for screensavers
+Group:           Amusements/Graphics
+Requires:        %{name}-base = %{epoch}:%{version}-%{release}
+Requires:        xorg-x11-resutils
+
 %package extras
 Summary:         An enhanced set of screensavers
 Group:           Amusements/Graphics
 BuildRequires:   desktop-backgrounds-basic
 Requires:        %{name}-base = %{epoch}:%{version}-%{release}
+%if %{split_getimage}
+Requires:        %{name}-extras-base = %{epoch}:%{version}-%{release}
+%endif
 
 %package gl-base
 Summary:         A base package for screensavers that require OpenGL
@@ -157,6 +173,9 @@ Requires:        %{name}-gl-base = %{epoch}:%{version}-%{release}
 %else
 Requires:        %{name}-base = %{epoch}:%{version}-%{release}
 %endif
+%if %{split_getimage}
+Requires:        %{name}-extras-base = %{epoch}:%{version}-%{release}
+%endif
 
 %package extras-gss
 Summary:         Desktop files of extras for gnome-screensaver
@@ -202,6 +221,10 @@ Ce paquet contient le minimum vital pour éteindre et verouiller
 votre écran. Les modes d'affichages graphiques sont inclus
 dans les paquets "xscreensaver-extras" et "xscreensaver-gl-extras".
 
+%description extras-base
+This package contains common files to make screensaver hacks
+work for XScreenSaver.
+
 %description extras
 A modular screen saver and locker for the X Window System.
 This package contains a variety of graphical screen savers for
@@ -415,7 +438,6 @@ CONFIG_OPTS="$CONFIG_OPTS --with-browser=xdg-open"
 %if 0%{?fedora} >= 14
 pushd TMPBINDIR
 ln -sf /bin/true gdmflexiserver
-export PATH=$(pwd):$PATH
 popd
 %else
 CONFIG_OPTS="$CONFIG_OPTS --without-login-manager"
@@ -522,6 +544,20 @@ rm -f $dd/*.files
 (  cd hacks/glx ; list_files install ) >  $dd/gl-extras.files
 (  cd driver    ; list_files install ) >  $dd/base.files
 
+# Move xscreensaver-gettext-foo, xscreensaver-text to extras-base
+# (bug 668427)
+%if %{split_getimage}
+echo "%%defattr(-,root,root,-)" >> $dd/extras-base.files
+for target in \
+   /xscreensaver-getimage \
+   /xscreensaver-text
+do
+   grep -v $target $dd/base.files > $dd/base.files.new
+   grep $target $dd/base.files >> $dd/extras-base.files
+   mv $dd/base.files{.new,}
+done
+%endif
+
 # Move %%{_bindir}/xscreensaver-gl-helper to gl-base
 # (bug 336331).
 %if %{modular_conf}
@@ -742,6 +778,11 @@ exit 0
 %defattr(-,root,root,-)
 %endif
 
+%if %{split_getimage}
+%files -f extras-base.files extras-base
+%defattr(-,root,root,-)
+%endif
+
 %files -f extras.files extras
 %defattr(-,root,root,-)
 
@@ -760,6 +801,10 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Jan 11 2011 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-10
+- From F-14+ (not for F-13), kill perl dependency on -base, move
+  hack related files to -extras-base (bug 668427)
+
 * Sun Jan  2 2011 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-9
 - Fix one-byte ahead access on apple2.c (may fix 666643)