rpms/xscreensaver/devel xscreensaver.spec,1.56,1.57
Mamoru Tasaka (mtasaka)
fedora-extras-commits at redhat.com
Fri Oct 19 11:47:26 UTC 2007
Author: mtasaka
Update of /cvs/extras/rpms/xscreensaver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17066/devel
Modified Files:
xscreensaver.spec
Log Message:
* Thu Oct 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-12
- Create -gl-base subpackage and split xscreensaver-gl-helper
into -gl-base subpackage so that external GL screensavers can
use it (bug 336331)
Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/devel/xscreensaver.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- xscreensaver.spec 15 Oct 2007 15:32:00 -0000 1.56
+++ xscreensaver.spec 19 Oct 2007 11:46:53 -0000 1.57
@@ -7,7 +7,7 @@
%define fedora_rel 1.1
%else
%define modular_conf 1
-%define fedora_rel 11
+%define fedora_rel 12
%endif
%define extrarel %{nil}
@@ -85,6 +85,11 @@
BuildRequires: desktop-backgrounds-basic
Requires: %{name}-base = %{epoch}:%{version}-%{release}
+%package gl-base
+Summary: A base package for screensavers that require OpenGL
+Group: Amusements/Graphics
+Requires: %{name}-base = %{epoch}:%{version}-%{release}
+
%package gl-extras
Summary: An enhanced set of screensavers that require OpenGL
Group: Amusements/Graphics
@@ -92,7 +97,7 @@
Obsoletes: xscreensaver-gl <= 1:5.00
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
-Requires: %{name}-base = %{epoch}:%{version}-%{release}
+Requires: %{name}-gl-base = %{epoch}:%{version}-%{release}
%package extras-gss
Summary: Desktop files of extras for gnome-screensaver
@@ -144,6 +149,11 @@
Ce paquet contient une pléthore d'économiseurs d'écran graphiques
pour votre plaisir des yeux.
+%description gl-base
+A modular screen saver and locker for the X Window System.
+This package contains minimal files to make screensaver hacks
+that require OpenGL work for XScreenSaver.
+
%description gl-extras
A modular screen saver and locker for the X Window System.
This package contains a variety of OpenGL-based (3D) screen
@@ -374,6 +384,18 @@
( cd hacks/glx ; list_files install ) > $dd/gl-extras.files
( cd driver ; list_files install ) > $dd/base.files
+# Move %%{_bindir}/xscreensaver-gl-helper to gl-base
+# (bug 336331).
+echo "%%defattr(-,root,root,-)" >> $dd/gl-base.files
+
+sed -i -e '/xscreensaver-gl-helper/d' $dd/gl-extras.files
+pushd $RPM_BUILD_ROOT
+for dir in `find . -name \*xscreensaver-gl-helper\*` ; do
+ echo "${dir#.}" >> $dd/gl-base.files
+done
+popd
+sed -i -e 's|^\(%{_mandir}.*\)$|\1*|' $dd/gl-base.files
+
%if %{modular_conf}
# install update script
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
@@ -521,6 +543,9 @@
%files -f extras.files extras
%defattr(-,root,root,-)
+%files -f gl-base.files gl-base
+%defattr(-,root,root,-)
+
%files -f gl-extras.files gl-extras
%defattr(-,root,root,-)
@@ -531,12 +556,17 @@
%defattr(-,root,root,-)
%changelog
+* Thu Oct 18 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-12
+- Create -gl-base subpackage and split xscreensaver-gl-helper
+ into -gl-base subpackage so that external GL screensavers can
+ use it (bug 336331)
+
* Mon Oct 15 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-11
- Suppress compiler warning
* Sat Oct 6 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-10
- Fix the maximum value on demo configuration dialog
-- Change the encoding of XScreenSaver.ad and man files
+- Change the encoding of XScreenSaver.ad and man files (bug 319101)
* Tue Oct 2 2007 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.03-9
- Change the default browser to xdg-open
More information about the fedora-extras-commits
mailing list