From 8c86478af7ae1575bbb84881004effee62b31695 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 05:02:45 +0000 Subject: auto-import gdm-2.2.3.1-22 from gdm-2.2.3.1-22.src.rpm --- diff --git a/gdm.spec b/gdm.spec index a9bbfae..9f85c33 100644 --- a/gdm.spec +++ b/gdm.spec @@ -4,7 +4,7 @@ Summary: The GNOME Display Manager. Name: gdm Version: 2.2.3.1 -Release: 21 +Release: 22 Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -13,6 +13,7 @@ Source1: Gnome.session Source2: Default.session Source5: Failsafe.session Source6: gdm-pofiles.tar.gz +Source7: gdm-2.3.90.1-locale.alias Patch1: gdm-2.2.3.1-rhconfig.patch Patch2: gdm-2.2.3.1-formatstrings.patch @@ -20,10 +21,6 @@ Patch3: gdm-2.2.3.1-sessionsel.patch # Set RUNNING_UNDER_GDM when running the display init script Patch4: gdm-2.2.3.1-runningunder.patch Patch5: gdm-2.2.3.1-pamcfg.patch -Patch6: gdm-2.2.3.1-ukrainian.patch - -## a couple of security backports from GNOME 2.4 -Patch19: gdm-2.4.1.3-crash.patch BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root @@ -59,18 +56,17 @@ tar zxf %{SOURCE6} %patch3 -p1 -b .sessionsel %patch4 -p1 -b .runningunder %patch5 -p1 -b .pamcfg -%patch6 -p1 -b .ukrainian -%patch19 -p1 -b .crash +rm config/locale.alias && cp %{SOURCE7} config/locale.alias %build -%configure --prefix=%prefix --sysconfdir=/etc/X11 --with-pam-prefix=$RPM_BUILD_ROOT/etc --localstatedir=/var --enable-console-helper +%configure --prefix=%prefix --sysconfdir=%{_sysconfdir}/X11 --with-pam-prefix=$RPM_BUILD_ROOT%{_sysconfdir} --localstatedir=/var --enable-console-helper make %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT - +## can't use makeinstall due to /etc/X11 make sysconfdir=$RPM_BUILD_ROOT/etc/X11 \ prefix=$RPM_BUILD_ROOT%{_prefix} bindir=$RPM_BUILD_ROOT%{_bindir} \ datadir=$RPM_BUILD_ROOT%{_datadir} \ @@ -81,22 +77,25 @@ make sysconfdir=$RPM_BUILD_ROOT/etc/X11 \ rm -rf $RPM_BUILD_ROOT/%{prefix}/doc # install RH specific session files -rm -f $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/* +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions/* -install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/Gnome -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/Default -install -m 755 %{SOURCE5} $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/Failsafe -ln -sf Default $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/default +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions/Gnome +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions/Default +install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions/Failsafe +ln -sf Default $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions/default # put gnomerc in the right place -install -m 644 config/gnomerc $RPM_BUILD_ROOT/etc/X11/gdm/gnomerc +install -m 644 config/gnomerc $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/gnomerc # change default Init script to be Red Hat default -ln -sf ../../xdm/Xsetup_0 $RPM_BUILD_ROOT/etc/X11/gdm/Init/Default +ln -sf ../../xdm/Xsetup_0 $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Init/Default # create log dir mkdir -p $RPM_BUILD_ROOT/var/log/gdm +# make symlink from gdmconfig to consolehelper relative +(cd $RPM_BUILD_ROOT%{_bindir} && rm gdmconfig && ln -s consolehelper gdmconfig) + %find_lang %name %clean @@ -122,23 +121,23 @@ scrollkeeper-update %doc AUTHORS COPYING ChangeLog NEWS README -%dir /etc/X11/gdm -%config /etc/X11/gdm/gdm.conf -/etc/X11/gdm/factory-gdm.conf -%config /etc/X11/gdm/XKeepsCrashing -%config /etc/X11/gdm/locale.alias -%config /etc/X11/gdm/Sessions/* -%config /etc/X11/gdm/Init/* -%config /etc/X11/gdm/PreSession/* -%config /etc/X11/gdm/PostSession/* -%config /etc/X11/gdm/gnomerc -%config /etc/pam.d/gdm -%config /etc/pam.d/gdmconfig -%config /etc/security/console.apps/gdmconfig -%dir /etc/X11/gdm/Sessions -%dir /etc/X11/gdm/Init -%dir /etc/X11/gdm/PreSession -%dir /etc/X11/gdm/PostSession +%dir %{_sysconfdir}/X11/gdm +%config %{_sysconfdir}/X11/gdm/gdm.conf +%{_sysconfdir}/X11/gdm/factory-gdm.conf +%config %{_sysconfdir}/X11/gdm/XKeepsCrashing +%config %{_sysconfdir}/X11/gdm/locale.alias +%config %{_sysconfdir}/X11/gdm/Sessions/* +%config %{_sysconfdir}/X11/gdm/Init/* +%config %{_sysconfdir}/X11/gdm/PreSession/* +%config %{_sysconfdir}/X11/gdm/PostSession/* +%config %{_sysconfdir}/X11/gdm/gnomerc +%config %{_sysconfdir}/pam.d/gdm +%config %{_sysconfdir}/pam.d/gdmconfig +%config %{_sysconfdir}/security/console.apps/gdmconfig +%dir %{_sysconfdir}/X11/gdm/Sessions +%dir %{_sysconfdir}/X11/gdm/Init +%dir %{_sysconfdir}/X11/gdm/PreSession +%dir %{_sysconfdir}/X11/gdm/PostSession %{_datadir}/pixmaps/gdm.xpm %{_datadir}/pixmaps/nobody.png %{_datadir}/pixmaps/nohost.png @@ -155,8 +154,14 @@ scrollkeeper-update %attr(750, gdm, gdm) %dir %{_localstatedir}/gdm %changelog -* Wed Aug 13 2003 Havoc Pennington -- fix a security issue CAN-2003-0547 bugzilla #102275 +* Mon Apr 15 2002 Havoc Pennington +- merge translations + +* Fri Mar 1 2002 Havoc Pennington +- fix upstream locale.alias, then add a copy of it as a Source, fixes + #57928 and #55492 +- fix some /usr/bin -> bindir sort of stuff using my handy script +- fix rpmlint #56813 * Tue Sep 4 2001 Havoc Pennington - fix #52997 (ukrainian in language list) @@ -415,7 +420,7 @@ scrollkeeper-update - added jrb's patch to disable stars in passwd entry field * Fri Mar 19 1999 Michael Fulbright -- made sure /usr/bin isnt in default path twice +- made sure %{_bindir} isnt in default path twice - strip binaries * Wed Mar 17 1999 Michael Fulbright @@ -446,7 +451,7 @@ scrollkeeper-update - moved /usr/var/gdm /var/gdm * Thu Feb 25 1999 Michael Fulbright -- moved files from /usr/etc to /etc +- moved files from /usr%{_sysconfdir} to %{_sysconfdir} * Tue Feb 16 1999 Michael Johnson - removed commented-out #1 definition -- put back after testing gnome-libs diff --git a/sources b/sources index 19669f1..6f282ce 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ cae9bf25d6fd19746af5aff843b34254 gdm-2.2.3.1.tar.gz -4fdeab1705c9b3a23c332c5a87379f66 gdm-pofiles.tar.gz +7ad90af60c8540fd9f00e90184c1f751 gdm-pofiles.tar.gz