commit xorg-x11 for openSUSE:Factory
Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at 2013-10-23 10:15:09 Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old) and /work/SRC/openSUSE:Factory/.xorg-x11.new (New) Package is xorg-x11 Changes: --- /work/SRC/openSUSE:Factory/xorg-x11/xorg-x11.changes2013-10-14 14:33:28.0 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11.new/xorg-x11.changes 2013-10-23 10:15:10.0 +0200 @@ -1,0 +2,6 @@ +Tue Oct 22 13:02:58 UTC 2013 - sndir...@suse.com + +- let -essentials package also require xkbcomp, xmessage and xprop + (bnc#846953) + +--- Other differences: -- ++ xorg-x11.spec ++ --- /var/tmp/diff_new_pack.0PcWFP/_old 2013-10-23 10:15:16.0 +0200 +++ /var/tmp/diff_new_pack.0PcWFP/_new 2013-10-23 10:15:16.0 +0200 @@ -69,7 +69,6 @@ Recommends: xgc Recommends: xhost Recommends: xinput -Recommends: xkbcomp Recommends: xkbevd Recommends: xkbprint Recommends: xkbutils @@ -81,13 +80,11 @@ Recommends: xlsfonts Recommends: xmag Recommends: xman -Recommends: xmessage Recommends: xmore Recommends: xorg-scripts Recommends: xplsprinters Recommends: xpr Recommends: xprehashprinterlist -Recommends: xprop Recommends: xrandr Recommends: xrefresh Recommends: xrestop @@ -132,7 +129,10 @@ Requires: xconsole Requires: xdm Requires: xinit +Requires: xkbcomp +Requires: xmessage Requires: xmodmap +Requires: xprop Requires: xrdb Requires: xset Requires: xsetroot -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at 2013-10-14 14:33:27 Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old) and /work/SRC/openSUSE:Factory/.xorg-x11.new (New) Package is xorg-x11 Changes: --- /work/SRC/openSUSE:Factory/xorg-x11/xorg-x11.changes2013-08-30 11:52:22.0 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11.new/xorg-x11.changes 2013-10-14 14:33:28.0 +0200 @@ -1,0 +2,6 @@ +Mon Oct 14 08:45:38 UTC 2013 - sndir...@suse.com + +- let -essentials package also require xset and iceauth + (bnc#845264) + +--- Other differences: -- ++ xorg-x11.spec ++ --- /var/tmp/diff_new_pack.V7OmUi/_old 2013-10-14 14:33:33.0 +0200 +++ /var/tmp/diff_new_pack.V7OmUi/_new 2013-10-14 14:33:33.0 +0200 @@ -29,7 +29,6 @@ Recommends: fonttosfnt Recommends: fslsfonts Recommends: fstobdf -Recommends: iceauth Recommends: ico Recommends: lbxproxy Recommends: listres @@ -94,7 +93,6 @@ Recommends: xrestop Recommends: xrx Recommends: xscope -Recommends: xset Recommends: xsetmode Recommends: xsetpointer Recommends: xsm @@ -124,6 +122,7 @@ Summary:Compatibility metapackage for X.Org core applications Group: System/X11/Utilities ## Requires of packages that we split away from xorg-x11 +Requires: iceauth Requires: mkfontdir Requires: mkfontscale Requires: rgb @@ -135,6 +134,7 @@ Requires: xinit Requires: xmodmap Requires: xrdb +Requires: xset Requires: xsetroot ## End Requires of packages that we split away from xorg-x11 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at 2013-08-30 11:52:21 Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old) and /work/SRC/openSUSE:Factory/.xorg-x11.new (New) Package is xorg-x11 Changes: --- /work/SRC/openSUSE:Factory/xorg-x11/xorg-x11.changes2013-08-04 23:52:17.0 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11.new/xorg-x11.changes 2013-08-30 11:52:22.0 +0200 @@ -1,0 +2,12 @@ +Thu Aug 29 08:56:55 UTC 2013 - sndir...@suse.com + +- reverted previous change; requires for xbitmaps-devel needs to + be added to libXmu instead (bnc#836530) + +--- +Tue Aug 27 06:38:11 UTC 2013 - sndir...@suse.com + +- added xbitmaps-devel to Requires for -essential package + (bnc#836530) + +--- Other differences: -- -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at 2013-08-04 17:26:38
Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11.new (New)
Package is xorg-x11
Changes:
--- /work/SRC/openSUSE:Factory/xorg-x11/xorg-x11.changes2012-12-28
22:51:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.xorg-x11.new/xorg-x11.changes 2013-08-04
23:52:17.0 +0200
@@ -1,0 +2,8 @@
+Fri Aug 2 13:19:32 UTC 2013 - sndir...@suse.com
+
+- split off -essentials package for X.Org core apps (meta package
+ for required packages); recommends remain in xorg-x11 meta
+ package; this allows minimum X11 patterns in a consistent way
+ (request by Coolo)
+
+---
Other differences:
--
++ xorg-x11.spec ++
--- /var/tmp/diff_new_pack.7wEkzm/_old 2013-08-04 23:52:18.0 +0200
+++ /var/tmp/diff_new_pack.7wEkzm/_new 2013-08-04 23:52:18.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xorg-x11
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -20,7 +20,7 @@
Url:http://xorg.freedesktop.org/
Version:7.6_1
Release:0
-## Requires/Recommends of packages that we split away from xorg-x11
+## Recommends of packages that we split away from xorg-x11
Recommends: appres
Recommends: bdftopcf
Recommends: beforelight
@@ -35,21 +35,15 @@
Recommends: listres
Recommends: luit
Recommends: mkcomposecache
-Requires: mkfontdir
-Requires: mkfontscale
Recommends: oclock
Recommends: proxymngr
Recommends: rendercheck
-Requires: rgb
Recommends: rstart
-Requires: sessreg
-Requires: setxkbmap
Recommends: showfont
Recommends: smproxy
Recommends: twm
Recommends: viewres
Recommends: x11perf
-Requires: xauth
Recommends: xbacklight
Recommends: xbiff
Recommends: xcalc
@@ -57,12 +51,10 @@
Recommends: xclock
Recommends: xcmsdb
Recommends: xcompmgr
-Requires: xconsole
Recommends: xcursor-themes
Recommends: xcursorgen
Recommends: xdbedizzy
Recommends: xditview
-Requires: xdm
Recommends: xdpyinfo
Recommends: xedit
Recommends: xev
@@ -77,7 +69,6 @@
Recommends: xgamma
Recommends: xgc
Recommends: xhost
-Requires: xinit
Recommends: xinput
Recommends: xkbcomp
Recommends: xkbevd
@@ -92,7 +83,6 @@
Recommends: xmag
Recommends: xman
Recommends: xmessage
-Requires: xmodmap
Recommends: xmore
Recommends: xorg-scripts
Recommends: xplsprinters
@@ -100,7 +90,6 @@
Recommends: xprehashprinterlist
Recommends: xprop
Recommends: xrandr
-Requires: xrdb
Recommends: xrefresh
Recommends: xrestop
Recommends: xrx
@@ -108,7 +97,6 @@
Recommends: xset
Recommends: xsetmode
Recommends: xsetpointer
-Requires: xsetroot
Recommends: xsm
Recommends: xstdcmap
Recommends: xtrap
@@ -117,9 +105,10 @@
Recommends: xwd
Recommends: xwininfo
Recommends: xwud
-## End Requires of packages that we split away from xorg-x11
+## End Recommends of packages that we split away from xorg-x11
+Requires: xorg-x11-essentials
Provides: XFree86
-Summary:Compatibility metapackage for X.Org core and sample
applications
+Summary:Compatibility metapackage for X.Org sample applications
License:MIT
Group: System/X11/Utilities
Source0:README.meta
@@ -129,7 +118,29 @@
%description
This package is a compatibility metapackage. It used to contain the
-X.Org core and sample applications.
+X.Org sample applications.
+
+%package essentials
+Summary:Compatibility metapackage for X.Org core applications
+Group: System/X11/Utilities
+## Requires of packages that we split away from xorg-x11
+Requires: mkfontdir
+Requires: mkfontscale
+Requires: rgb
+Requires: sessreg
+Requires: setxkbmap
+Requires: xauth
+Requires: xconsole
+Requires: xdm
+Requires: xinit
+Requires: xmodmap
+Requires: xrdb
+Requires: xsetroot
+## End Requires of packages that we split away from xorg-x11
+
+%description essentials
+This package is a compatibility metapackage. It requires the
+X.Org core applications packages.
%prep
%setup -q -T -c '%{name}'
@@ -151,6 +162,9 @@
commit xorg-x11 for openSUSE:Factory
Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at 2012-12-28 22:51:42 Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old) and /work/SRC/openSUSE:Factory/.xorg-x11.new (New) Package is xorg-x11, Maintainer is sndir...@suse.com Changes: --- /work/SRC/openSUSE:Factory/xorg-x11/xorg-x11.changes2012-06-28 17:22:29.0 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11.new/xorg-x11.changes 2012-12-28 22:51:44.0 +0100 @@ -1,0 +2,5 @@ +Wed Dec 26 23:28:44 UTC 2012 - mike.catanz...@gmail.com + +- Don't require twm; it is still recommended. + +--- Other differences: -- ++ xorg-x11.spec ++ --- /var/tmp/diff_new_pack.gIGomw/_old 2012-12-28 22:51:44.0 +0100 +++ /var/tmp/diff_new_pack.gIGomw/_new 2012-12-28 22:51:44.0 +0100 @@ -46,7 +46,7 @@ Requires: setxkbmap Recommends: showfont Recommends: smproxy -Requires: twm +Recommends: twm Recommends: viewres Recommends: x11perf Requires: xauth ++ README.meta ++ --- /var/tmp/diff_new_pack.gIGomw/_old 2012-12-28 22:51:44.0 +0100 +++ /var/tmp/diff_new_pack.gIGomw/_new 2012-12-28 22:51:44.0 +0100 @@ -4,7 +4,7 @@ appres bdftopcf beforelight bitmap editres fonttosfnt fslsfonts fstobdf iceauth ico lbxproxy listres luit mkcomposecache mkfontdir mkfontscale oclock - proxymngr rendercheck rgb rstart sessreg setxkbmap showfont smproxy twm + proxymngr rendercheck rgb rstart sessreg setxkbmap showfont smproxy viewres x11perf xauth xbacklight xbiff xcalc xclipboard xclock xcmsdb xcompmgr xconsole xcursor-themes xcursorgen xdbedizzy xditview xdm xdpyinfo xedit xev xeyes xf86dga xfd xfindproxy xfontsel xfs xfsinfo xfwp xgamma xgc -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at 2012-06-28 17:22:28 Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old) and /work/SRC/openSUSE:Factory/.xorg-x11.new (New) Package is xorg-x11, Maintainer is sndir...@suse.com Changes: --- /work/SRC/openSUSE:Factory/xorg-x11/xorg-x11.changes2012-06-14 22:53:28.0 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11.new/xorg-x11.changes 2012-06-28 17:22:29.0 +0200 @@ -1,0 +2,6 @@ +Tue Jun 26 09:39:37 UTC 2012 - sndir...@suse.com + +- require only a few packages, the remaining packages are still + recommended + +--- Other differences: -- ++ xorg-x11.spec ++ --- /var/tmp/diff_new_pack.g8Jcay/_old 2012-06-28 17:22:30.0 +0200 +++ /var/tmp/diff_new_pack.g8Jcay/_new 2012-06-28 17:22:30.0 +0200 @@ -20,103 +20,103 @@ Url:http://xorg.freedesktop.org/ Version:7.6_1 Release:0 -## Requires of packages that we split away from xorg-x11 -Requires: appres -Requires: bdftopcf -Requires: beforelight -Requires: bitmap -Requires: editres -Requires: fonttosfnt -Requires: fslsfonts -Requires: fstobdf -Requires: iceauth -Requires: ico -Requires: lbxproxy -Requires: listres -Requires: luit -Requires: mkcomposecache +## Requires/Recommends of packages that we split away from xorg-x11 +Recommends: appres +Recommends: bdftopcf +Recommends: beforelight +Recommends: bitmap +Recommends: editres +Recommends: fonttosfnt +Recommends: fslsfonts +Recommends: fstobdf +Recommends: iceauth +Recommends: ico +Recommends: lbxproxy +Recommends: listres +Recommends: luit +Recommends: mkcomposecache Requires: mkfontdir Requires: mkfontscale -Requires: oclock -Requires: proxymngr -Requires: rendercheck +Recommends: oclock +Recommends: proxymngr +Recommends: rendercheck Requires: rgb -Requires: rstart +Recommends: rstart Requires: sessreg Requires: setxkbmap -Requires: showfont -Requires: smproxy +Recommends: showfont +Recommends: smproxy Requires: twm -Requires: viewres -Requires: x11perf +Recommends: viewres +Recommends: x11perf Requires: xauth -Requires: xbacklight -Requires: xbiff -Requires: xcalc -Requires: xclipboard -Requires: xclock -Requires: xcmsdb -Requires: xcompmgr +Recommends: xbacklight +Recommends: xbiff +Recommends: xcalc +Recommends: xclipboard +Recommends: xclock +Recommends: xcmsdb +Recommends: xcompmgr Requires: xconsole -Requires: xcursor-themes -Requires: xcursorgen -Requires: xdbedizzy -Requires: xditview +Recommends: xcursor-themes +Recommends: xcursorgen +Recommends: xdbedizzy +Recommends: xditview Requires: xdm -Requires: xdpyinfo -Requires: xedit -Requires: xev -Requires: xeyes -Requires: xf86dga -Requires: xfd -Requires: xfindproxy -Requires: xfontsel -Requires: xfs -Requires: xfsinfo -Requires: xfwp -Requires: xgamma -Requires: xgc -Requires: xhost +Recommends: xdpyinfo +Recommends: xedit +Recommends: xev +Recommends: xeyes +Recommends: xf86dga +Recommends: xfd +Recommends: xfindproxy +Recommends: xfontsel +Recommends: xfs +Recommends: xfsinfo +Recommends: xfwp +Recommends: xgamma +Recommends: xgc +Recommends: xhost Requires: xinit -Requires: xinput -Requires: xkbcomp -Requires: xkbevd -Requires: xkbprint -Requires: xkbutils -Requires: xkill -Requires: xload -Requires: xlogo -Requires: xlsatoms -Requires: xlsclients -Requires: xlsfonts -Requires: xmag -Requires: xman -Requires: xmessage +Recommends: xinput +Recommends: xkbcomp +Recommends: xkbevd +Recommends: xkbprint +Recommends: xkbutils +Recommends: xkill +Recommends: xload +Recommends: xlogo +Recommends: xlsatoms +Recommends: xlsclients +Recommends: xlsfonts +Recommends: xmag +Recommends: xman +Recommends: xmessage Requires: xmodmap -Requires: xmore -Requires: xorg-scripts -Requires: xplsprinters -Requires: xpr -Requires: xprehashprinterlist -Requires: xprop -Requires: xrandr +Recommends: xmore +Recommends: xorg-scripts +Recommends: xplsprinters
commit xorg-x11 for openSUSE:Factory
Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at 2012-06-14 22:53:26 Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old) and /work/SRC/openSUSE:Factory/.xorg-x11.new (New) Package is xorg-x11, Maintainer is sndir...@suse.com Changes: --- /work/SRC/openSUSE:Factory/xorg-x11/xorg-x11.changes2012-05-08 12:07:33.0 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11.new/xorg-x11.changes 2012-06-14 22:53:28.0 +0200 @@ -1,0 +2,6 @@ +Thu Jun 14 11:50:10 UTC 2012 - seife+...@b1-systems.com + +- do not require xmh, workaround for not being able to uninstall + postfix. The real bug is, that packages require xorg-x11, though + +--- Other differences: -- ++ xorg-x11.spec ++ --- /var/tmp/diff_new_pack.cpMSJG/_old 2012-06-14 22:53:30.0 +0200 +++ /var/tmp/diff_new_pack.cpMSJG/_new 2012-06-14 22:53:30.0 +0200 @@ -92,7 +92,6 @@ Requires: xmag Requires: xman Requires: xmessage -Requires: xmh Requires: xmodmap Requires: xmore Requires: xorg-scripts -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at 2012-02-10 17:21:05
Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11.new (New)
Package is xorg-x11, Maintainer is sndir...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/xorg-x11/xorg-x11.changes2012-01-13
11:00:46.0 +0100
+++ /work/SRC/openSUSE:Factory/.xorg-x11.new/xorg-x11.changes 2012-02-10
17:21:11.0 +0100
@@ -8,0 +9,6 @@
+Tue Jan 10 12:27:25 UTC 2012 - ch...@computersalat.de
+
+- remove AUTHORS from description
+- switch {?jobs:-j%jobs} to {?_smp_mflags}
+
+---
@@ -11,2 +17,9 @@
-- xlsclient 1.1.2
- * fixes build against xcb-util 0.3.8
+- xlsclient 1.1.2 - fixes build against xcb-util 0.3.8
+ * Depend on xcb = 1.6 for XCB_ATOM_*.
+ * Drop dependency on xcb-atom/xcb-util
+ * Use XCB_ATOM_* atom names rather than deprecated atom names
+ * config: move man pages into their own directory
+ * man: replace hard coded man page section with substitution strings
+ * man: remove trailing spaces and tabs
+ * config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+ * Purge cvs tags.
Other differences:
--
++ xorg-x11.spec ++
--- /var/tmp/diff_new_pack.1JFLSi/_old 2012-02-10 17:21:15.0 +0100
+++ /var/tmp/diff_new_pack.1JFLSi/_new 2012-02-10 17:21:15.0 +0100
@@ -15,36 +15,56 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
%define _dminitdir %{_prefix}/lib/X11/displaymanagers
Name: xorg-x11
-BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel
libpng-devel ncurses-devel
+BuildRequires: ConsoleKit-devel
+BuildRequires: fontconfig-devel
+BuildRequires: freetype2-devel
+BuildRequires: libXi6-devel
+BuildRequires: libpng-devel
+BuildRequires: ncurses-devel
%if 0%{?suse_version} = 01140
BuildRequires: aaa_base-extras
%endif
-BuildRequires: pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel
xorg-x11-libICE-devel
-BuildRequires: xorg-x11-libSM-devel xorg-x11-libX11-devel
xorg-x11-libXau-devel xorg-x11-libXdmcp-devel
+BuildRequires: pam-devel
+BuildRequires: pkgconfig
+BuildRequires: rsh
+BuildRequires: update-desktop-files
+BuildRequires: xorg-x11-devel
+BuildRequires: xorg-x11-libICE-devel
+BuildRequires: xorg-x11-libSM-devel
+BuildRequires: xorg-x11-libX11-devel
+BuildRequires: xorg-x11-libXau-devel
+BuildRequires: xorg-x11-libXdmcp-devel
BuildRequires: xorg-x11-libXext-devel
-BuildRequires: xorg-x11-libXfixes-devel xorg-x11-libXmu-devel
xorg-x11-libXp-devel xorg-x11-libXpm-devel
+BuildRequires: xorg-x11-libXfixes-devel
+BuildRequires: xorg-x11-libXmu-devel
+BuildRequires: xorg-x11-libXp-devel
+BuildRequires: xorg-x11-libXpm-devel
BuildRequires: xorg-x11-libXprintUtil-devel
-BuildRequires: xorg-x11-libXrender-devel xorg-x11-libXt-devel
xorg-x11-libXv-devel xorg-x11-libfontenc-devel
+BuildRequires: xorg-x11-libXrender-devel
+BuildRequires: xorg-x11-libXt-devel
+BuildRequires: xorg-x11-libXv-devel
+BuildRequires: xorg-x11-libfontenc-devel
BuildRequires: xorg-x11-libxkbfile-devel
-BuildRequires: fdupes xorg-x11-proto-devel xorg-x11-xtrans-devel
-BuildRequires: bison libtool
+BuildRequires: fdupes
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-xtrans-devel
+BuildRequires: bison
+BuildRequires: libtool
Url:http://xorg.freedesktop.org/
Version:7.6
-Release:61
-License:MIT
+Release:0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Group: System/X11/Utilities
Requires: cpp logrotate
Requires: %{name}-xauth ConsoleKit
Recommends: dbus-1-x11
Provides: XFree86 xcompmgr = 1.1.5 xrestop = 0.4
Obsoletes: xcompmgr 1.1.5 xrestop 0.4
Summary:X.Org core and sample applications
+License:MIT
+Group: System/X11/Utilities
Source0:appres-1.0.3.tar.bz2
Source1:bdftopcf-1.0.3.tar.bz2
Source2:beforelight-1.0.4.tar.bz2
@@ -176,75 +196,15 @@
%description
This package contains the X.Org core and sample applications.
-
-
-Authors:
-
-
-Alan Coopersmith
-Amit Margalit
-Andreas Stolcke
-Bob Scheifler
-Caolan McNamara
-David Reveman
-David Rosenthal
-Dmitry Yu. Bolkhovityanov
-Doug Moran
-Eric Anholt
-Felix Kühling
-Ivan Griffin
-Jim Fulton
-Jim Gettys
-Keith Packard
-Lars Knoll
-Manish Singh
-Matthew Allum
-Matthias Hopf
-Matthieu Herrb OpenBSD Team
-Phil Karlton
-Stephen Gildea
-Werner Fink
-
%package
commit xorg-x11 for openSUSE:Factory
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at 2011-12-06 19:16:45
Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11.new (New)
Package is xorg-x11, Maintainer is sndir...@suse.com
Changes:
Other differences:
--
++ xorg-x11.spec ++
--- /var/tmp/diff_new_pack.eekZmk/_old 2011-12-06 19:57:39.0 +0100
+++ /var/tmp/diff_new_pack.eekZmk/_new 2011-12-06 19:57:39.0 +0100
@@ -36,7 +36,7 @@
Url:http://xorg.freedesktop.org/
Version:7.6
Release:61
-License:MIT License (or similar)
+License:MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
Requires: cpp logrotate
@@ -205,7 +205,7 @@
Werner Fink
%package xauth
-License:MIT License (or similar)
+License:MIT
Summary:X authority file utility
Group: System/X11/Utilities
Provides: xorg-x11:%{_bindir}/xauth
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at 2011-11-28 13:38:13
Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11.new (New)
Package is xorg-x11, Maintainer is sndir...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/xorg-x11/xorg-x11.changes2011-11-16
17:23:24.0 +0100
+++ /work/SRC/openSUSE:Factory/.xorg-x11.new/xorg-x11.changes 2011-11-28
13:38:15.0 +0100
@@ -98,0 +99,5 @@
+Mon Sep 19 15:45:40 UTC 2011 - sndir...@suse.com
+
+- fixed build failure on s390(x) due to wrong sed syntax
+
+---
Other differences:
--
++ xorg-x11.spec ++
--- /var/tmp/diff_new_pack.8cZ5aN/_old 2011-11-28 13:38:18.0 +0100
+++ /var/tmp/diff_new_pack.8cZ5aN/_new 2011-11-28 13:38:18.0 +0100
@@ -378,8 +378,8 @@
pushd ${RPM_BUILD_ROOT}
%{__tar} xjf '%{S:202}'
%ifarch s390 s390x
-%{__sed} -i
s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\yes\+g \
-
s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\no\+g \
+%{__sed} -i -e
s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\yes\+g \
+-e
s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\no\+g \
var/adm/fillup-templates/sysconfig.displaymanager
%endif
popd
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at 2011-11-16 17:22:19 Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old) and /work/SRC/openSUSE:Factory/.xorg-x11.new (New) Package is xorg-x11, Maintainer is sndir...@suse.com Changes: --- /work/SRC/openSUSE:Factory/xorg-x11/xorg-x11.changes2011-11-08 18:01:17.0 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11.new/xorg-x11.changes 2011-11-16 17:23:24.0 +0100 @@ -1,0 +2,5 @@ +Tue Nov 15 13:16:16 UTC 2011 - co...@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +--- Other differences: -- ++ xorg-x11.spec ++ --- /var/tmp/diff_new_pack.DEUfXu/_old 2011-11-16 17:23:27.0 +0100 +++ /var/tmp/diff_new_pack.DEUfXu/_new 2011-11-16 17:23:27.0 +0100 @@ -32,7 +32,7 @@ BuildRequires: xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel BuildRequires: xorg-x11-libxkbfile-devel BuildRequires: fdupes xorg-x11-proto-devel xorg-x11-xtrans-devel -BuildRequires: bison +BuildRequires: bison libtool Url:http://xorg.freedesktop.org/ Version:7.6 Release:61 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at 2011-11-08 18:01:14 Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old) and /work/SRC/openSUSE:Factory/.xorg-x11.new (New) Package is xorg-x11, Maintainer is sndir...@suse.com Changes: --- /work/SRC/openSUSE:Factory/xorg-x11/xorg-x11.changes2011-11-05 12:10:03.0 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11.new/xorg-x11.changes 2011-11-08 18:01:17.0 +0100 @@ -1,0 +2,6 @@ +Tue Nov 8 09:25:40 UTC 2011 - an...@opensuse.org + +- 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) + +--- Other differences: -- ++ 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-09-02 09:27:16.0 +0200 +++ new/etc/init.d/xdm 2011-11-08 10:21:56.0 +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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at 2011-11-05 11:33:22
Comparing /work/SRC/openSUSE:Factory/xorg-x11 (Old)
and /work/SRC/openSUSE:Factory/.xorg-x11.new (New)
Package is xorg-x11, Maintainer is sndir...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/xorg-x11/xorg-x11.changes2011-10-19
00:56:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11.new/xorg-x11.changes 2011-11-05
12:10:03.0 +0100
@@ -1,0 +2,34 @@
+Wed Nov 2 11:27:50 UTC 2011 - sndir...@suse.com
+
+- luit 1.2-20111030
+ * modify configure script to add X_LIBS symbol after resolving
+fontenc library, to use the associated -L option in subsequent
+configure-checks.
+ * add -t to simplify testing available locales versus luit's tables
+and the locale.alias file.
+ * add US-ASCII for C/POSIX to the locale-charset table.
+ * add entries to the locale-charset table to correspond with the
+font-encoding table, making it possible to use locales defined with
+each named charset (reported by Andrey Ivanov, also reported in
+Freedesktop #41857).
+ * modify the lookup by locale charset to help match results from
+nl_langinfo(CODESET) by mapping commonly used prefixes into the
+prefixes used by luit.
+ * check for, and use nl_langinfo(CODESET) to augment X's
+locale.aliases file for determining the encoding to use.
+ * workaround limitation in copying terminal settings on Solaris from
+original tty to pty.
+ * add /usr/openwin/lib/locale to search-list of locale.alias for
+Solaris 10.
+ * improve configure script so that it does not error-out if fontenc
+is unavailable, using iconv instead.
+ * bump version to 1.2, noting xorg hackers having marked (with only
+cosmetic changes) the 2010/6/1 snapshot as 1.1.0.
+ * add/use configure check for posix_openpt, prompted by FreeBSD
+ports/161480.
+ * updated configure script macros: CF_ANSI_CC_CHECK
+CF_DISABLE_RPATH_HACK CF_LD_RPATH_OPT CF_PKG_CONFIG CF_RPATH_HACK
+CF_SVR4 CF_WITH_ZLIB CF_XOPEN_SOURCE
+ * update config.guess, config.sub
+
+---
Old:
luit-1.1.0.tar.bz2
New:
luit-1.2-20111030.tar.bz2
Other differences:
--
++ xorg-x11.spec ++
--- /var/tmp/diff_new_pack.0pGgDv/_old 2011-11-05 12:14:04.0 +0100
+++ /var/tmp/diff_new_pack.0pGgDv/_new 2011-11-05 12:14:04.0 +0100
@@ -57,7 +57,7 @@
Source9:ico-1.0.3.tar.bz2
Source10: lbxproxy-1.0.2.tar.bz2
Source11: listres-1.0.2.tar.bz2
-Source12: luit-1.1.0.tar.bz2
+Source12: luit-1.2-20111030.tar.bz2
Source14: mkfontdir-1.0.6.tar.bz2
Source15: mkfontscale-1.0.8.tar.bz2
Source16: oclock-1.0.2.tar.bz2
++ u_luit-Set-up-terminal-before-fork.diff ++
--- /var/tmp/diff_new_pack.0pGgDv/_old 2011-11-05 12:14:05.0 +0100
+++ /var/tmp/diff_new_pack.0pGgDv/_new 2011-11-05 12:14:05.0 +0100
@@ -41,7 +41,7 @@
close_waitpipe(1);
@@ -661,7 +667,6 @@ parent(int pid GCC_UNUSED, int pty)
if (verbose) {
- reportIso2022(outputState);
+ reportIso2022(Output, outputState);
}
-setup_io(pty);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Sun Oct 16 13:02:38 CEST 2011.
--- openSUSE:Factory/xorg-x11/xorg-x11.changes 2011-09-28 15:36:47.0
+0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-10-14
13:48:12.0 +0200
@@ -1,0 +2,13 @@
+Fri Oct 14 11:46:48 UTC 2011 - sndir...@suse.com
+
+- fixed typo in /usr/lib/X11/displaymanagers/slim.fallback
+ slimdm_vars() -- slim_vars()
+
+---
+Tue Oct 11 13:45:11 UTC 2011 - g...@opensuse.org
+
+- xdm.tar.bz2:
+ commented out Tablet PC detection code in /etc/X11/xdm/Xsetup and
+ /etc/X11/xdm/Xstartup which relied on hal-find-by-property
+
+---
calling whatdependson for head-i586
Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/Xsetup new/etc/X11/xdm/Xsetup
--- old/etc/X11/xdm/Xsetup 2010-09-02 02:06:18.0 +0200
+++ new/etc/X11/xdm/Xsetup 2011-10-11 15:42:22.0 +0200
@@ -65,7 +65,7 @@
xmessage=${BINDIR}/xmessage
xrdb=${BINDIR}/xrdb
backprg=${BINDIR}/BackGround
- halporp=/usr/bin/hal-find-by-property
+# halporp=/usr/bin/hal-find-by-property
xvkbd=${BINDIR}/xvkbd
xvkbdargs=-compact -geometry -0-0 -xdm -always-on-top -keyfile
/usr/share/X11/app-defaults/xvkbd.default
@@ -111,19 +111,19 @@
# Check if the machine is a TabletPC and start
# xvkbd in xdm do be able to input username and password
#
-$halporp --key system.formfactor.subtype --string tabletpc
-if test $? -eq 0 -a -x $xvkbd ; then
-# Bug 149957, Bug #408736
-( declare -i t=100
- while test $((t--)) -gt 0 ; do
- case $(xwininfo -root -children) in
-*greet*|xlogin) break ;;
- esac
- sleep 0.1
- done
- HOME=/root exec $xvkbd $xvkbdargs
-) echo $! /var/run/xvkbd.pid
-fi
+#$halporp --key system.formfactor.subtype --string tabletpc
+#if test $? -eq 0 -a -x $xvkbd ; then
+## Bug 149957, Bug #408736
+#( declare -i t=100
+# while test $((t--)) -gt 0 ; do
+# case $(xwininfo -root -children) in
+#*greet*|xlogin) break ;;
+# esac
+# sleep 0.1
+# done
+# HOME=/root exec $xvkbd $xvkbdargs
+#) echo $! /var/run/xvkbd.pid
+#fi
#
# Handle background:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/Xstartup new/etc/X11/xdm/Xstartup
--- old/etc/X11/xdm/Xstartup2009-07-24 15:30:35.0 +0200
+++ new/etc/X11/xdm/Xstartup2011-10-11 15:42:55.0 +0200
@@ -14,7 +14,7 @@
BINDIR=/usr/bin
xmessage=${BINDIR}/xmessage
NOLOGIN=/etc/nologin
- halporp=/usr/bin/hal-find-by-property
+# halporp=/usr/bin/hal-find-by-property
xvkbd=${BINDIR}/xvkbd
kvkbd=${BINDIR}/kvkbd
xsetup=${XDMDIR}/Xsetup
@@ -27,15 +27,15 @@
# Check if the machine is a TabletPC and kill xvkbd
# to avoid multiple start on user desktop
#
-$halporp --key system.formfactor.subtype --string tabletpc
-if test $? -eq 0 -a -x $xvkbd ; then
-/sbin/killproc -p /var/run/xvkbd.pid -TERM $xvkbd
-# in case it's actually kvkbd
-/sbin/killproc -p /var/run/xvkbd.pid -TERM $kvkbd
-# Bug #408736
-# in case xvkbd hasn't been started by the Xsetup subshell yet
-/sbin/killproc -p /var/run/xvkbd.pid -TERM $xsetup
-fi
+#$halporp --key system.formfactor.subtype --string tabletpc
+#if test $? -eq 0 -a -x $xvkbd ; then
+#/sbin/killproc -p /var/run/xvkbd.pid -TERM $xvkbd
+## in case it's actually kvkbd
+#/sbin/killproc -p /var/run/xvkbd.pid -TERM $kvkbd
+## Bug #408736
+## in case xvkbd hasn't been started by the Xsetup subshell yet
+#/sbin/killproc -p /var/run/xvkbd.pid -TERM $xsetup
+#fi
#
# The real user id
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/lib/X11/displaymanagers/slim.fallback
new/usr/lib/X11/displaymanagers/slim.fallback
--- old/usr/lib/X11/displaymanagers/slim.fallback 2011-09-26
15:54:54.0 +0200
+++ new/usr/lib/X11/displaymanagers/slim.fallback 2011-10-14
13:46:09.0 +0200
@@ -3,7 +3,7 @@
return $?
}
-slimdm_vars() {
+slim_vars() {
case $1 in
slim|SLIM)
DISPLAYMANAGER=/usr/bin/slim
continue with q...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Wed Oct 12 16:18:06 CEST 2011.
--- openSUSE:Factory/xorg-x11/xorg-x11.changes 2011-09-28 15:36:47.0
+0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-10-11
16:14:19.0 +0200
@@ -1,0 +2,7 @@
+Tue Oct 11 13:45:11 UTC 2011 - g...@opensuse.org
+
+- xdm.tar.bz2:
+ commented out Tablet PC detection code in /etc/X11/xdm/Xsetup and
+ /etc/X11/xdm/Xstartup which relied on hal-find-by-property
+
+---
calling whatdependson for head-i586
Other differences:
--
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/Xsetup new/etc/X11/xdm/Xsetup
--- old/etc/X11/xdm/Xsetup 2010-09-02 02:06:18.0 +0200
+++ new/etc/X11/xdm/Xsetup 2011-10-11 15:42:22.0 +0200
@@ -65,7 +65,7 @@
xmessage=${BINDIR}/xmessage
xrdb=${BINDIR}/xrdb
backprg=${BINDIR}/BackGround
- halporp=/usr/bin/hal-find-by-property
+# halporp=/usr/bin/hal-find-by-property
xvkbd=${BINDIR}/xvkbd
xvkbdargs=-compact -geometry -0-0 -xdm -always-on-top -keyfile
/usr/share/X11/app-defaults/xvkbd.default
@@ -111,19 +111,19 @@
# Check if the machine is a TabletPC and start
# xvkbd in xdm do be able to input username and password
#
-$halporp --key system.formfactor.subtype --string tabletpc
-if test $? -eq 0 -a -x $xvkbd ; then
-# Bug 149957, Bug #408736
-( declare -i t=100
- while test $((t--)) -gt 0 ; do
- case $(xwininfo -root -children) in
-*greet*|xlogin) break ;;
- esac
- sleep 0.1
- done
- HOME=/root exec $xvkbd $xvkbdargs
-) echo $! /var/run/xvkbd.pid
-fi
+#$halporp --key system.formfactor.subtype --string tabletpc
+#if test $? -eq 0 -a -x $xvkbd ; then
+## Bug 149957, Bug #408736
+#( declare -i t=100
+# while test $((t--)) -gt 0 ; do
+# case $(xwininfo -root -children) in
+#*greet*|xlogin) break ;;
+# esac
+# sleep 0.1
+# done
+# HOME=/root exec $xvkbd $xvkbdargs
+#) echo $! /var/run/xvkbd.pid
+#fi
#
# Handle background:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/Xstartup new/etc/X11/xdm/Xstartup
--- old/etc/X11/xdm/Xstartup2009-07-24 15:30:35.0 +0200
+++ new/etc/X11/xdm/Xstartup2011-10-11 15:42:55.0 +0200
@@ -14,7 +14,7 @@
BINDIR=/usr/bin
xmessage=${BINDIR}/xmessage
NOLOGIN=/etc/nologin
- halporp=/usr/bin/hal-find-by-property
+# halporp=/usr/bin/hal-find-by-property
xvkbd=${BINDIR}/xvkbd
kvkbd=${BINDIR}/kvkbd
xsetup=${XDMDIR}/Xsetup
@@ -27,15 +27,15 @@
# Check if the machine is a TabletPC and kill xvkbd
# to avoid multiple start on user desktop
#
-$halporp --key system.formfactor.subtype --string tabletpc
-if test $? -eq 0 -a -x $xvkbd ; then
-/sbin/killproc -p /var/run/xvkbd.pid -TERM $xvkbd
-# in case it's actually kvkbd
-/sbin/killproc -p /var/run/xvkbd.pid -TERM $kvkbd
-# Bug #408736
-# in case xvkbd hasn't been started by the Xsetup subshell yet
-/sbin/killproc -p /var/run/xvkbd.pid -TERM $xsetup
-fi
+#$halporp --key system.formfactor.subtype --string tabletpc
+#if test $? -eq 0 -a -x $xvkbd ; then
+#/sbin/killproc -p /var/run/xvkbd.pid -TERM $xvkbd
+## in case it's actually kvkbd
+#/sbin/killproc -p /var/run/xvkbd.pid -TERM $kvkbd
+## Bug #408736
+## in case xvkbd hasn't been started by the Xsetup subshell yet
+#/sbin/killproc -p /var/run/xvkbd.pid -TERM $xsetup
+#fi
#
# The real user id
continue with q...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Fri Sep 23 10:34:38 CEST 2011.
--- xorg-x11/xorg-x11.changes 2011-08-25 14:13:03.0 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-09-22
16:49:31.0 +0200
@@ -1,0 +2,50 @@
+Thu Sep 22 14:47:33 UTC 2011 - vu...@opensuse.org
+
+- Update /etc/X11/xdm/sys.xsession: do not start a gpg agent if
+ gnome-keyring is running, since starting with GNOME 3,
+ gnome-keyring plays that role. Also, drop support for
+ seahorse-agent as gpg agent for the same reason. Fix bnc#692277.
+
+---
+Wed Sep 21 08:33:05 UTC 2011 - e...@suse.com
+
+- Don't use %{_libexecdir} it's not uniformly defined on all
+ supported products.
+
+---
+Tue Sep 20 14:35:10 UTC 2011 - e...@suse.com
+
+- Change %{_libdir} to ${_libexecdir}.
+
+---
+Tue Sep 20 13:38:22 UTC 2011 - e...@suse.com
+
+- add fallback files for all DMs which have been updated
+ to suport the new xdm startup script.
+
+---
+Wed Aug 31 10:28:56 UTC 2011 - e...@suse.com
+
+- xdm.tar.bz2: Fixed some bugs in the xdm startup script,
+ mode HOWTO.xdm to rhe sources as a separate file.
+
+---
+Tue Aug 30 10:01:45 UTC 2011 - e...@suse.com
+
+- add missing %dir %{_sysconfdir}/X11/displaymanagers
+ to specfile.
+
+---
+Thu Aug 25 10:33:08 UTC 2011 - e...@suse.de
+
+- xdm.tar.bz2:
+ Remove any display manager specific stuff from
+ /etc/xinit.d/xdm.
+ Display manager specific settings will be read
+ from scripts in /etc/X11/displaymanagers.
+ Those script need to be provided with the display
+ manager package. A HOWTO describing how this
+ scipt should look like can be found in this
+ directory.
+
+---
calling whatdependson for head-i586
New:
HOWTO.xdm
Other differences:
--
++ xorg-x11.spec ++
--- /var/tmp/diff_new_pack.W5It6J/_old 2011-09-23 10:34:30.0 +0200
+++ /var/tmp/diff_new_pack.W5It6J/_new 2011-09-23 10:34:30.0 +0200
@@ -17,6 +17,7 @@
# norootforbuild
+%define _dminitdir %{_prefix}/lib/X11/displaymanagers
Name: xorg-x11
BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel
libpng-devel ncurses-devel
@@ -144,6 +145,7 @@
Source200: misc.tar.bz2
Source201: twm.tar.bz2
Source202: xdm.tar.bz2
+Source2021: HOWTO.xdm
Source203: xfs.tar.bz2
Source204: xinit.tar.bz2
Source205: desktopfiles.tar.bz2
@@ -420,6 +422,7 @@
esac
popd
done
+%{__cp} %{S:2021} .
# Xresources, Xmodmap, ...
pushd $RPM_BUILD_ROOT
%{__tar} xjf '%{S:200}'
@@ -477,6 +480,15 @@
%endif
%dir %{_libdir}/X11/xsm
%dir %{_libdir}/X11/x11perfcomp
+%dir %{_dminitdir}
+%{_dminitdir}/xdm
+%{_dminitdir}/entrance.fallback
+%{_dminitdir}/gdm.fallback
+%{_dminitdir}/kdm.fallback
+%{_dminitdir}/lxdm.fallback
+%{_dminitdir}/slim.fallback
+%{_dminitdir}/wdm.fallback
+%doc HOWTO.xdm
%config /etc/logrotate.d/xdm
%config /etc/pam.d/xdm
%config /etc/pam.d/xdm-np
++ HOWTO.xdm ++
Display Manager Scriptlets HOWTO
To keep display manager specific code out of the generic
start script (/etc/init.d/xdm) as much as possible display
managers should provide a script file that provides anything
specific to this dm.
At minimum the script file needs to provide:
here DM denotes the name of the file. This should
be the same as the pid file generated by the display
manager - without the .pid extent.
# this function matches the command line argument. If it
finds a match it initializes any dm specific variables
and returns 0 (success) otherwise it returns 1 (fail).
At minimum it needs to set the full path the the display
manager binary.
It may set STARTPROC to a function that gets run prior to
starting a dm, RELOADPROC to a function that's run to reload
the DM configuration, PROBEPROC to a function that's run
when the DM status is probed.
Any those functions should return 0 on success or any other
value on failure.
Additionally it may initialize any other variables needed
by the DM.
DM_vars() {
case $1 in
thisdm)
DISPLAYMANAGER=/usr/bin/thisdm
STARTPROC=DM_start # optional
RELOADPROC=DM_reload # optional
PROBEPROC=DM_probe # optional
}
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
commit xorg-x11 for openSUSE:Factory
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Thu Aug 25 10:03:48 CEST 2011.
--- xorg-x11/xorg-x11.changes 2011-08-08 14:49:22.0 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-08-24
16:00:17.0 +0200
@@ -6,0 +7,9 @@
+Wed Jun 8 08:30:05 UTC 2011 - e...@suse.de
+
+- add u_luit-Set-up-terminal-before-fork.diff:
+ Set up terminal before fork.
+ An older version of this patch was dropped as
+ it didn't apply any more.
+ This patch is to be upstreamed.
+
+---
calling whatdependson for head-i586
New:
u_luit-Set-up-terminal-before-fork.diff
Other differences:
--
++ xorg-x11.spec ++
--- /var/tmp/diff_new_pack.tC1VUT/_old 2011-08-25 09:46:48.0 +0200
+++ /var/tmp/diff_new_pack.tC1VUT/_new 2011-08-25 09:46:48.0 +0200
@@ -34,7 +34,7 @@
BuildRequires: bison
Url:http://xorg.freedesktop.org/
Version:7.6
-Release:57
+Release:59
License:MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -164,6 +164,7 @@
Patch66:xinit-suse.diff
Patch67:xinit-tolerant-hostname-changes.diff
Patch69:xrdb-traditional-cpp.diff
+Patch70:u_luit-Set-up-terminal-before-fork.diff
Patch674733:
xrdb-Create-shell-escape-safe-cpp-options-in-the-non-path-bnc674733.patch
%description
@@ -299,6 +300,9 @@
ln lisp/README .doc/xedit/lisp.README
ln lisp/re/README .doc/xedit/re.README
popd
+pushd luit-*
+%patch70 -p1
+popd
%build
++ u_luit-Set-up-terminal-before-fork.diff ++
From 6b1da100f2984701f181f5d2635ffcff06db9be1 Mon Sep 17 00:00:00 2001
From: Mike Fabian mike.fab...@gmx.de
Date: Tue, 7 Jun 2011 13:42:00 +0200
Subject: [PATCH] Set up terminal before fork.
Patch-mainline: To be submitted.
After the fork it is undefined wether parent or child runs
first. So there can be a race: if the child runs before the
terminal of the parent is set up correctly luit may hang.
This patch sets up the terminal before forking and undoes
the settings in the child.
Signed-off-by: Egbert Eich e...@freedesktop.org
---
luit.c |7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/luit.c b/luit.c
index 6bd8775..c2a011c 100644
--- a/luit.c
+++ b/luit.c
@@ -577,6 +577,8 @@ condom(int argc, char **argv)
IGNORE_RC(pipe(c2p_waitpipe));
}
+setup_io(pty);
+
pid = fork();
if (pid 0) {
perror(Couldn't fork);
@@ -584,6 +586,10 @@ condom(int argc, char **argv)
}
if (pid == 0) {
+#ifdef SIGWINCH
+ installHandler(SIGWINCH, SIG_DFL);
+#endif
+ installHandler(SIGCHLD, SIG_DFL);
close(pty);
if (pipe_option) {
close_waitpipe(1);
@@ -661,7 +667,6 @@ parent(int pid GCC_UNUSED, int pty)
if (verbose) {
reportIso2022(outputState);
}
-setup_io(pty);
if (pipe_option) {
write_waitpipe(p2c_waitpipe);
--
1.7.3.4
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Thu Aug 25 14:57:37 CEST 2011.
--- xorg-x11/xorg-x11.changes 2011-08-24 16:00:17.0 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-08-25
14:13:03.0 +0200
@@ -1,0 +2,12 @@
+Thu Aug 25 09:54:36 UTC 2011 - sndir...@novell.com
+
+- update xbiff 1.0.3 to fix build again with current toolchain
+ * Xmu functions are called directly, so include it in
+PKG_CHECK_MODULES
+- added some xdm git commits (adjusted to xdm 1.10.1) to fix build
+ again with current toolchain
+ * U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
+ * U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
+ * U_xdm_Fix-missing-linking-dependency-on-ldl.patch
+
+---
calling whatdependson for head-i586
Old:
xbiff-1.0.2.tar.bz2
New:
U_xdm_Fix-missing-linking-dependency-on-ldl.patch
U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
xbiff-1.0.3.tar.bz2
Other differences:
--
++ xorg-x11.spec ++
--- /var/tmp/diff_new_pack.CZjh8y/_old 2011-08-25 14:54:25.0 +0200
+++ /var/tmp/diff_new_pack.CZjh8y/_new 2011-08-25 14:54:25.0 +0200
@@ -34,7 +34,7 @@
BuildRequires: bison
Url:http://xorg.freedesktop.org/
Version:7.6
-Release:59
+Release:61
License:MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -72,7 +72,7 @@
Source26: viewres-1.0.3.tar.bz2
Source27: x11perf-1.5.2.tar.bz2
Source28: xauth-1.0.5.tar.bz2
-Source29: xbiff-1.0.2.tar.bz2
+Source29: xbiff-1.0.3.tar.bz2
Source30: xcalc-1.0.4.1.tar.bz2
Source31: xclipboard-1.1.1.tar.bz2
Source32: xclock-1.0.5.tar.bz2
@@ -165,6 +165,9 @@
Patch67:xinit-tolerant-hostname-changes.diff
Patch69:xrdb-traditional-cpp.diff
Patch70:u_luit-Set-up-terminal-before-fork.diff
+Patch71:
U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
+Patch72:
U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
+Patch73:U_xdm_Fix-missing-linking-dependency-on-ldl.patch
Patch674733:
xrdb-Create-shell-escape-safe-cpp-options-in-the-non-path-bnc674733.patch
%description
@@ -284,6 +287,9 @@
pushd xdm-*
%patch56 -p1
%patch65 -p1
+%patch71 -p1
+%patch72 -p1
+%patch73 -p1
popd
pushd twm-*
%patch61 -p1
++ U_xdm_Fix-missing-linking-dependency-on-ldl.patch ++
From c4031966dcbc47b2cc85b83ad78efcc64455cf72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Tarl=C3=A1=20Cardoso=20Lemos?=
fernando...@gmail.com
Date: Sat, 19 Feb 2011 17:53:08 -0200
Subject: [PATCH] Fix missing linking dependency on -ldl.
Recent versions of GCC ship with a linker that doesn't add the deps
of the DSOs to the linking process. This behavior is also found in
GNU gold. This change fixes building with those linkers.
Some references:
http://wiki.debian.org/ToolChain/DSOLinking
https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
Reviewed-by: Gaetan Nadon mems...@videotron.ca
---
configure.ac |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
--- xdm-1.1.10/configure.ac.orig2011-08-25 13:56:01.551431000 +0200
+++ xdm-1.1.10/configure.ac 2011-08-25 13:57:09.137351000 +0200
@@ -462,6 +462,9 @@ AM_CONDITIONAL(HAS_XDM_AUTH, test x$xdma
AC_SEARCH_LIBS(crypt, crypt)
+# Function dl() comes from the C library or -ldl
+AC_SEARCH_LIBS([dlopen], [dl])
+
AC_SUBST(XDM_CFLAGS)
AC_SUBST(XDM_LIBS)
++ U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch ++
From 50c96170ad42321310c346cf412f9ae7e80ec2a7 Mon Sep 17 00:00:00 2001
From: Gaetan Nadon mems...@videotron.ca
Date: Sun, 29 Aug 2010 19:56:59 -0400
Subject: [PATCH] config: AC_LIBTOOL_DLOPEN is required for dynamic linking
It adds the following tests in the configuration :
checking for shl_load... no
checking for shl_load in -ldld... no
checking for dlopen... no
checking for dlopen in -ldl... yes
checking whether a program can dlopen itself... yes
checking whether a statically linked program can dlopen itself... no
This has not resulted in any compiler/linker flags change on
a GNU/Linux platform.
Signed-off-by: Gaetan Nadon mems...@videotron.ca
---
configure.ac |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
--- xdm-1.1.10/configure.ac.orig2011-08-25 12:46:19.795331000 +0200
+++ xdm-1.1.10/configure.ac 2011-08-25 12:46:52.562458000 +0200
@@ -40,7 +40,8 @@ AC_PROG_CC
AM_PROG_CC_C_O
AC_C_INLINE
AC_LIBTOOL_WIN32_DLL
-AM_PROG_LIBTOOL
+AC_LIBTOOL_DLOPEN
commit xorg-x11 for openSUSE:Factory
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Tue Aug 9 10:37:50 CEST 2011.
--- xorg-x11/xorg-x11.changes 2011-05-31 20:43:45.0 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-08-08
14:49:22.0 +0200
@@ -1,0 +2,5 @@
+Mon Aug 8 12:47:43 UTC 2011 - sndir...@novell.com
+
+- added mapping for romanian keyboard (bnc #709443)
+
+---
calling whatdependson for head-i586
Other differences:
--
++ xorg-x11.spec ++
--- /var/tmp/diff_new_pack.xymdS4/_old 2011-08-09 10:37:15.0 +0200
+++ /var/tmp/diff_new_pack.xymdS4/_new 2011-08-09 10:37:15.0 +0200
@@ -34,7 +34,7 @@
BuildRequires: bison
Url:http://xorg.freedesktop.org/
Version:7.6
-Release:55
+Release:57
License:MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
++ xdm.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/Keyboard.map new/etc/X11/xdm/Keyboard.map
--- old/etc/X11/xdm/Keyboard.map2011-05-23 21:27:11.0 +0200
+++ new/etc/X11/xdm/Keyboard.map2011-08-08 14:46:42.0 +0200
@@ -95,6 +95,7 @@
pt2 : microsoftpro : pt : x: xfree86 : x : x
: x : x : x
pt-latin9 : microsoftpro : pt : x: xfree86 : x : x
: x : x : x
pt-latin1 : microsoftpro : pt : x: xfree86 : x : x
: x : x : x
+ro : microsoftpro : ro : x: xfree86 : x : x
: x : x : x
ru-cp1251 : microsoftpro : us,ru: ,winkeys : xfree86 : x : x
: x : x : grp:ctrl_shift_toggle,grp_led:scroll
ru : microsoftpro : us,ru: ,winkeys : xfree86 : x : x
: x : x : grp:ctrl_shift_toggle,grp_led:scroll
ru1 : microsoftpro : us,ru: ,winkeys : xfree86 : x : x
: x : x : grp:ctrl_shift_toggle,grp_led:scroll
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit xorg-x11 for openSUSE:Factory
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.0 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-05-19
12:44:05.0 +0200
@@ -1,0 +2,31 @@
+Thu May 19 10:41:32 UTC 2011 - e...@suse.de
+
+- edit s390/s390x sysconfig template in place instead of applying
+ a patch.
+
+---
+Thu May 19 10:01:29 UTC 2011 - e...@suse.de
+
+- 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 - e...@suse.de
+
+- 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 - e...@suse.de
+
+- remove xrx.diff patch as the function has the correct type already.
+
+---
+Fri May 6 14:55:34 UTC 2011 - sndir...@novell.com
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.t0WYrC/_new 2011-05-26 09:56:40.0 +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.xsession2011-03-28 10:21:34.0 +0200
+++ new/etc/X11/xdm/sys.xsession2011-05-06 16:54:25.0 +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: opensuse-commit+unsubscr...@opensuse.org
For additional
commit xorg-x11 for openSUSE:Factory
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Mon Apr 11 09:15:46 CEST 2011.
--- xorg-x11/xorg-x11.changes 2011-04-05 19:03:40.0 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-04-08
16:18:51.0 +0200
@@ -1,0 +2,13 @@
+Fri Apr 8 14:14:23 UTC 2011 - sndir...@novell.com
+
+- changes by Christopher Yeleighton giecr...@stegny.2a.pl
+ * add documentation for xedit (bnc #684116)
+ * fix several RPMLINT warnings and compiler warnings, in
+particular in keygen.
+ * make use of more rpm macros
+ * xdmshell is excluded as obsolete.
+ * xkeystone is excluded as broken.
+ * some other files are excluded because they are irrelevant.
+ * OpenSuSE-specific tools get manual pages redirecting to init.d.
+
+---
calling whatdependson for head-i586
Other differences:
--
++ xorg-x11.spec ++
--- /var/tmp/diff_new_pack.Cg9LuD/_old 2011-04-11 09:01:42.0 +0200
+++ /var/tmp/diff_new_pack.Cg9LuD/_new 2011-04-11 09:01:42.0 +0200
@@ -19,19 +19,30 @@
Name: xorg-x11
-BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel
libpng-devel ncurses-devel pam-devel pkgconfig rsh update-desktop-files
xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel
xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel
xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel
xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel
xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel
xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
+BuildRequires: ConsoleKit-devel fontconfig-devel freetype2-devel libXi6-devel
libpng-devel ncurses-devel
+%if 0%{?suse_version} = 01140
+BuildRequires: aaa_base-extras
+%endif
+BuildRequires: pam-devel pkgconfig rsh update-desktop-files xorg-x11-devel
xorg-x11-libICE-devel
+BuildRequires: xorg-x11-libSM-devel xorg-x11-libX11-devel
xorg-x11-libXau-devel xorg-x11-libXdmcp-devel
+BuildRequires: xorg-x11-libXext-devel
+BuildRequires: xorg-x11-libXfixes-devel xorg-x11-libXmu-devel
xorg-x11-libXp-devel xorg-x11-libXpm-devel
+BuildRequires: xorg-x11-libXprintUtil-devel
+BuildRequires: xorg-x11-libXrender-devel xorg-x11-libXt-devel
xorg-x11-libXv-devel xorg-x11-libfontenc-devel
+BuildRequires: xorg-x11-libxkbfile-devel
+BuildRequires: fdupes xorg-x11-proto-devel xorg-x11-xtrans-devel
BuildRequires: bison
Url:http://xorg.freedesktop.org/
Version:7.6
-Release:49
+Release:51
License:MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
-Requires: cpp
+Requires: cpp logrotate
Requires: %{name}-xauth ConsoleKit
Recommends: dbus-1-x11
-Provides: XFree86 xcompmgr xrestop
-Obsoletes: xcompmgr xrestop
+Provides: XFree86 xcompmgr = 1.1.5 xrestop = 0.4
+Obsoletes: xcompmgr 1.1.5 xrestop 0.4
Summary:X.Org core and sample applications
Source0:appres-1.0.3.tar.bz2
Source1:bdftopcf-1.0.3.tar.bz2
@@ -179,7 +190,7 @@
Dmitry Yu. Bolkhovityanov
Doug Moran
Eric Anholt
-Felix K�lhing
+Felix Kühling
Ivan Griffin
Jim Fulton
Jim Gettys
@@ -197,7 +208,7 @@
License:MIT License (or similar)
Summary:X authority file utility
Group: System/X11/Utilities
-Provides: xorg-x11:/usr/X11R6/bin/xauth xorg-x11:/usr/bin/xauth
+Provides: xorg-x11:%{_bindir}/xauth
AutoReqProv:on
%description xauth
@@ -219,7 +230,7 @@
Dmitry Yu. Bolkhovityanov
Doug Moran
Eric Anholt
-Felix K�lhing
+Felix Kühling
Ivan Griffin
Jim Fulton
Jim Gettys
@@ -234,10 +245,18 @@
Werner Fink
%prep
-%setup -T -c %{name}
+%setup -T -c '%{name}'
+%if 0%{?suse_version} 01120
for i in $RPM_SOURCE_DIR/*-*.tar.bz2; do tar xjf $i; done
-pushd $RPM_BUILD_DIR
-tar -xjf %{SOURCE205}
+%else
+for i in %{sources}
+ do case ${i} in
+ *-*) %{__tar} xjf ${i};;
+ esac
+done
+%endif
+pushd ${RPM_BUILD_DIR}
+%{__tar} -xjf '%{S:205}'
popd
pushd lbxproxy-*
%patch2
@@ -292,11 +311,18 @@
%patch69 -p0
%patch674733 -p1
popd
+# Bug 684116
+pushd xedit-*
+%{__mkdir_p} .doc/xedit
+ln AUTHORS README ChangeLog .doc/xedit/.
+ln lisp/README .doc/xedit/lisp.README
+ln lisp/re/README .doc/xedit/re.README
+popd
%build
%install
-export PATH=${PATH}:$RPM_BUILD_ROOT/usr/bin
+export PATH=${PATH}:${RPM_BUILD_ROOT}%{_bindir}
for dir in xcursorgen-* $(ls | grep -v xcursorgen); do
pushd $dir
case $dir in
@@ -311,41 +337,40 @@
xinit-*| \
xset-*| \
xsm)option=''; autoreconf -fi ;;
- luit-*)
commit xorg-x11 for openSUSE:Factory
Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Wed Apr 6 11:31:04 CEST 2011.
--- xorg-x11/xorg-x11.changes 2011-03-28 18:15:52.0 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-04-05
19:03:40.0 +0200
@@ -1,0 +2,6 @@
+Tue Apr 5 17:02:53 UTC 2011 - mh...@novell.com
+
+- xrdb-Create-shell-escape-safe-cpp-options-in-the-non-path-bnc674733.patch
+ * Fix CVE-2011-0465 (bnc #674733).
+
+---
calling whatdependson for head-i586
New:
xrdb-Create-shell-escape-safe-cpp-options-in-the-non-path-bnc674733.patch
Other differences:
--
++ xorg-x11.spec ++
--- /var/tmp/diff_new_pack.ajwKOh/_old 2011-04-06 11:28:19.0 +0200
+++ /var/tmp/diff_new_pack.ajwKOh/_new 2011-04-06 11:28:19.0 +0200
@@ -23,7 +23,7 @@
BuildRequires: bison
Url:http://xorg.freedesktop.org/
Version:7.6
-Release:46
+Release:49
License:MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -159,6 +159,7 @@
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
%description
This package contains the X.Org core and sample applications.
@@ -289,6 +290,7 @@
pushd xrdb-*
%patch68 -p2
%patch69 -p0
+%patch674733 -p1
popd
%build
++
xrdb-Create-shell-escape-safe-cpp-options-in-the-non-path-bnc674733.patch ++
From 3d0c8e2cacf69723e7e8faf7ce441b9802e2d9a0 Mon Sep 17 00:00:00 2001
From: Matthias Hopf mh...@suse.de
Date: Tue, 1 Mar 2011 19:37:34 +0100
Subject: [PATCH] Create shell-escape-safe cpp options in the non-pathetic-cpp
case.
Fixes CVE-2011-0465.
Signed-off-by: Matthias Hopf mh...@suse.de
Reviewed-by: Adam Jackson a...@redhat.com
---
xrdb.c | 79 +++-
1 files changed, 63 insertions(+), 16 deletions(-)
diff --git a/xrdb.c b/xrdb.c
index c3ef0fd..ea698b9 100644
--- a/xrdb.c
+++ b/xrdb.c
@@ -142,6 +142,8 @@ static Entries newDB;
static void fatal(char *, ...);
static void addstring ( String *arg, const char *s );
+static void addescapedstring ( String *arg, const char *s );
+static void addtokstring ( String *arg, const char *s );
static void FormatEntries ( Buffer *buffer, Entries *entries );
static void StoreProperty ( Display *dpy, Window root, Atom res_prop );
static void Process ( int scrno, Bool doScreen, Bool execute );
@@ -433,14 +435,20 @@ AddDef(String *buff, char *title, char *value)
addstring(buff, -D);
} else
addstring(buff, -D);
-addstring(buff, title);
+addtokstring(buff, title);
if (value (value[0] != '\0')) {
addstring(buff, =);
- addstring(buff, value);
+ addescapedstring(buff, value);
}
}
static void
+AddSimpleDef(String *buff, char *title)
+{
+AddDef(buff, title, (char *)NULL);
+}
+
+static void
AddDefQ(String *buff, char *title, char *value)
{
#ifdef PATHETICCPP
@@ -449,8 +457,9 @@ AddDefQ(String *buff, char *title, char *value)
else
#endif
if (value (value[0] != '\0')) {
- AddDef(buff, title, \);
- addstring(buff, value);
+ AddSimpleDef(buff, title);
+ addstring(buff, =\);
+ addescapedstring(buff, value);
addstring(buff, \);
} else
AddDef(buff, title, NULL);
@@ -465,24 +474,28 @@ AddNum(String *buff, char *title, int value)
}
static void
-AddSimpleDef(String *buff, char *title)
+AddDefTok(String *buff, char *prefix, char *title)
{
-AddDef(buff, title, (char *)NULL);
+char name[512];
+
+snprintf(name, sizeof(name), %s%s, prefix, title);
+AddSimpleDef(buff, name);
}
static void
-AddDefTok(String *buff, char *prefix, char *title)
+AddDefHostname(String *buff, char *title, char *value)
{
char *s;
char name[512];
char c;
-snprintf(name, sizeof(name), %s%s, prefix, title);
+strncpy (name, value, sizeof(name)-1);
+name[sizeof(name)-1] = '\0';
for (s = name; (c = *s); s++) {
- if (!isalpha(c) !isdigit(c) c != '_')
+ if (!isalpha(c) !isdigit(c) c != '_' c != '.' c != ':' c
!= '-')
*s = '_';
}
-AddSimpleDef(buff, name);
+AddDef(buff, title, name);
}
static void
@@ -502,7 +515,7 @@ AddUndef(String *buff, char *title)
addstring(buff, -U);
} else
addstring(buff, -U);
-addstring(buff, title);
+addtokstring(buff, title);
}
static void
@@ -565,11 +578,11 @@ DoDisplayDefines(Display *display, String *defs, char
*host)
}
if (!*server || !strcmp(server, unix) || !strcmp(server, localhost))
