]> git.pld-linux.org Git - packages/gdm2.20.git/blobdiff - gdm2.20.spec
- firstVT=9 in config file
[packages/gdm2.20.git] / gdm2.20.spec
index e81ea0bfec812956de973771313c9c818a686328..05440e6155629a35761cfacc4fc7335a71bb13bb 100644 (file)
@@ -3,6 +3,9 @@
 # s=/dev/null=/home/services/xdm= in %%trigger for gracefull upgrade from xdm/kdm/gdm 2.2
 # check /etc/pam.d/gdm-autologin
 #
+# Conditiional build:
+%bcond_without selinux # without selinux
+#
 Summary:       GNOME Display Manager
 Summary(es):   Administrador de Entrada del GNOME
 Summary(ja):   GNOME ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã
@@ -11,52 +14,63 @@ Summary(pt_BR):     Gerenciador de Entrada do GNOME
 Summary(ru):   äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
 Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
-Version:       2.6.0.2
-Release:       1
+Version:       2.6.0.8
+Release:       2
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 037435f440c0d179eb10495172d4e872
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 2c51b452686378097bb58e5fc02e2d04
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}-pld-logo.png
+# http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-artwork/gdm/storky/
+Source4:       %{name}-storky.tar.gz
+# Source4-md5: e293fbe4a60004056f6894463b874ae8
+Source5:       %{name}-autologin.pamd
 Patch0:                %{name}-xdmcp.patch
 Patch1:                %{name}-conf.patch
 Patch2:                %{name}-xsession.patch
 Patch3:                %{name}-logdir.patch
-Patch4:                %{name}-locale-names.patch
+Patch4:                %{name}-default_theme.patch
+Patch5:                %{name}-desktop.patch
 URL:           http://www.jirka.org/gdm.html
 BuildRequires: attr-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2:2.4.1
+BuildRequires: gtk+2-devel >= 2:2.4.3
 BuildRequires: intltool >= 0.30
-BuildRequires: libglade2-devel >= 1:2.3.6
+BuildRequires: libglade2-devel >= 1:2.4.1
 BuildRequires: libgnome-devel >= 2.6.1
 BuildRequires: libgnomecanvas-devel >= 2.6.1
-BuildRequires: libgnomeui-devel >= 2.6.1
+BuildRequires: libgnomeui-devel >= 2.10.0-2
 BuildRequires: libgsf-devel >= 1.9.0
 BuildRequires: librsvg-devel >= 1:2.6.5
-BuildRequires: libselinux-devel
+%{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.5.11
 BuildRequires: pam-devel
 BuildRequires: perl-modules
+BuildRequires: rpmbuild(macros) >= 1.159
 BuildRequires: scrollkeeper
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
 Requires(postun):      /usr/sbin/groupdel
-Requires(post,preun):  /sbin/chkconfig
+Requires(postun):      /usr/sbin/userdel
 Requires(post,postun): /usr/bin/scrollkeeper-update
 Requires:      libgnome >= 2.6.1
 Requires:      sessreg
 Requires:      which
 Requires:      pam >= 0.77.3-7
-Obsoletes:     xdm kdm wdm
+Provides:      group(xdm)
+Provides:      user(xdm)
+Obsoletes:     X11-xdm
+Obsoletes:     entrance
+Obsoletes:     kdm
+Obsoletes:     wdm
+Obsoletes:     xdm
 Conflicts:     gdkxft
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -117,6 +131,7 @@ Summary(pl):        Skrypt init dla GDM-a
 Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      open
+Requires(post,preun):  /sbin/chkconfig
 
 %description init
 Init script for GDM.
@@ -125,14 +140,13 @@ Init script for GDM.
 Skrypt init dla GDM-a.
 
 %prep
-%setup -q
+%setup -q -a4
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
-mv po/{no,nb}.po
+%patch5 -p1
 
 %build
 rm -f missing
@@ -149,14 +163,15 @@ intltoolize --copy --force
        --with-tcp-wrappers=yes \
        --enable-authentication-scheme=pam \
        --disable-console-helper \
-       --with-selinux
+       --with%{!?with_selinux:out}-selinux
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
-       $RPM_BUILD_ROOT{/home/services/xdm,/var/log/gdm}
+       $RPM_BUILD_ROOT{/home/services/xdm,/var/log/gdm} \
+       $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -165,12 +180,17 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
 mv $RPM_BUILD_ROOT%{_datadir}/gdm/BuiltInSessions/default.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
 
 install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 
+install storky/*.* $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky/
+
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
 %find_lang %{name} --all-name --with-gnome
 
 # Remove useless files
@@ -185,16 +205,19 @@ rm -rf $RPM_BUILD_ROOT
 %pre
 if [ -n "`getgid xdm`" ]; then
        if [ "`getgid xdm`" != "55" ]; then
-                echo "Error: group xdm doesn't have gid=55. Correct this before installing %{name}." 1>&2
-                exit 1
-        fi
+               echo "Error: group xdm doesn't have gid=55. Correct this before installing %{name}." 1>&2
+               exit 1
+       fi
 else
        /usr/sbin/groupadd -g 55 -r -f xdm
 fi
-
-
-if [ -z "`id -u xdm 2>/dev/null`" ]; then
-       /usr/sbin/useradd -u 55 -r -d /home/services/xdm -s /bin/false -c 'X Display Manager' -g xdm xdm 1>&2
+if [ -n "`/bin/id -u xdm 2>/dev/null`" ]; then
+       if [ "`/bin/id -u xdm`" != "55" ]; then
+               echo "Error: user xdm doesn't have UID=55. Correct this before installing xdm." 1>&2
+               exit 1
+       fi
+else
+       /usr/sbin/useradd -u 55 -r -d /home/services/xdm -s /bin/false -c 'X Display Manager' -g xdm xdm 1>&2
 fi
 
 %post
@@ -203,10 +226,8 @@ fi
 %postun
 /usr/bin/scrollkeeper-update
 if [ "$1" = "0" ]; then
-       if [ -n "`id -u xdm 2>/dev/null`" ]; then
-               /usr/sbin/userdel xdm
-       fi
-       /usr/sbin/groupdel xdm
+       %userremove xdm
+       %groupremove xdm
 fi
 
 %post init
@@ -252,7 +273,7 @@ fi
 %config %{_sysconfdir}/gdm/PostLogin/Default.sample
 %config %{_sysconfdir}/gdm/modules/*
 
-%config(noreplace)  %verify(not size mtime md5) %{_sysconfdir}/gdm/gdm.conf
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/gdm/gdm.conf
 %config %{_sysconfdir}/gdm/locale.alias
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/gdm*
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/security/blacklist.gdm
@@ -266,6 +287,7 @@ fi
 %{_datadir}/gdm
 #%%{_datadir}/xsessions  -  moved to gnome-session
 %{_datadir}/xsessions/default.desktop
+%{_iconsdir}/hicolor/*/apps/*.png
 %{_omf_dest_dir}/gdm
 %attr(755,root,root) %{_libdir}/gtk-2.0/modules/lib*.so
 %{_mandir}/man1/gdm*
This page took 0.0377 seconds and 4 git commands to generate.