|
|
@@ -14,7 +14,7 @@ Summary: The GNOME Display Manager.
|
|
|
Summary(ja): GNOME ディスプレイマネージャ
|
|
|
Name: gdm
|
|
|
Version: 2.30.2
|
|
|
-Release: 3%{?_dist_release}
|
|
|
+Release: 4%{?_dist_release}
|
|
|
License: LGPL/GPL
|
|
|
Group: User Interface/X
|
|
|
URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm/
|
|
|
@@ -27,6 +27,10 @@ Source10: polkit-gnome-authentication-agent-1.desktop
|
|
|
Source110: gnome.desktop
|
|
|
Source130: gdm-2.30.2-ja.po
|
|
|
|
|
|
+Source200: gdm-restart
|
|
|
+Source201: gdm-safe-restart
|
|
|
+Source202: gdm-stop
|
|
|
+
|
|
|
## patches from fedora
|
|
|
Patch2: plymouth.patch
|
|
|
#Patch96: gdm-multistack.patch
|
|
|
@@ -35,13 +39,16 @@ Patch97: gdm-bubble-location.patch
|
|
|
Patch98: tray-padding.patch
|
|
|
|
|
|
## patches from ubuntu
|
|
|
+Patch100: 01_upower.patch
|
|
|
Patch101: gdm-2.30.0-check-active-vt.patch
|
|
|
Patch102: gdm-2.30.2-use-polkit-for-settings.patch
|
|
|
Patch103: gdm-2.30.0-gdmsetup.patch
|
|
|
Patch104: gdm-2.30.0-hide-mouse-cursor.patch
|
|
|
+Patch105: 02_x_server_location.patch
|
|
|
|
|
|
## patches for vine
|
|
|
Patch500: gdm-2.30.2-vine-release.patch
|
|
|
+Patch501: gdm-2.30.2_add_dbus_glib_to_applet_deps.patch
|
|
|
#Patch500: gdm-2.20.10-vine.patch
|
|
|
#Patch501: gdm-2.20.8-gdmsetup-usermode.patch
|
|
|
#Patch510: gdm-2.18.1-vine-locale.patch
|
|
|
@@ -80,6 +87,14 @@ BuildRequires: libtool, automake, autoconf
|
|
|
BuildRequires: ConsoleKit
|
|
|
BuildRequires: libdmx-devel, audit-libs-devel
|
|
|
BuildRequires: libcanberra-devel
|
|
|
+BuildRequires: polkit-devel
|
|
|
+BuildRequires: gnome-panel-devel
|
|
|
+BuildRequires: libxklavier-devel
|
|
|
+BuildRequires: upower-devel
|
|
|
+BuildRequires: libXdmcp-devel
|
|
|
+BuildRequires: check-devel
|
|
|
+BuildRequires: libICE-devel
|
|
|
+BuildRequires: gnome-doc-utils
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
@@ -100,12 +115,15 @@ cp -f %{SOURCE130} po/ja.po
|
|
|
#%patch96 -p1 -b .multistack
|
|
|
%patch97 -p1 -b .bubble-location
|
|
|
%patch98 -p1 -b .tray-padding
|
|
|
+%patch100 -p1 -b .upower
|
|
|
%patch101 -p1 -b .check-active-vt
|
|
|
%patch102 -p1 -b .polkit
|
|
|
%patch103 -p1 -b .gdmsetup
|
|
|
%patch104 -p1 -b .hide-mouse-cursor
|
|
|
+%patch105 -p1 -b .xserver
|
|
|
|
|
|
%patch500 -p1 -b .vine-release
|
|
|
+%patch501 -p1 -b .dbus-glib
|
|
|
|
|
|
autoreconf -i -f
|
|
|
|
|
|
@@ -116,6 +134,7 @@ cp -f %{SOURCE2} data/gdm-autologin
|
|
|
%configure --with-sysconfsubdir=X11/gdm \
|
|
|
--with-dmconfdir=%{_sysconfdir}/X11/dm \
|
|
|
--with-pam-prefix=%{_sysconfdir} \
|
|
|
+ --with-working-directory=%{_localstatedir}/gdm \
|
|
|
--enable-console-helper \
|
|
|
--disable-scrollkeeper \
|
|
|
--with-console-kit \
|
|
|
@@ -184,6 +203,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdmsimplegreeter.pc
|
|
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
|
|
|
cp %{SOURCE110} $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/
|
|
|
|
|
|
+install -m 0755 %{SOURCE200} %{SOURCE201} %{SOURCE202} $RPM_BUILD_ROOT%{_sbindir}/
|
|
|
+
|
|
|
%find_lang gdm
|
|
|
|
|
|
%clean
|
|
|
@@ -251,7 +272,6 @@ if [ $1 -ge 2 ] ; then
|
|
|
-e 's@^DisplayInitDir=/var/run/gdm.pid@#&@' \
|
|
|
-e 's@^RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot@#&@' \
|
|
|
-e 's@^HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff@#&@' \
|
|
|
- -e 's@^ServAuthDir=/var/lib/gdm@#&@' \
|
|
|
-e 's@^ServAuthDir=/var/gdm@#&@' \
|
|
|
-e 's@^Greeter=/usr/bin/gdmlogin@Greeter=/usr/libexec/gdmlogin@' \
|
|
|
-e 's@^RemoteGreeter=/usr/bin/gdmgreeter@RemoteGreeter=/usr/libexec/gdmgreeter@' \
|
|
|
@@ -259,7 +279,6 @@ if [ $1 -ge 2 ] ; then
|
|
|
fi
|
|
|
|
|
|
/usr/sbin/gdm-safe-restart >/dev/null 2>&1 || :
|
|
|
-
|
|
|
exit 0
|
|
|
|
|
|
%preun
|
|
|
@@ -321,15 +340,23 @@ fi
|
|
|
%dir %{_var}/spool/gdm
|
|
|
%dir %{_var}/run/gdm/greeter
|
|
|
|
|
|
-%attr(1770, gdm, gdm) %dir %{_localstatedir}/lib/gdm
|
|
|
-%attr(1770, gdm, gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/%gconf-tree.xml
|
|
|
-%attr(1770, gdm, gdm) %{_localstatedir}/lib/gdm/.gconf.path
|
|
|
+%attr(1770, gdm, gdm) %dir %{_localstatedir}/gdm
|
|
|
+%attr(1770, gdm, gdm) %{_localstatedir}/gdm/.gconf.mandatory/%gconf-tree.xml
|
|
|
+%attr(1770, gdm, gdm) %{_localstatedir}/gdm/.gconf.path
|
|
|
%attr(1755, gdm, gdm) %dir %{_localstatedir}/run/gdm/greeter
|
|
|
-%attr(1770, root, gdm) %dir %{_localstatedir}/gdm
|
|
|
%attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm
|
|
|
%attr(1755, root, gdm) %dir %{_localstatedir}/cache/gdm
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Oct 16 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.30.2-4
|
|
|
+- add BuildRequires: polkit-devel, gnome-panel-devel, libxklavier-devel, upower-devel,
|
|
|
+ libXdmcp-devel, gnome-doc-utils, libICE-devel
|
|
|
+- add Patch100 (01_upower.patch) from ubuntu
|
|
|
+- add Patch105 (02_x_server_location.patch) from ubuntu
|
|
|
+- add Patch501 (gdm-2.30.2_add_dbus_glib_to_applet_deps.patch)
|
|
|
+- add configure option (--with-working-directory=%%{_localstatedir}/gdm)
|
|
|
+- fix %files (fix working directory)
|
|
|
+
|
|
|
* Sun May 23 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.30.0-3
|
|
|
- fix patch500: fix login panel crash on x86_64 (<BTS:992>)
|
|
|
|
Takemikaduchi