Author: havner Date: Tue Aug 8 17:11:58 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- mutual obsoletes (gnome-screensaver<->xscreensaver-gnome2), those
packages theoreticaly can coexist but gnome xdg-menus/control-center
shows only one of them anyway (common Name) and it may be undefined
what gnome lock button is going to use (besides gnome-screensaver will
have support for xscreensaver hacks soon)
---- Files affected:
SPECS:
xscreensaver.spec (1.141 -> 1.142) , gnome-screensaver.spec (1.23.2.4 ->
1.23.2.5)
---- Diffs:
================================================================
Index: SPECS/xscreensaver.spec
diff -u SPECS/xscreensaver.spec:1.141 SPECS/xscreensaver.spec:1.142
--- SPECS/xscreensaver.spec:1.141 Fri Aug 4 21:44:07 2006
+++ SPECS/xscreensaver.spec Tue Aug 8 19:11:52 2006
@@ -144,6 +144,7 @@
Group: X11/Applications
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: control-center >= 1:2.0
+Obsoletes: gnome-screensaver
%description gnome2
GNOME2 support.
@@ -320,6 +321,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.142 2006/08/08 17:11:52 havner
+- mutual obsoletes (gnome-screensaver<->xscreensaver-gnome2), those
+ packages theoreticaly can coexist but gnome xdg-menus/control-center
+ shows only one of them anyway (common Name) and it may be undefined
+ what gnome lock button is going to use (besides gnome-screensaver will
+ have support for xscreensaver hacks soon)
+
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
================================================================
Index: SPECS/gnome-screensaver.spec
diff -u SPECS/gnome-screensaver.spec:1.23.2.4
SPECS/gnome-screensaver.spec:1.23.2.5
--- SPECS/gnome-screensaver.spec:1.23.2.4 Wed May 31 21:18:35 2006
+++ SPECS/gnome-screensaver.spec Tue Aug 8 19:11:52 2006
@@ -3,7 +3,7 @@
Summary(pl): Wygaszacz ekranu GNOME
Name: gnome-screensaver
Version: 2.14.2
-Release: 1
+Release: 2
License: GPL v2
Group: X11/Applications
Source0:
http://ftp.gnome.org/pub/gnome/sources/gnome-screensaver/2.14/%{name}-%{version}.tar.bz2
@@ -29,6 +29,7 @@
Requires(post,preun): GConf2
Requires: libgnomeui >= 2.14.1
Requires: xdg-menus
+Obsoletes: xscreensaver-gnome2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -61,9 +62,9 @@
--with-xf86vmode-ext \
--with-xidle-ext \
--with-xinerama-ext \
- --with-xscreensaverdir=%{_sysconfdir}/X11/xscreensaver \
+ --with-xscreensaverdir=%{_datadir}/xscreensaver \
--with-xscreensaverhackdir=%{_libdir}/xscreensaver \
- --with-gdm-config=%{_sysconfdir}/X11/gdm/gdm.conf
+ --with-gdm-config=%{_datadir}/gdm/defaults.conf
%{__make}
%install
@@ -107,6 +108,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23.2.5 2006/08/08 17:11:52 havner
+- mutual obsoletes (gnome-screensaver<->xscreensaver-gnome2), those
+ packages theoreticaly can coexist but gnome xdg-menus/control-center
+ shows only one of them anyway (common Name) and it may be undefined
+ what gnome lock button is going to use (besides gnome-screensaver will
+ have support for xscreensaver hacks soon)
+
Revision 1.23.2.4 2006/05/31 19:18:35 freetz
- 2.14.2, GNOME 2.14.2 deps
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/xscreensaver.spec?r1=1.141&r2=1.142&f=u
http://cvs.pld-linux.org/SPECS/gnome-screensaver.spec?r1=1.23.2.4&r2=1.23.2.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
