Hello community, here is the log from the commit of package xsession checked in at Wed Aug 2 16:24:35 CEST 2006. -------- --- xsession/xsession.changes 2006-01-25 21:43:27.000000000 +0100 +++ xsession/xsession.changes 2006-08-02 15:17:17.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 2 15:16:46 CEST 2006 - werner@suse.de + +- Make it build with X11R7 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xsession.spec ++++++ --- /var/tmp/diff_new_pack.fBFqt7/_old 2006-08-02 16:24:30.000000000 +0200 +++ /var/tmp/diff_new_pack.fBFqt7/_new 2006-08-02 16:24:30.000000000 +0200 @@ -1,15 +1,14 @@ # # spec file for package xsession (Version 1.1) # -# Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -# usedforbuild aaa_base acl attr bash bind-utils bison bzip2 coreutils cpio cpp cvs cyrus-sasl db devs diffutils e2fsprogs file filesystem fillup findutils flex gawk gdbm-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv kbd less libacl libattr libgcc libstdc++ libxcrypt m4 make man mktemp modutils ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-devel pam-modules patch permissions popt ps rcs readline sed sendmail shadow strace syslogd sysvinit tar texinfo timezone unzip util-linux vim zlib zlib-devel XFree86 XFree86-devel XFree86-libs autoconf automake binutils cracklib expat fontconfig fontconfig-devel gcc gdbm gettext libtool perl rpm Name: xsession BuildRequires: xorg-x11 xorg-x11-devel @@ -17,10 +16,20 @@ Group: System/X11/Utilities Autoreqprov: on Version: 1.1 -Release: 934 +Release: 1027 Summary: A session manager Source: xsession-1.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} +%if "%_exec_prefix" == "/usr/X11R6" + +%global _mandir %{_exec_prefix}/man +%define _x11data %{_exec_prefix}/lib/X11 +%define _appdefdir %{_x11data}/app-defaults +%else +%define _x11data %{_datadir}/X11 +%define _appdefdir %{_x11data}/app-defaults +%endif %description The xsession program is a session manager. It is normally executed by @@ -47,21 +56,20 @@ make %install -make DESTDIR=$RPM_BUILD_ROOT install -make DESTDIR=$RPM_BUILD_ROOT install.man - -%clean -rm -rf $RPM_BUILD_ROOT +make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install.man %files %defattr(-,root,root) %doc CHANGES ChangeLog INSTALL README examples -/usr/X11R6/bin/xsession -%config /usr/X11R6/lib/X11/app-defaults/XSession -%config /usr/X11R6/lib/X11/app-defaults/XSession-color -%doc /usr/X11R6/man/man1/xsession.1x.gz +%{_bindir}/xsession +%config %{_appdefdir}/XSession +%config %{_appdefdir}/XSession-color +%doc %{_mandir}/man1/xsession.1x.gz %changelog -n xsession +* Wed Aug 02 2006 - werner@suse.de +- Make it build with X11R7 * Wed Jan 25 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Sun Jan 11 2004 - adrian@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...