Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Thu May 26 10:00:19 CEST 2011.
-------- --- xorg-x11/xorg-x11.changes 2011-04-08 16:18:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-05-19 12:44:05.000000000 +0200 @@ -1,0 +2,31 @@ +Thu May 19 10:41:32 UTC 2011 - [email protected] + +- edit s390/s390x sysconfig template in place instead of applying + a patch. + +------------------------------------------------------------------- +Thu May 19 10:01:29 UTC 2011 - [email protected] + +- remove xrdb.diff (bnc#149007) as this is also adressed by + xrdb-Create-shell-escape-safe-cpp-options-in-the-non-path-bnc674733.patch + which has been included in upstream already and can also be removed + once the xrdb package got updated. + +------------------------------------------------------------------- +Thu May 19 09:58:09 UTC 2011 - [email protected] + +- remove xfs-no_config_file.diff as this no longer needed since + commit b0c41c11 which is included in xfs-1.1.1. + +------------------------------------------------------------------- +Thu May 19 09:54:47 UTC 2011 - [email protected] + +- remove xrx.diff patch as the function has the correct type already. + +------------------------------------------------------------------- +Fri May 6 14:55:34 UTC 2011 - [email protected] + +- etc/X11/xdm/sys.xsession: do not start gpg-agent with GNOME3 as + WM since the GPG agent feature is now integrated + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xdm.diff xfs-no_config_file.diff xrdb.diff xrx.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.t0WYrC/_old 2011-05-26 09:56:40.000000000 +0200 +++ /var/tmp/diff_new_pack.t0WYrC/_new 2011-05-26 09:56:40.000000000 +0200 @@ -34,7 +34,7 @@ BuildRequires: bison Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 51 +Release: 53 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -153,12 +153,9 @@ Patch5: x11perf.diff Patch7: xinit.diff Patch8: xsm.diff -Patch10: xrx.diff Patch19: scripts.diff -Patch20: xdm.diff Patch24: xauth-1.0.2.diff Patch46: xfd.diff -Patch47: xfs-no_config_file.diff Patch48: mkfontscale-skip_symlinks.diff Patch54: xinit-client-session.patch Patch56: xdm-consolekit.diff @@ -168,7 +165,6 @@ Patch65: xdm-tolerant-hostname-changes.diff Patch66: xinit-suse.diff Patch67: xinit-tolerant-hostname-changes.diff -Patch68: xrdb.diff Patch69: xrdb-traditional-cpp.diff Patch674733: xrdb-Create-shell-escape-safe-cpp-options-in-the-non-path-bnc674733.patch @@ -279,9 +275,6 @@ pushd xsm-* %patch8 popd -pushd xrx-* -%patch10 -popd pushd xauth-* %patch24 %patch63 -p1 @@ -292,9 +285,6 @@ pushd scripts-* %patch19 -p0 popd -pushd xfs-* -%patch47 -p0 -popd pushd mkfontscale-* %patch48 -p1 popd @@ -307,7 +297,6 @@ %patch62 -p1 popd pushd xrdb-* -%patch68 -p2 %patch69 -p0 %patch674733 -p1 popd @@ -385,8 +374,9 @@ pushd "${RPM_BUILD_ROOT}" %{__tar} xjf '%{S:202}' %ifarch s390 s390x - %{__patch} -p0 -s < '%{P:20}' - %{__rm} -f var/adm/fillup-templates/sysconfig.displaymanager.orig + %{__sed} -i "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"yes\"+g" \ + "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"no\"+g" \ + var/adm/fillup-templates/sysconfig.displaymanager %endif popd # Correct location (FHS-2.1) ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/sys.xsession new/etc/X11/xdm/sys.xsession --- old/etc/X11/xdm/sys.xsession 2011-03-28 10:21:34.000000000 +0200 +++ new/etc/X11/xdm/sys.xsession 2011-05-06 16:54:25.000000000 +0200 @@ -58,6 +58,20 @@ fi # +# No gpg-agent if a gpg session is already provided by an other agent. +# +if test "$usegpg" = yes -a -n "$GNOME_KEYRING_PID" ; then + case "${WINDOWMANAGER##*/}" in + gnome*) + # gnome-keyring provides a gpg agent starting with GNOME 3 (the + # gnome-version.xml file only exists in GNOME 3) + if test -d "$GNOME_KEYRING_CONTROL" -a -f "/usr/share/gnome/gnome-version.xml"; then + usegpg=no + fi + esac +fi + +# # Run ssh-agent only if ssh service is configured and avaliable. # Check if there is already a running ssh-agent and if use this. # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
