Author: havner Date: Fri Aug 4 19:44:12 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- drop unused fix-launch-with-kde patch (already in upstream)
- base subpackage with hacks (it may be required for kde or gnome
screensavers (xscreensaver app is not needed then)
- description cleanups
- no shadow support (we dont set setuid so it doesn't work anyway, pam is
enough)
- install/files fix ups (dont double package some files, put xml files
where they belong, proper perms for man pages)
---- Files affected:
SPECS:
xscreensaver.spec (1.140 -> 1.141)
---- Diffs:
================================================================
Index: SPECS/xscreensaver.spec
diff -u SPECS/xscreensaver.spec:1.140 SPECS/xscreensaver.spec:1.141
--- SPECS/xscreensaver.spec:1.140 Thu Feb 9 19:12:27 2006
+++ SPECS/xscreensaver.spec Fri Aug 4 21:44:07 2006
@@ -25,9 +25,8 @@
Source4: mkinstalldirs
Patch0: %{name}-locale-names.patch
Patch1: %{name}-desktop.patch
-Patch2: %{name}-fix-launch-with-kde.patch
-Patch3: %{name}-man.patch
-Patch4: %{name}-degnomify.patch
+Patch2: %{name}-man.patch
+Patch3: %{name}-degnomify.patch
URL: http://www.jwz.org/xscreensaver/
BuildRequires: OpenGL-devel
BuildRequires: autoconf
@@ -46,6 +45,7 @@
BuildRequires: pkgconfig
Requires: pam >= 0.77.3
Requires: perl-perldoc
+Requires: %{name}-savers = %{epoch}:%{version}-%{release}
Obsoletes: xscreensaver-gnome
Obsoletes: xscreensaver-gnome1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -95,23 +95,29 @@
%description -l uk
đÁËĹÔ xscreensaver ÍŚÓÔÉÔŘ ŇŚÚÎĎÍÁÎŚÔÎŚ ĐŇĎÇŇÁÍÉ ÚÂĹŇĹÖĹÎÎŃ ĹËŇÁÎŐ.
+%package base
+Summary: Base X screen savers
+Summary(pl): Podstawowe wygaszacze ekranu pod X Window
+Group: X11/Applications
+Provides: %{name}-savers = %{epoch}:%{version}-%{release}
+
+%description base
+Base screen savers for X Window.
+
+%description base -l pl
+Podstawowe wygaszacze ekranu pod X Window.
+
%package GL
Summary: OpenGL X screen savers
-Summary(es): A set of GL screensavers
Summary(pl): Wygaszacze ekranu pod X Window używające OpenGL
Summary(pt_BR): Protetores de tela GL
Group: X11/Applications
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Provides: %{name}-savers = %{epoch}:%{version}-%{release}
Requires: OpenGL
%description GL
Screen savers which uses OpenGL libraries.
-%description GL -l es
-The xscreensaver-gl package contains even more screensavers for your
-mind-numbing, ambition-eroding, time-wasting, hypnotized viewing
-pleasure. These screensavers require OpenGL or Mesa support.
-
%description GL -l pl
Wygaszacze ekranu pod X Window używające OpenGL.
@@ -122,7 +128,9 @@
Summary: OpenGL && GLE X screen savers
Summary(pl): Wygaszacze ekranu pod X Window używające OpenGL && GLE
Group: X11/Applications
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Provides: %{name}-savers = %{epoch}:%{version}-%{release}
+# for gl-helper:
+Requires: %{name}-GL = %{epoch}:%{version}-%{release}
%description GLE
Screen savers which uses OpenGL and GLE libraries.
@@ -147,9 +155,8 @@
%setup -q
%patch0 -p1
%patch1 -p1
-#%%patch2 -p1
+%patch2 -p1
%patch3 -p1
-%patch4 -p1
install -m755 %{SOURCE4} .
mv po/{no,nb}.po
@@ -171,7 +178,6 @@
--with-mit-ext \
--with-proc-interrupts \
--with-pam \
- --with-shadow \
--without-motif \
--with-xml \
--with-gl \
@@ -192,10 +198,7 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
install_prefix=$RPM_BUILD_ROOT \
- PAM_DIR=/etc/pam.d \
- GNOME_CCDIR_1=%{_datadir}/control-center/Desktop \
- GNOME_CCDIR_2=%{_datadir}/control-center/capplets \
- GNOME_PANELDIR=%{_applnkdir}/Settings/GNOME/Desktop
+ PAM_DIR=/etc/pam.d
install -d $RPM_BUILD_ROOT{/etc/pam.d,%{_desktopdir}}
@@ -209,14 +212,14 @@
_DIR=$(pwd)
cd $RPM_BUILD_ROOT%{_libdir}/%{name}
-echo '%defattr(755,root,root)' > $_DIR/files.normal
-echo '%defattr(755,root,root)' > $_DIR/files.gl
-echo '%defattr(755,root,root)' > $_DIR/files.gle
+echo '%defattr(644,root,root,755)' > $_DIR/files.base
+echo '%defattr(644,root,root,755)' > $_DIR/files.gl
+echo '%defattr(644,root,root,755)' > $_DIR/files.gle
find_config_and_man()
{
- if test -e $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${1}.xml ; then
- echo %{_sysconfdir}/%{name}/${1}.xml
+ if test -e $RPM_BUILD_ROOT%{_datadir}/%{name}/${1}.xml ; then
+ echo %{_datadir}/%{name}/${1}.xml
fi
if test -e $RPM_BUILD_ROOT%{_mandir}/man1/${1}.1 ; then
mv $RPM_BUILD_ROOT%{_mandir}/man1/{,xscreensaver-}${1}.1
@@ -239,27 +242,26 @@
(START==1) && (LIBNAME!="") { print LIBNAME; }
/^$/ { START=0; }' 2>&1 `"
-if (echo "$_REQUIRES" | grep -q "libgle.so"); then
- echo "%{_libdir}/xscreensaver/$file" >> $_DIR/files.gle
- find_config_and_man $file >> $_DIR/files.gle
-elif (echo "$_REQUIRES" | grep -q "libGLU.so"); then
- echo "%{_libdir}/xscreensaver/$file" >> $_DIR/files.gl
- find_config_and_man $file >> $_DIR/files.gl
-else
- echo "%{_libdir}/xscreensaver/$file" >> $_DIR/files.normal
- find_config_and_man $file >> $_DIR/files.normal
-fi
+ if (echo "$_REQUIRES" | grep -q "libgle.so"); then
+ echo "%attr(755,root,root) %{_libdir}/xscreensaver/$file" >>
$_DIR/files.gle
+ find_config_and_man $file >> $_DIR/files.gle
+ elif (echo "$_REQUIRES" | grep -q "libGLU.so"); then
+ echo "%attr(755,root,root) %{_libdir}/xscreensaver/$file" >>
$_DIR/files.gl
+ find_config_and_man $file >> $_DIR/files.gl
+ else
+ echo "%attr(755,root,root) %{_libdir}/xscreensaver/$file" >>
$_DIR/files.base
+ find_config_and_man $file >> $_DIR/files.base
+ fi
done
cd $_DIR
%find_lang %{name} --all-name
-cat %{name}.lang >> files.normal
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f files.normal
+%files -f %{name}.lang
%defattr(644,root,root,755)
%doc README README.debugging
%doc %{_datadir}/%{name}/README
@@ -269,14 +271,18 @@
%attr(755,root,root) %{_bindir}/xscreensaver-getimage*
%attr(755,root,root) %{_bindir}/xscreensaver-text
#%attr(755,root,root) %{_bindir}/xscreensaver.kss
-#%dir %{_datadir}/%{name}
%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/xscreensaver
%dir %{_libdir}/xscreensaver
%{_appdefsdir}/*
-%{_datadir}/%{name}
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/glade
%{_desktopdir}/xscreensaver.desktop
%{_desktopdir}/xscreensaver-lock.desktop
-%{_mandir}/man1/xscreensaver*
+%{_mandir}/man1/xscreensaver.1*
+%{_mandir}/man1/xscreensaver-command.1*
+%{_mandir}/man1/xscreensaver-demo.1*
+%{_mandir}/man1/xscreensaver-getimage*.1*
+%{_mandir}/man1/xscreensaver-text.1*
%{_pixmapsdir}/*.xpm
#%{_datadir}/%{name}/cosmos.xml
@@ -293,9 +299,13 @@
#%{_datadir}/%{name}/xplanet.xml
#%{_datadir}/%{name}/xsnow.xml
+%files base -f files.base
+%defattr(644,root,root,755)
+
%files GL -f files.gl
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/xscreensaver-gl-helper
+%{_mandir}/man1/xscreensaver-gl-helper.1*
%files GLE -f files.gle
%defattr(644,root,root,755)
@@ -310,6 +320,16 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.141 2006/08/04 19:44:07 havner
+- drop unused fix-launch-with-kde patch (already in upstream)
+- base subpackage with hacks (it may be required for kde or gnome
+ screensavers (xscreensaver app is not needed then)
+- description cleanups
+- no shadow support (we dont set setuid so it doesn't work anyway, pam is
+ enough)
+- install/files fix ups (dont double package some files, put xml files
+ where they belong, proper perms for man pages)
+
Revision 1.140 2006/02/09 18:12:27 wolf
- 4.24
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/xscreensaver.spec?r1=1.140&r2=1.141&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
