X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=gdm2.20.spec;h=a38b92abeda24f69a11840135e25d9090913ffed;hb=1492b518a484529ca27c9bc87a10bc4b016c92cb;hp=5fd4c26c05a7651238e684ca7fd5b58c21b37801;hpb=65477feba82d4c63a675e763af3b2f4c47da00e6;p=packages%2Fgdm2.20.git

diff --git a/gdm2.20.spec b/gdm2.20.spec
index 5fd4c26..a38b92a 100644
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -19,13 +19,13 @@ Summary(pt_BR.UTF-8):	Gerenciador de Entrada do GNOME
 Summary(ru.UTF-8):	Дисплейный менеджер GNOME
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
-Version:	2.28.2
+Version:	2.30.2
 Release:	1
 Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5:	9607c6bac31c9d8bd3446e66a4576c2e
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.30/%{name}-%{version}.tar.bz2
+# Source0-md5:	ba35f9f750b50be572952195989df2c5
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}-pld-logo.png
@@ -35,56 +35,55 @@ Source6:	%{name}-default.desktop
 Patch0:		%{name}-xdmcp.patch
 Patch1:		%{name}-polkit.patch
 Patch2:		%{name}-xsession.patch
-Patch4:		%{name}-defaults.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=597050
-Patch5:		%{name}-dont-hardcode-path.patch
+Patch3:		%{name}-defaults.patch
 URL:		http://www.gnome.org/projects/gdm/
-BuildRequires:	ConsoleKit-devel >= 0.4.1
+#BuildRequires:	ConsoleKit-devel >= 0.4.1
 BuildRequires:	GConf2-devel >= 2.24.0
+BuildRequires:	UPower-devel
 BuildRequires:	attr-devel
 BuildRequires:	audit-libs-devel
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.9
-BuildRequires:	check >= 0.9.4
+#BuildRequires:	check >= 0.9.4
 BuildRequires:	dbus-glib-devel >= 0.74
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.16.0
+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
-BuildRequires:	libglade2-devel >= 1:2.6.2
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libtool
 BuildRequires:	libxklavier-devel >= 4.0-2
 BuildRequires:	pam-devel
 BuildRequires:	perl-modules
 BuildRequires:	pkgconfig
-BuildRequires:	polkit-gnome-devel >= 0.92
+BuildRequires:	polkit-devel
+#BuildRequires:	polkit-gnome-devel >= 0.92
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	scrollkeeper
+#BuildRequires:	scrollkeeper
 BuildRequires:	xorg-lib-libXdmcp-devel
 BuildRequires:	xorg-lib-libXi-devel
 BuildRequires:	xorg-lib-libXinerama-devel
-BuildRequires:	xorg-lib-libdmx-devel
-Requires(post,preun):	GConf2
+#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,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:	/usr/bin/Xorg
-Requires:	gnome-session >= 2.24.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.92
+Requires:	polkit-gnome >= 0.93
 Requires:	which
 Requires:	xorg-app-sessreg
 Requires:	xorg-app-xmodmap
@@ -151,7 +150,7 @@ Skrypt init dla GDM-a.
 Summary:	GNOME applet for fast user switching
 Summary(pl.UTF-8):	Aplet GNOME do szybkiego przełączania użytkowników
 Group:		X11/Applications
-Requires:	gdm >= 2:2.22.0
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Provides:	gnome-applet-fast-user-switch = %{epoch}:%{version}-%{release}
 Obsoletes:	gnome-applet-fast-user-switch
 
@@ -168,9 +167,10 @@ do przełączania między użytkownikami.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch4 -p1
-%patch5 -p1
+%patch3 -p1
 rm -f data/gdm.schemas.in
+sed -i 's/^en@shaw//' po/LINGUAS
+rm po/en@shaw.po
 
 %build
 %{__libtoolize}
@@ -183,6 +183,7 @@ rm -f data/gdm.schemas.in
 %configure \
 	--disable-console-helper \
 	--disable-scrollkeeper \
+	--disable-silent-rules \
 	--with-console-kit \
 	--enable-authentication-scheme=pam \
 	--with-pam-prefix=/etc \
@@ -291,14 +292,13 @@ fi
 %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(1770,root,xdm) %{_localstatedir}/gdm
-%attr(1755,root,xdm) %{_localstatedir}/cache/gdm
-%attr(1770,root,xdm) %dir %{_localstatedir}/lib/gdm
-%attr(1750,root,xdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
-%attr(1640,root,xdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/*.xml
-%attr(644,root,xdm) %{_localstatedir}/lib/gdm/.gconf.path
-%attr(750,xdm,xdm) %{_localstatedir}/log/gdm
-%attr(1777,root,xdm) %{_localstatedir}/run/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