SPECS: gdm.spec - sync with stable branch, cut changelog
freetz
freetz at pld-linux.org
Tue May 23 23:15:28 CEST 2006
Author: freetz Date: Tue May 23 21:15:28 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- sync with stable branch, cut changelog
---- Files affected:
SPECS:
gdm.spec (1.179 -> 1.180)
---- Diffs:
================================================================
Index: SPECS/gdm.spec
diff -u SPECS/gdm.spec:1.179 SPECS/gdm.spec:1.180
--- SPECS/gdm.spec:1.179 Mon May 15 19:26:05 2006
+++ SPECS/gdm.spec Tue May 23 23:15:23 2006
@@ -1,4 +1,5 @@
# $Revision$, $Date$
+#
# TODO:
# /etc/X11/dm dir should belong to XFree? It is common for KDE and GNOME
# s=/dev/null=/home/services/xdm= in %%trigger for gracefull upgrade from xdm/kdm/gdm 2.2
@@ -15,8 +16,8 @@
Summary(ru): äÉÓĐĚĹĘÎŮĘ ÍĹÎĹÄÖĹŇ GNOME
Summary(uk): äÉÓĐĚĹĘÎÉĘ ÍĹÎĹÄÖĹŇ GNOME
Name: gdm
-Version: 2.14.6
-Release: 1
+Version: 2.14.7
+Release: 2
Epoch: 1
License: GPL/LGPL
Group: X11/Applications
@@ -35,7 +36,6 @@
Patch3: %{name}-logdir.patch
Patch4: %{name}-desktop.patch
Patch5: %{name}-xorg.patch
-Patch6: %{name}-install.patch
URL: http://www.jirka.org/gdm.html
BuildRequires: attr-devel
BuildRequires: autoconf
@@ -44,17 +44,17 @@
BuildRequires: gtk+2-devel >= 2:2.4.3
BuildRequires: intltool >= 0.30
BuildRequires: libglade2-devel >= 1:2.4.1
-BuildRequires: libgnome-devel >= 2.6.1
-BuildRequires: libgnomecanvas-devel >= 2.6.1
-BuildRequires: libgnomeui-devel >= 2.10.0-2
+BuildRequires: libgnome-devel >= 2.14.1
+BuildRequires: libgnomecanvas-devel >= 2.14.0
+BuildRequires: libgnomeui-devel >= 2.14.1
BuildRequires: libgsf-devel >= 1.9.0
-BuildRequires: librsvg-devel >= 1:2.6.5
+BuildRequires: librsvg-devel >= 1:2.14.3
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libtool
BuildRequires: libxml2-devel >= 2.5.11
BuildRequires: pam-devel
BuildRequires: perl-modules
-BuildRequires: rpmbuild(macros) >= 1.231
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: xorg-lib-libdmx-devel
BuildRequires: xorg-lib-libXdmcp-devel
BuildRequires: xorg-lib-libXi-devel
@@ -65,8 +65,10 @@
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
Requires(post,postun): /usr/bin/scrollkeeper-update
-Requires: libgnome >= 2.6.1
-Requires: xorg-app-sessreg
+Requires: libgnome >= 2.14.1
+Requires: libgnomecanvas >= 2.14.0
+Requires: libgnomeui >= 2.14.1
+Requires: sessreg
Requires: which
Requires: pam >= 0.79.0
Provides: group(xdm)
@@ -150,8 +152,6 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%build
%{__libtoolize}
@@ -208,7 +208,7 @@
%pre
%groupadd -g 55 -r -f xdm
-%useradd -u 55 -r -d /home/services/xdm -s /bin/false -c 'X Display Manager' -g xdm xdm
+%useradd -u 55 -r -d /home/services/xdm -s /bin/false -c "X Display Manager" -g xdm xdm
%post
%scrollkeeper_update_post
@@ -228,17 +228,15 @@
%post init
/sbin/chkconfig --add gdm
if [ -f /var/lock/subsys/gdm ]; then
- echo "Run \"service gdm restart\" to restart gdm." >&2
- echo "WARNING: it will terminate all sessions opened from gdm!" >&2
+ echo "Run \"/sbin/service gdm restart\" to restart gdm." >&2
+ echo "WARNING: it will terminate all sessions opened from gdm!" >&2
else
- echo "Run \"service gdm start\" to start gdm." >&2
+ echo "Run \"/sbin/service gdm start\" to start gdm." >&2
fi
%preun init
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/gdm ]; then
- /etc/rc.d/init.d/gdm stop >&2
- fi
+ %service gdm stop
/sbin/chkconfig --del gdm
fi
@@ -303,679 +301,6 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.179 2006/05/15 17:26:05 freetz
-- 2.14.6, added install patch
-
-Revision 1.178 2006/05/10 20:17:40 freetz
-- 2.14.5
-
-Revision 1.177 2006/04/28 16:42:36 freetz
-- 2.14.4
-
-Revision 1.176 2006/04/25 16:21:03 freetz
-- 2.14.3
-
-Revision 1.175 2006/04/16 12:58:09 freetz
-- 2.14.2, removed gdm-gdmthemetester.in gdm-makefile.patch (already
- included)
-
-Revision 1.174 2006/04/12 16:11:18 freetz
-- 2.14.1, added makefile patch and source missing from tarball to fix
- mess introduced with this release
-
-Revision 1.173 2006/04/02 15:36:45 freetz
-- merged from DEVEL
-
-Revision 1.172.2.7 2006/03/19 18:10:51 wrobell
-- added patch to always find X in /usr (modular xorg)
-- rel. 2
-
-Revision 1.172.2.6 2006/03/14 07:01:10 freetz
-- 2.14.0
-
-Revision 1.172.2.5 2006/03/03 23:01:18 freetz
-- 2.13.0.10
-
-Revision 1.172.2.4 2006/02/27 22:04:07 freetz
-- 2.13.0.9
-
-Revision 1.172.2.3 2006/02/21 12:16:13 wiget
-- more BRs
-- relase 2
-
-Revision 1.172.2.2 2006/02/17 14:23:52 freetz
-- 2.13.0.8, configraution moved to /etc/gdm, added trigger
-
-Revision 1.172.2.1 2006/02/10 08:39:31 freetz
-- 2.13.0.7, vt_9, logdir, default_theme patches incorporated into conf
- patch, switched to modular xorg
-
-Revision 1.172 2005/11/28 21:50:34 freetz
-- 2.8.0.7
-
-Revision 1.171 2005/11/16 21:46:58 qboosh
-- fixed version number in previous changelog entry
-
-Revision 1.170 2005/11/15 22:02:58 freetz
-- 2.8.0.6
-
-Revision 1.169 2005/10/19 18:44:35 freetz
-- don't restart on upgrade, rel.2
-
-Revision 1.168 2005/10/04 20:20:21 freetz
-- 2.8.0.5
-
-Revision 1.167 2005/09/06 19:45:12 freetz
-- 2.8.0.4
-
-Revision 1.166 2005/08/22 17:05:56 aflinta
-- version 2.8.0.3
-
-Revision 1.165 2005/08/09 13:57:53 aflinta
-- up to version 2.8.0.2
-
-Revision 1.164 2005/07/24 15:42:41 freetz
-- 2.8.0.1, %%files update
-
-Revision 1.163 2005/05/12 13:14:14 baggins
-- release 2
-- req pam 0.79
-
-Revision 1.162 2005/05/02 18:23:51 glen
-- adapterized
-
-Revision 1.161 2005/05/01 17:31:30 glen
-- use %useradd/%groupadd macros
-
-Revision 1.160 2005/04/12 17:49:08 freetz
-- 2.6.0.9, new style macros
-
-Revision 1.159 2005/03/22 06:07:02 wolvverine
-- add patch firstVT=9 in config file
-
-Revision 1.158 2005/03/20 20:09:14 aflinta
-- rebuild with hol 0.9.10, release 2
-
-Revision 1.157 2005/03/12 15:22:02 aflinta
-- up to version 2.6.0.8
-
-Revision 1.156 2005/02/06 19:53:07 adamg
-- +bcond_without selinux
-
-Revision 1.155 2005/02/02 19:51:15 grzegol
-- updated to 2.6.0.7
-
-Revision 1.154 2005/01/10 09:42:45 paszczus
-- release 5 to rebuild with autologin PAM config, it works
-
-Revision 1.153 2005/01/08 19:48:09 sparky
-- O: entrance
-
-Revision 1.152 2004/12/22 18:36:46 baggins
-- added gdm-autologin PAM config
-- interested parties check if it works
-
-Revision 1.151 2004/12/10 23:32:22 ankry
-- rel. 4
-
-Revision 1.150 2004/12/07 01:12:11 havner
-- rel 3
-
-Revision 1.149 2004/12/06 22:24:13 patrys
-- rel up to force rebuild with new vfolders
-
-Revision 1.148 2004/11/01 18:10:33 grzegol
-- updated to 2.6.0.6
-
-Revision 1.147 2004/09/17 16:17:57 havner
-- [mass commit] rel++ for s/Capplet/X-Capplet in sources
-
-Revision 1.146 2004/09/16 20:59:38 havner
-- rel 2 for updated desktop patch
-
-Revision 1.145 2004/09/15 11:38:16 grzegol
-- updated to 2.6.0.5
-- removed locale-names patch and remove no locale in %install
-
-Revision 1.144 2004/09/14 11:40:56 aflinta
-- rebuild with libcroco 0.6.x
-
-Revision 1.143 2004/08/19 20:27:43 aflinta
-- ooops, small fix
-
-Revision 1.142 2004/08/19 20:26:49 aflinta
-- up to verison 2.6.0.4
-
-Revision 1.141 2004/08/17 22:45:45 ankry
-- added proper BR: rpmbuild(macros)
-
-Revision 1.140 2004/08/17 21:34:35 ankry
-- use user/group macros
-
-Revision 1.139 2004/08/08 15:49:10 ankry
-- spaces -> tabs
-
-Revision 1.138 2004/07/25 23:50:13 grzegol
-- added desktop patch (s/Application/GTK;GNOME/)
-- rel. 4
-
-Revision 1.137 2004/07/09 13:23:31 havner
-- rel 3 for fixed xsession patch
-
-Revision 1.136 2004/06/25 23:07:44 pzurowski
-- removed unremoved helper things
-
-Revision 1.135 2004/06/25 07:15:25 pzurowski
-- set storky theme as default one
-
-Revision 1.134 2004/06/25 02:31:40 pzurowski
-- added storky theme -- theme with mimooh's and PLD's stork (both SVG)
-- release 2
-
-Revision 1.133 2004/06/11 21:29:41 grzegol
-- updated to 2.6.0.3
-
-Revision 1.132 2004/06/03 04:52:37 wrobell
-- chkconfig is required by init subpackage (not main package)
-
-Revision 1.131 2004/05/07 12:22:04 grzegol
-- updated to 2.6.0.2
-
-Revision 1.130 2004/04/19 08:14:33 aflinta
-- added BR: attr-devel
-
-Revision 1.129 2004/04/17 09:13:54 aflinta
-- up to version 2.6.0.1
-
-Revision 1.128 2004/04/11 13:20:35 grzegol
-- merged 2.6.0.0 from DEVEL
-
-Revision 1.127 2004/02/24 22:10:30 krzak
-- intltool.patch set AC_CONFIG_AUX_DIR for intltool
-
-Revision 1.126 2004/02/24 19:31:20 blues
-- add /var/log/gdm to package - gdm looks for it and uses /var/lib/gdm
- instead...
-
-Revision 1.125.2.6 2004/03/16 22:26:08 aflinta
-- release 2 to rebuild with new libcroco 0.5.0
-
-Revision 1.125.2.5 2004/03/16 11:21:03 grzegol
-- updated to 2.6.0.0
-
-Revision 1.125.2.4 2004/03/06 11:37:12 grzegol
-- updated to 2.5.90.2
-
-Revision 1.125.2.3 2004/02/26 16:22:16 grzegol
-- added locale-names patch (changes locale no -> nb)
-- added /var/log/gdm directory
-- strict internal deps
-- rel. 2
-
-Revision 1.125.2.2 2004/02/09 11:04:22 aflinta
-- up to version 2.5.90.1
-
-Revision 1.125.2.1 2004/02/03 22:26:53 grzegol
-- updated to 2.5.90.0
-- added SELinux support
-
-Revision 1.125 2004/01/01 20:54:31 krzak
-- update to version 2.4.4.7
-
-Revision 1.124 2003/12/30 13:01:04 trojan
-- updated to 2.4.4.6
-
-Revision 1.123 2003/11/18 07:51:45 undefine
-- BR: scrollkeeper
-
-Revision 1.122 2003/11/15 15:01:38 krzak
-- revert R: glibc-localedb-all
-
-Revision 1.121 2003/11/15 11:12:52 krzak
-- R: glibc-localedb-all (to support locales at all)
-
-Revision 1.120 2003/10/19 00:30:08 saq
-- version 2.4.4.5
-- STBR for Ac
-
-Revision 1.119 2003/10/16 20:04:40 freetz
-- 2.4.4.4
-
-Revision 1.118 2003/09/26 19:29:39 krzak
-- logdir.patch (set log directory to /var/lib/gdm)
-- rel 3
-
-Revision 1.117 2003/09/26 14:23:07 baggins
-- release 2
-
-Revision 1.116 2003/09/26 14:20:25 baggins
-- req pam >= 0.77.3
-
-Revision 1.115 2003/09/26 07:59:50 trojan
-- updated to 2.4.4.3
-
-Revision 1.114 2003/09/24 22:11:16 adgor
-- default.desktop already moved to %{_datadir}/xsessions
-
-Revision 1.113 2003/09/24 18:13:57 krzak
-- rel 2
-- %{_datadir}/xsessions/gnome.desktop moved to gnome-session
-
-Revision 1.112 2003/09/23 04:38:00 aflinta
-- version 2.4.4.2
-
-Revision 1.111 2003/09/20 08:51:53 misi3k
-- fix group add in pre section
-
-Revision 1.110 2003/09/19 22:11:20 havner
-- xsession patch added
-
-Revision 1.109 2003/09/13 10:12:28 grzegol
-- updated to 2.4.4.1
-
-Revision 1.108 2003/09/03 03:37:25 grzegol
-- updated to 2.4.4.0
-
-Revision 1.107 2003/08/26 09:33:42 trojan
-- updated to 2.4.2.102
-
-Revision 1.106 2003/08/21 00:26:37 grzegol
-- updated to 2.4.2.101
-
-Revision 1.105 2003/08/10 20:21:51 qwark
-- remove BR libart_lgpl (gdm requires libgnomeui which requires libbonoboui which requires libart_lgpl). It was my fault.
-
-Revision 1.104 2003/08/09 14:16:48 grzegol
-- updated to 2.4.2.100
-
-Revision 1.103 2003/08/08 16:11:31 qwark
-- added libart_lgpl to BR
-
-Revision 1.102 2003/08/01 11:58:49 grzegol
-- rel++ to rebuild without linc
-- sorting/cosmetics
-
-Revision 1.101 2003/07/31 23:41:42 aflinta
-- version 2.4.2.99
-
-Revision 1.100 2003/07/25 20:17:47 krzak
-- BR: libgsf-devel
-
-Revision 1.99 2003/07/25 17:56:15 krzak
-- s/scrollkeeper/scrollkeeper-update/
-- rel 0.10
-
-Revision 1.98 2003/07/24 13:37:05 grzegol
-- scrollkeeper is back
-
-Revision 1.97 2003/07/23 23:28:59 aflinta
-- version 2.4.2.98
-
-Revision 1.96 2003/07/17 12:46:09 grzegol
-- scrollkeeper isn't required
-
-Revision 1.95 2003/07/17 00:00:34 aflinta
-- version 2.4.2.97
-
-Revision 1.94 2003/07/07 13:03:14 qboosh
-- use _desktopdir macro, other minor changes where needed
-
-Revision 1.93 2003/06/27 18:54:18 grzegol
-- added docs/GdmGreeterThemeManual.txt to %doc
-
-Revision 1.92 2003/06/26 20:03:22 aflinta
-- version 2.4.2.96
-
-Revision 1.91 2003/06/14 17:50:17 grzegol
-- added URL
-
-Revision 1.90 2003/06/11 06:34:54 aflinta
-- some updates, config is back in /etc/X11, added one thing to TODO, release 0.9
-
-Revision 1.89 2003/06/11 05:48:51 aflinta
-- started update to versio 2.4.2.95
-
-Revision 1.88 2003/05/26 16:25:00 malekith
-- massive attack: adding Source-md5
-
-Revision 1.87 2003/05/25 05:47:46 misi3k
-- massive attack s/pld.org.pl/pld-linux.org/
-
-Revision 1.86 2003/05/17 06:39:11 pascalek
-- revert user changes
-
-Revision 1.85 2003/05/10 10:11:53 pascalek
-- Req user-xdm
-
-Revision 1.84 2003/05/05 22:06:00 aflinta
-- version 2.4.1.4
-
-Revision 1.83 2003/05/05 12:37:36 pascalek
-- init Req open
-
-Revision 1.82 2003/02/03 21:26:18 grzegol
-- updated to 2.4.1.3
-
-Revision 1.81 2003/02/03 19:37:29 wrobell
-- gdm uses vfolder stuff, so applnk support is removed
-- rel. 2
-
-Revision 1.80 2003/01/25 18:43:29 aflinta
-- updated to version 2.4.1.2
-
-Revision 1.79 2003/01/14 01:58:44 aflinta
-- updated to version 2.4.1.1
-
-Revision 1.78 2003/01/03 11:04:03 wrobell
-- ver. 2.4.1.0
-
-Revision 1.77 2002/12/05 10:25:27 aflinta
-- moved from /usr/X11R6 to /usr, release 2
-
-Revision 1.76 2002/11/25 01:40:59 ankry
-Massive attack:
-- s/man[ea]d[zż][ae]r/zarządca/g
-- (some) new %doc
-
-Revision 1.75 2002/11/22 13:55:50 wrobell
-- downgrade libgnome-devel build requirements, it builds with older version
- and it is needed for GNOME_2_0 branch
-
-Revision 1.74 2002/11/21 15:31:00 wrobell
-- ver. 2.4.0.12
-
-Revision 1.73 2002/10/29 18:54:31 aflinta
-- rebuild against bonobo-activation 2.1.0, release up
-
-Revision 1.72 2002/10/24 20:23:19 malekith
-- release 3
-
-Revision 1.71 2002/10/23 13:42:35 wrobell
-- added gdm configuration patch
-- rel. 2
-
-Revision 1.70 2002/10/23 13:15:05 wrobell
-- merged from DEVEL
-- added init with rc scripts stuff subpackage
-- minor clean up
-
-Revision 1.58.2.10 2002/08/30 20:07:27 aflinta
-- updated to version 2.4.0.11
-
-Revision 1.58.2.9 2002/08/28 11:48:14 aflinta
-- updated to version 2.4.0.10
-
-Revision 1.58.2.8 2002/08/25 20:16:27 aflinta
-- updated to version 2.4.0.9
-
-Revision 1.58.2.7 2002/08/16 18:16:08 wolf
-- BR: pam-devel
-
-Revision 1.58.2.6 2002/08/16 07:23:27 aflinta
-- updated to version 2.4.0.7
-
-Revision 1.58.2.5 2002/07/22 15:46:07 wiget
-- updated to 2.4.0.2
-
-Revision 1.58.2.4 2002/06/23 13:32:20 aflinta
-- requires new librsvg 2.0.0
-
-Revision 1.58.2.3 2002/06/12 14:37:20 wiget
-updated to 2.4.0.0
-
-Revision 1.58.2.2 2002/06/05 09:24:18 wiget
-- updated to 2.3.90.6
-- removed outdated patches
-- use glib-gettextize, not gettextize
-- small cleanup
-
-Revision 1.58.2.1 2002/05/20 14:37:25 wiget
-- update to 2.3.90.3, build and work with gnome2
-
-Revision 1.69 2002/10/09 12:29:37 orzech
-- do NOT replace gdm.conf
-
-Revision 1.68 2002/10/09 08:59:03 qboosh
-- BR: libtool
-
-Revision 1.67 2002/10/02 13:10:19 krzak
-- omf.patch
-- release 10
-- STBR
-
-Revision 1.66 2002/10/02 01:07:33 kloczek
-- release 9: fixed gdm.conf: added "vt9" to X serwer parameters for run gdm
- always on vt9.
-
-Revision 1.65 2002/08/18 12:14:49 blues
-- release 8 - license fix; STBR
-
-Revision 1.64 2002/08/16 13:21:25 kloczek
-- merge trnslations from Kondara and KSI,
-- minor changes in %install.
-
-Revision 1.63 2002/08/06 13:24:50 qboosh
-- BR: libglade-gnome-devel; new %doc; more specific Requires
-
-Revision 1.62 2002/06/23 20:52:50 kloczek
-perl -pi -e "s/^gettextize --copy --force/\%\{__gettextize\}/"
-
-Revision 1.61 2002/06/23 20:32:24 kloczek
-- perl -pi -e "s/^libtoolize --copy --force/\%\{__libtoolize\}/"
-
-Revision 1.60 2002/05/21 23:13:07 kloczek
-- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
- s/^automake -a -c -f/\%\{__automake\}/; \
- s/^autoconf/\%\{__autoconf\}/"
-
-Revision 1.59 2002/05/17 14:28:59 michuz
-- fixed omf filse location
-- release++
-
-Revision 1.58 2002/04/25 16:21:39 arturs
-- fixed a small typo
-
-Revision 1.57 2002/04/14 23:12:01 alchemyx
-- fixed gdm.conf - now you can reconfigure gdm safely
-- added new logo to gdm.conf
-- release 6, STBR
-
-Revision 1.56 2002/04/14 22:42:17 alchemyx
-- added gdm-pld-logo.png
-
-Revision 1.55 2002/04/07 20:06:25 alchemyx
-- removed default listening on port 6000
-- release 5, STBR
-
-Revision 1.54 2002/03/29 12:41:36 alchemyx
-- updated init script (prio 99)
-- release 4, STBR
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/gdm.spec?r1=1.179&r2=1.180&f=u
More information about the pld-cvs-commit
mailing list