]> git.pld-linux.org Git - packages/gdm.git/blobdiff - gdm.spec
- updated to 2.30.4
[packages/gdm.git] / gdm.spec
index 9200e91bf7a3ff347d941c92cd9ddea8f4ebff72..bbbe3e0714a4bb51ab4a0fe52ad111b65adfbe28 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -14,66 +14,79 @@ Summary(pt_BR.UTF-8):       Gerenciador de Entrada do GNOME
 Summary(ru.UTF-8):     Дисплейный менеджер GNOME
 Summary(uk.UTF-8):     Дисплейний менеджер GNOME
 Name:          gdm
-Version:       2.24.0
+Version:       2.30.4
 Release:       1
-Epoch:         1
+Epoch:         2
 License:       GPL/LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.24/%{name}-%{version}.tar.bz2
-# Source0-md5: c38e3debe8a02ad385f1c7077d21de9e
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.30/%{name}-%{version}.tar.bz2
+# Source0-md5: f5e0ff54522f005d7593ac6686772988
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}-pld-logo.png
 #Source4:      %{name}-autologin.pamd
+Source5:       %{name}-custom.desktop
+Source6:       %{name}-default.desktop
 Patch0:                %{name}-xdmcp.patch
+Patch1:                %{name}-polkit.patch
 Patch2:                %{name}-xsession.patch
-Patch4:                %{name}-defaults.patch
+Patch3:                %{name}-defaults.patch
 URL:           http://www.gnome.org/projects/gdm/
-BuildRequires: ConsoleKit-devel
+#BuildRequires:        ConsoleKit-devel >= 0.4.1
+BuildRequires: GConf2-devel >= 2.24.0
+BuildRequires: UPower-devel
 BuildRequires: attr-devel
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake
-BuildRequires: dbus-glib-devel >= 0.73
+BuildRequires: audit-libs-devel
+BuildRequires: autoconf >= 2.60
+BuildRequires: automake >= 1:1.9
+#BuildRequires:        check >= 0.9.4
+BuildRequires: dbus-glib-devel >= 0.74
+BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.15.0
-BuildRequires: gtk+2-devel >= 2:2.12.0
-BuildRequires: intltool >= 0.36.1
-BuildRequires: libart_lgpl-devel >= 2.3.19
-BuildRequires: libglade2-devel >= 1:2.6.2
-BuildRequires: libgnomeui-devel >= 2.20.0
-BuildRequires: libgsf-devel >= 1.14.6
-BuildRequires: librsvg-devel >= 1:2.18.1
+BuildRequires: glib2-devel >= 1:2.22.0
+BuildRequires: gnome-doc-utils
+BuildRequires: gnome-panel-devel >= 2.24.0
+BuildRequires: gtk+2-devel >= 2:2.14.0
+BuildRequires: intltool >= 0.40.0
+BuildRequires: iso-codes
+BuildRequires: libcanberra-gtk-devel >= 0.4
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool
-BuildRequires: libxml2-devel >= 1:2.6.29
+BuildRequires: libxklavier-devel >= 4.0-2
 BuildRequires: pam-devel
 BuildRequires: perl-modules
+BuildRequires: pkgconfig
+BuildRequires: polkit-devel
+#BuildRequires:        polkit-gnome-devel >= 0.92
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
-BuildRequires: scrollkeeper
-BuildRequires: sed >= 4.0
+#BuildRequires:        scrollkeeper
 BuildRequires: xorg-lib-libXdmcp-devel
 BuildRequires: xorg-lib-libXi-devel
 BuildRequires: xorg-lib-libXinerama-devel
-BuildRequires: xorg-lib-libdmx-devel
+#BuildRequires:        xorg-lib-libdmx-devel
+Requires(post,postun): /usr/bin/scrollkeeper-update
 Requires(post,postun): gtk+2
 Requires(post,postun): hicolor-icon-theme
-Requires(post,postun): /usr/bin/scrollkeeper-update
+Requires(post,preun):  GConf2
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires:      gnome-session >= 2.23.90
-Requires:      gnome-settings-daemon >= 2.23.90
-Requires:      libgnomeui >= 2.20.0
+Requires:      /usr/bin/X
+Requires:      gnome-session >= 2.30.0
+Requires:      gnome-settings-daemon >= 2.24.0
 Requires:      pam >= 0.99.7.1
+Requires:      polkit-gnome >= 0.93
 Requires:      which
-Requires:      xorg-app-xmodmap
 Requires:      xorg-app-sessreg
+Requires:      xorg-app-xmodmap
+Suggests:      zenity
 Provides:      XDM
 Provides:      group(xdm)
 Provides:      user(xdm)
+Obsoletes:     gdm-Xnest
 Conflicts:     gdkxft
 # sr@Latn vs. sr@latin
 Conflicts:     glibc-misc < 6:2.7
@@ -114,19 +127,6 @@ GDM (GNOME Display Manager) - це реімплементація xdm (X Display
 Manager). GDM дозволяє вам входити в систему, на якій запущено X
 Window та підтримує роботу кількох різних X сеансів одночасно.
 
-%package Xnest
-Summary:       Xnest (ie embedded X) server for GDM
-Summary(pl.UTF-8):     Serwer Xnest dla GDM
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      xorg-xserver-Xnest
-
-%description Xnest
-This package add support for Xnest server in gdm.
-
-%description Xnest -l pl.UTF-8
-Ten pakiet dodaje do gdm wsparcie dla Xnest.
-
 %package init
 Summary:       Init script for GDM
 Summary(pl.UTF-8):     Skrypt init dla GDM-a
@@ -141,11 +141,31 @@ Init script for GDM.
 %description init -l pl.UTF-8
 Skrypt init dla GDM-a.
 
+%package user-switch-applet
+Summary:       GNOME applet for fast user switching
+Summary(pl.UTF-8):     Aplet GNOME do szybkiego przełączania użytkowników
+Group:         X11/Applications
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Provides:      gnome-applet-fast-user-switch = %{epoch}:%{version}-%{release}
+Obsoletes:     gnome-applet-fast-user-switch
+
+%description user-switch-applet
+The GDM User Switch Applet is an applet for the GNOME panel which
+provides a mechanism for switching between users.
+
+%description user-switch-applet -l pl.UTF-8
+GDM User Switch Applet to aplet panelu GNOME udostępniający mechanizm
+do przełączania między użytkownikami.
+
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch4 -p1
+%patch3 -p1
+rm -f data/gdm.schemas.in
+sed -i 's/^en@shaw//' po/LINGUAS
+rm po/en@shaw.po
 
 %build
 %{__libtoolize}
@@ -158,6 +178,7 @@ Skrypt init dla GDM-a.
 %configure \
        --disable-console-helper \
        --disable-scrollkeeper \
+       --disable-silent-rules \
        --with-console-kit \
        --enable-authentication-scheme=pam \
        --with-pam-prefix=/etc \
@@ -174,6 +195,7 @@ Skrypt init dla GDM-a.
 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%{_datadir}/xsessions
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -189,11 +211,9 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
 %find_lang %{name} --with-gnome --with-omf --all-name
 
-# Remove useless files
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
-
-# moved to gnome-session
-rm -f $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
+# allow executing ~/.Xclients and ~/.xsession
+install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xsessions/custom.desktop
+install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/default.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -204,13 +224,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %gconf_schema_install gdm-simple-greeter.schemas
-#%%gconf_schema_install gdm-user-switch-applet.schemas
 %scrollkeeper_update_post
 %update_icon_cache hicolor
 
 %preun
 %gconf_schema_uninstall gdm-simple-greeter.schemas
-#%%gconf_schema_uninstall gdm-user-switch-applet.schemas
 
 %postun
 %scrollkeeper_update_postun
@@ -252,7 +270,6 @@ fi
 %attr(755,root,root) %{_libexecdir}/gdm-simple-chooser
 %attr(755,root,root) %{_libexecdir}/gdm-simple-greeter
 %attr(755,root,root) %{_libexecdir}/gdm-simple-slave
-%attr(755,root,root) %{_libexecdir}/gdm-user-switch-applet
 %attr(755,root,root) %{_libexecdir}/gdm-xdmcp-chooser-slave
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_bindir}/*
@@ -267,23 +284,30 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/custom.conf
 %{_sysconfdir}/gdm/gdm.schemas
 %{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas
-#%{_sysconfdir}/gconf/schemas/gdm-user-switch-applet.schemas
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/*
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/gdm*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.gdm
-%attr(750,xdm,xdm) %{_localstatedir}/gdm
-%attr(750,xdm,xdm) %{_localstatedir}/log/gdm
+%attr(1755,root,xdm) /var/cache/gdm
+%attr(1770,root,xdm) %dir /var/lib/gdm
+%attr(1750,root,xdm) %dir /var/lib/gdm/.gconf.mandatory
+%attr(1640,root,xdm) /var/lib/gdm/.gconf.mandatory/*.xml
+%attr(644,root,xdm) /var/lib/gdm/.gconf.path
+%attr(750,xdm,xdm) /var/log/gdm
+%attr(1777,root,xdm) /var/run/gdm
 %attr(750,xdm,xdm) /home/services/xdm
 %{_pixmapsdir}/*
 %{_datadir}/gdm
+%{_datadir}/polkit-1/actions/gdm.policy
+%{_datadir}/xsessions/custom.desktop
+%{_datadir}/xsessions/default.desktop
 %{_iconsdir}/hicolor/*/apps/*.png
-%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
-%{_libdir}/bonobo/servers/*.server
-%{_localstatedir}/lib/gdm
-
-%files Xnest
-%defattr(644,root,root,755)
 
 %files init
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/gdm
+
+%files user-switch-applet
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libexecdir}/gdm-user-switch-applet
+%{_libdir}/bonobo/servers/GNOME_FastUserSwitchApplet.server
+%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
This page took 0.133278 seconds and 4 git commands to generate.