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.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-04-08
16:18:51.000000000 +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.000000000 +0200
+++ /var/tmp/diff_new_pack.Cg9LuD/_new 2011-04-11 09:01:42.000000000 +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-*)
option='--with-localealiasfile=/usr/share/X11/locale/locale.alias' ;;
- xrdb-*) option='--with-cpp=/usr/bin/cpp' ;;
+ luit-*)
option='--with-localealiasfile=%{_datadir}/X11/locale/locale.alias' ;;
+ xrdb-*) option='--with-cpp=%{_bindir}/cpp' ;;
*) option='' ;;
esac
%configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
--sysconfdir=/etc ${option}
- make %{?jobs:-j%jobs};
- make install DESTDIR=$RPM_BUILD_ROOT
+ %{__make} %{?jobs:-j%jobs};
+ %{__make} install "DESTDIR=${RPM_BUILD_ROOT}"
# for some compatibility symlinks
- mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin
+ %{__mkdir_p} "${RPM_BUILD_ROOT}%{_exec_prefix}/X11R6/bin"
case $dir in
xinit-*)
- pushd $RPM_BUILD_ROOT
- tar xjf $RPM_SOURCE_DIR/xinit.tar.bz2
+ pushd "${RPM_BUILD_ROOT}"
+ %{__tar} xjf '%{S:204}'
+%{__mv} '-t.%{_mandir}/man1' keygen.1
+%{__gzip} '.%{_mandir}/man1/keygen.1'
popd
- mkdir -p $RPM_BUILD_ROOT/etc/skel
- cp $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc \
- $RPM_BUILD_ROOT/etc/skel/.xinitrc.template
- gcc $RPM_OPT_FLAGS -fno-strict-aliasing \
- -o $RPM_BUILD_ROOT/usr/bin/keygen \
- $RPM_BUILD_ROOT/etc/X11/xinit/keygen.c
- chmod 0711 $RPM_BUILD_ROOT/usr/bin/keygen
- rm $RPM_BUILD_ROOT/etc/X11/xinit/keygen.c
- ;;
- mkcomposecache-*)
- install -m 0755 mkallcomposecaches.sh
$RPM_BUILD_ROOT/usr/sbin/mkallcomposecaches
+ %{__mkdir_p} "${RPM_BUILD_ROOT}/etc/skel"
+ %{__cp} "${RPM_BUILD_ROOT}/etc/X11/xinit/xinitrc" \
+ "${RPM_BUILD_ROOT}/etc/skel/.xinitrc.template"
+ %{__cc} ${RPM_OPT_FLAGS} -fno-strict-aliasing \
+ -o "${RPM_BUILD_ROOT}%{_bindir}/keygen" \
+ "${RPM_BUILD_ROOT}/etc/X11/xinit/keygen.c"
+ %{__chmod} 0711 "${RPM_BUILD_ROOT}%{_bindir}/keygen"
+ %{__rm} "${RPM_BUILD_ROOT}/etc/X11/xinit/keygen.c"
;;
proxymngr-*)
- sed -i s+$RPM_BUILD_ROOT++g $RPM_BUILD_ROOT/etc/X11/proxymngr/pmconfig
+ %{__sed} -i "s+${RPM_BUILD_ROOT}++g"
"${RPM_BUILD_ROOT}/etc/X11/proxymngr/pmconfig"
;;
twm-*)
- pushd $RPM_BUILD_ROOT
- tar xjf $RPM_SOURCE_DIR/twm.tar.bz2
+ pushd "${RPM_BUILD_ROOT}"
+ %{__tar} xjf '%{S:201}'
popd
- %suse_update_desktop_file
$RPM_BUILD_ROOT/usr/share/xsessions/twm.desktop
+ %suse_update_desktop_file
"${RPM_BUILD_ROOT}%{_datadir}/xsessions/twm.desktop"
;;
xcalc-*)
%suse_update_desktop_file -i -u xcalc Utility Calculator
@@ -355,30 +380,30 @@
;;
xdm-*)
# Not used anymore by SuSE
- rm -f $RPM_BUILD_ROOT/etc/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0}
+ %{__rm} -f
"${RPM_BUILD_ROOT}/etc/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0}"
# SuSE default XDM configuration
- pushd $RPM_BUILD_ROOT
- tar xjf $RPM_SOURCE_DIR/xdm.tar.bz2
+ pushd "${RPM_BUILD_ROOT}"
+ %{__tar} xjf '%{S:202}'
%ifarch s390 s390x
- patch -p0 -s < $RPM_SOURCE_DIR/xdm.diff
- rm -f var/adm/fillup-templates/sysconfig.displaymanager.orig
+ %{__patch} -p0 -s < '%{P:20}'
+ %{__rm} -f var/adm/fillup-templates/sysconfig.displaymanager.orig
%endif
popd
# Correct location (FHS-2.1)
- rm -f $RPM_BUILD_ROOT/etc/X11/xdm/authdir
- ln -snf /var/lib/xdm/authdir $RPM_BUILD_ROOT/etc/X11/xdm/authdir
+ %{__rm} -f $RPM_BUILD_ROOT/etc/X11/xdm/authdir
+ %{__ln_s}nf '%{_localstatedir}/lib/xdm/authdir'
"${RPM_BUILD_ROOT}/etc/X11/xdm/authdir"
# for FHS compliance (Bug #21857)
- mv $RPM_BUILD_ROOT/usr/%{_lib}/X11/xdm/chooser $RPM_BUILD_ROOT/usr/bin/
+ %{__mv} "-t${RPM_BUILD_ROOT}%{_bindir}"
"${RPM_BUILD_ROOT}%{_libdir}/X11/xdm/chooser"
# Bug 223734
- rm $RPM_BUILD_ROOT/usr/%{_lib}/X11/xdm/libXdmGreet.a \
- $RPM_BUILD_ROOT/usr/%{_lib}/X11/xdm/libXdmGreet.la
+ %{__rm} "${RPM_BUILD_ROOT}%{_libdir}/X11/xdm/libXdmGreet.a" \
+ "${RPM_BUILD_ROOT}%{_libdir}/X11/xdm/libXdmGreet.la"
;;
xfs-*)
- pushd $RPM_BUILD_ROOT
- tar xjf $RPM_SOURCE_DIR/xfs.tar.bz2
+ pushd "${RPM_BUILD_ROOT}"
+ %{__tar} xjf '%{S:203}'
popd
- mkdir -p $RPM_BUILD_ROOT/usr/sbin
- ln -snf /etc/init.d/xfs $RPM_BUILD_ROOT/usr/sbin/rcxfs
+ %{__mkdir_p} "${RPM_BUILD_ROOT}%{_sbindir}"
+ %{__ln_s}nf /etc/init.d/xfs "${RPM_BUILD_ROOT}%{_sbindir}/rcxfs"
;;
xkill-*)
%suse_update_desktop_file -i -u Xkill Utility DesktopUtility
@@ -394,9 +419,9 @@
;;
rstart-*)
# for FHS/FSSTND compliance (bnc #470983)
- mv $RPM_BUILD_ROOT/etc/X11/rstart/rstartd.real $RPM_BUILD_ROOT/usr/bin/
- sed -i 's+/etc/X11/rstart/rstartd.real+/usr/bin/rstartd.real+' \
- $RPM_BUILD_ROOT/usr/bin/rstartd
+ %{__mv} "-t${RPM_BUILD_ROOT}%{_bindir}"
$RPM_BUILD_ROOT/etc/X11/rstart/rstartd.real
+ %{__sed} -i 's+/etc/X11/rstart/rstartd.real+%{_bindir}/rstartd.real+' \
+ "${RPM_BUILD_ROOT}%{_bindir}/rstartd"
;;
*)
;;
@@ -405,14 +430,25 @@
done
# Xresources, Xmodmap, ...
pushd $RPM_BUILD_ROOT
-tar xjf $RPM_SOURCE_DIR/misc.tar.bz2
+%{__tar} xjf '%{S:200}'
popd
# Compatibility symlink (Bug #223524)
-ln -snf . $RPM_BUILD_ROOT/usr/bin/X11
+%{__ln_s}nf . "${RPM_BUILD_ROOT}%{_bindir}/X11"
# package license files
for i in */COPYING; do
- cp $i COPYING.$(dirname $i)
+ %{__cp} "${i}" "COPYING.$(dirname "${i}")"
done
+# missing manual pages
+pushd "${RPM_BUILD_ROOT}%{_mandir}"
+%{__ln_s} ../man7/init.d.7.gz man8/rcxdm.8.gz
+%{__ln_s} ../man7/init.d.7.gz man8/rcxfs.8.gz
+# FreeDesktop Bug 35867
+%{__ln_s} rstartd.1.gz man1/rstartd.real.1.gz
+# FreeDesktop Bug 35868
+%{__ln_s} xdm.1.gz man1/chooser.1.gz
+popd
+%fdupes '%{buildroot}%{_datadir}/icons'
+%fdupes '%{buildroot}%{_mandir}/man1'
%clean
rm -rf "$RPM_BUILD_ROOT"
@@ -424,7 +460,7 @@
%{fillup_only -n displaymanager}
%run_permissions
%verifyscript
-%verify_permissions -e /usr/bin/dga
+%verify_permissions -e '%{_bindir}/dga'
exit 0
%preun
@@ -438,12 +474,16 @@
%files
%defattr(-,root,root)
-%doc COPYING.*
-%dir /var/lib/xdm/
-%ifarch ppc64 s390x x86_64
-%dir /usr/%{_lib}/X11
+%doc COPYING.* xedit-*/.doc/xedit
+%dir %{_localstatedir}/lib/xdm/
+%if 0%{?suse_version} >= 01130
+%dir %{_libdir}/X11
+%else
+%ifnarch %ix86
+%dir %{_libdir}/X11
+%endif
%endif
-%dir /usr/%{_lib}/X11/xsm
+%dir %{_libdir}/X11/xsm
%config /etc/logrotate.d/xdm
%config /etc/pam.d/xdm
%config /etc/pam.d/xdm-np
@@ -452,33 +492,35 @@
%config(noreplace) /etc/sysconfig/SuSEfirewall2.d/services/*
/etc/init.d/xdm
/etc/init.d/xfs
-/usr/sbin/mkallcomposecaches
-/usr/sbin/mkcomposecache
-/usr/sbin/rcxdm
-/usr/sbin/rcxfs
-/usr/bin/*
-%exclude /usr/bin/xauth
-/usr/include/X11/bitmaps/*
-/usr/%{_lib}/X11/xdm/
-/usr/%{_lib}/X11/xedit/
-/usr/%{_lib}/libxrx*.so
-%exclude /usr/%{_lib}/libxrx*.*a
-/usr/share/X11/
-/usr/share/applications/*.desktop
-/usr/share/icons/*
+%{_sbindir}/*
+%{_bindir}/*
+%exclude %{_bindir}/xauth
+# XOrg Bug 35984
+%exclude %{_bindir}/xkeystone
+# XOrg Bug 35866
+%exclude %{_bindir}/fontname.sh
+%exclude %{_bindir}/fontprop.sh
+%{_includedir}/X11/bitmaps/*
+%{_libdir}/X11/xdm/
+%{_libdir}/X11/xedit/
+%{_libdir}/libxrx*.so
+%exclude %{_libdir}/libxrx*.*a
+%{_datadir}/X11/
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/*
%{_mandir}/man1/*
%exclude %{_mandir}/man1/xauth.1*
%{_mandir}/man8/*
-/usr/share/xsessions/twm.desktop
+%{_datadir}/xsessions/twm.desktop
/var/adm/fillup-templates/sysconfig.displaymanager
%ghost /var/log/xdm.errors
%ghost /var/run/xdm.pid
-/var/lib/xdm/authdir/
-/usr/%{_lib}/X11/xsm/system.xsm
+%{_localstatedir}/lib/xdm/authdir/
+%{_libdir}/X11/xsm/system.xsm
%files xauth
%defattr(-,root,root)
-/usr/bin/xauth
+%{_bindir}/xauth
%{_mandir}/man1/xauth.1*
%changelog
++++++ 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-22 14:13:21.000000000 +0100
+++ new/etc/init.d/xdm 2011-04-05 14:48:47.000000000 +0200
@@ -20,6 +20,7 @@
# Default-Start: 5
# Default-Stop:
# Description: X Display Manager
+# Short-Description: X Display Manager
### END INIT INFO
# Avoid duplicated messages when earlyxdm was active
++++++ xfs.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/init.d/xfs new/etc/init.d/xfs
--- old/etc/init.d/xfs 2008-08-12 15:56:31.000000000 +0200
+++ new/etc/init.d/xfs 2011-04-05 14:54:44.000000000 +0200
@@ -12,6 +12,7 @@
# Default-Start: 3 5
# Default-Stop:
# Description: X Font Server
+# Short-Description: X Font Server
### END INIT INFO
. /etc/rc.status
++++++ xinit.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xinit/keygen.c new/etc/X11/xinit/keygen.c
--- old/etc/X11/xinit/keygen.c 2001-06-20 14:01:59.000000000 +0200
+++ new/etc/X11/xinit/keygen.c 2011-04-05 12:38:32.000000000 +0200
@@ -32,9 +32,16 @@
#endif
static long keys[4];
-static void generate();
-void main()
+static void generate(seed)
+int seed;
+{ int i;
+ srandom(seed);
+ for (i = 0; i < 4; i++) keys[i] ^= random();
+}
+
+
+int main()
{ int hostid;
int uid;
int gid;
@@ -83,13 +90,10 @@
generate(fs.f_files);
generate(fs.f_ffree);
- (void) printf("%08lx%08lx%08lx%08lx\n",
- keys[0], keys[1], keys[2], keys[3]);
+ if (+printf("%08lx%08lx%08lx%08lx\n",
+ keys[0], keys[1], keys[2], keys[3]) < 0
+ || +fflush (stdout) < 0)
+{ perror ("write"); return +EXIT_FAILURE; }
+else return +EXIT_SUCCESS;
}
-static void generate(seed)
-int seed;
-{ int i;
- srandom(seed);
- for (i = 0; i < 4; i++) keys[i] ^= random();
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/keygen.1 new/keygen.1
--- old/keygen.1 1970-01-01 01:00:00.000000000 +0100
+++ new/keygen.1 2011-04-05 13:34:14.000000000 +0200
@@ -0,0 +1,15 @@
+.TH keygen 1 2011-04-05 University XAuth
+
+.SH NAME
+keygen \- generate magic cookies for xauth
+
+.SH SYNOPSIS
+.B keygen
+
+.SH DESCRIPTION
+Prints a newly generated random key for
+.B xauth
+on the standard output.
+
+.SH SEE ALSO
+xauth(7)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
