From 4c2e49ceaab75a407228e96defdfb2f68f29cff48a789442177edcd783d9e1ce Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 27 Apr 2007 14:44:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=15 --- gdm.changes | 5 +++++ gdm.spec | 18 ++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/gdm.changes b/gdm.changes index 41c6fb8..ba5da2e 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 27 12:32:12 CEST 2007 - sbrabec@suse.cz + +- Do not call meinproc (#227624). + ------------------------------------------------------------------- Wed Apr 11 12:36:15 CDT 2007 - maw@suse.de diff --git a/gdm.spec b/gdm.spec index d2a8925..c765821 100644 --- a/gdm.spec +++ b/gdm.spec @@ -11,7 +11,7 @@ # norootforbuild Name: gdm -BuildRequires: docbook_4 gnome-common gnome-doc-utils-devel gnome-patch-translation gnutls-devel intltool kdelibs3-doc libglade2-devel libgnomeprintui-devel libgnomeui-devel librsvg-devel libwnck-devel mDNSResponder-devel pam-devel perl-XML-Parser pwdutils scrollkeeper tcpd-devel update-desktop-files xorg-x11-server zenity +BuildRequires: docbook_4 gnome-common gnome-doc-utils-devel gnome-patch-translation gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel librsvg-devel libwnck-devel mDNSResponder-devel pam-devel perl-XML-Parser pwdutils scrollkeeper tcpd-devel update-desktop-files xorg-x11-server zenity # only for directory ownership: BuildRequires: gnome-icon-theme PreReq: /usr/sbin/groupadd @@ -23,9 +23,8 @@ PreReq: %fillup_prereq PreReq: %insserv_prereq License: GNU General Public License (GPL) Group: System/GUI/GNOME -Autoreqprov: on Version: 2.18.1 -Release: 1 +Release: 5 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -36,7 +35,7 @@ Source4: init.earlygdm Source5: sysconfig.displaymanager-gdm Patch: gdm-conf.patch Patch2: gdm-bash-profile.patch -Patch3: gdm-language-dialog-size.patch +Patch3: gdm-language-dialog-size.patch Patch4: gdm-logdir.patch Patch5: gdm-xdm-sessions.patch Patch9: gdm-presession-kde-path.patch @@ -83,7 +82,7 @@ Authors: %setup gnome-patch-translation-prepare %patch -p1 -%patch2 -p1 +%patch2 -p1 %patch3 -p1 %patch4 %patch5 -p1 @@ -113,7 +112,7 @@ autoreconf -f -i # gdm-2.16.1: greeter_canvas_text.c:98: warning: dereferencing type-punned pointer will break strict-aliasing rules export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" # FIXME: Build as root modifies system! -# gdm-2.16.1: --disable-scrollkeeper does not work properly. +# gdm-2.16.1: --disable-scrollkeeper does not work properly. %configure\ --libexecdir=%{_prefix}/lib/gdm\ --localstatedir=%{_localstatedir}/lib\ @@ -123,7 +122,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" make %{?jobs:-j%jobs} %install -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall # Remove wrapper, it is not needed. mv $RPM_BUILD_ROOT%{_sbindir}/gdm-binary $RPM_BUILD_ROOT%{_sbindir}/gdm # Install PAM files and remove examples. @@ -147,9 +146,6 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/gdm/gdm_sysconfig.conf rm $RPM_BUILD_ROOT%{_datadir}/xsessions/ssh.desktop rm $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop rmdir $RPM_BUILD_ROOT%{_sysconfdir}/dm -for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/gdm/*/gdm.xml; do - meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || : -done %suse_update_desktop_file gdmsetup SystemSetup %suse_update_desktop_file -G "" gdmphotosetup SystemSetup %suse_update_desktop_file -G "" gdmflexiserver RemoteAccess @@ -230,6 +226,8 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i %endif %changelog +* Fri Apr 27 2007 - sbrabec@suse.cz +- Do not call meinproc (#227624). * Wed Apr 11 2007 - maw@suse.de - Update to version 2.18.1 - The GDM configuration option daemon/PidFile is now deprecated and