commit xorg-x11 for openSUSE:11.4
Hello community, here is the log from the commit of package xorg-x11 for openSUSE:11.4 checked in at Tue Jan 3 01:25:55 CET 2012. -------- --- old-versions/11.4/UPDATES/all/xorg-x11/xorg-x11.changes 2011-04-05 19:05:10.000000000 +0200 +++ 11.4/xorg-x11/xorg-x11.changes 2012-01-02 10:52:33.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 2 09:51:41 UTC 2012 - sndirsch@suse.com + +- Add ntp service to should-start in /etc/init.d/xdm in file + xdm.tar.bz2 to prevent conflict between kdm3 and ntp (bnc#728846) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.2o9rDO/_old 2012-01-03 01:25:34.000000000 +0100 +++ /var/tmp/diff_new_pack.2o9rDO/_new 2012-01-03 01:25:34.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ BuildRequires: bison Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 43.<RELEASE44> +Release: 43.<RELEASE46> License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -292,6 +292,8 @@ %patch69 -p0 %patch674733 -p1 popd +#make checkscript happy +#patch20 %build ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/init.d/xdm new/etc/init.d/xdm --- old/etc/init.d/xdm 2011-02-02 12:34:51.000000000 +0100 +++ new/etc/init.d/xdm 2012-01-02 10:51:00.000000000 +0100 @@ -15,8 +15,8 @@ # Provides: xdm # Required-Start: $remote_fs dbus # Required-Stop: $remote_fs -# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid -# Should-Stop: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid +# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid ntp +# Should-Stop: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid ntp # Default-Start: 5 # Default-Stop: # Description: X Display Manager continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de