Hello community, here is the log from the commit of package xorg-x11 checked in at Wed Aug 23 20:51:43 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-08-21 17:58:24.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-08-22 18:32:58.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Aug 22 16:29:46 CEST 2006 - sndirsch@suse.de + +- cleanup + +------------------------------------------------------------------- +Mon Aug 21 18:53:38 CEST 2006 - sndirsch@suse.de + +- integrated suse-addons.diff into suse-addons.tar.bz2 + +------------------------------------------------------------------- Old: ---- suse-addons.diff suse-addons.tar.bz2 xdm.diff xdm.tar.gz New: ---- misc.tar.bz2 twm.tar.bz2 xdm.tar.bz2 xfs.tar.bz2 xinit.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.aB1Xe6/_old 2006-08-23 20:51:30.000000000 +0200 +++ /var/tmp/diff_new_pack.aB1Xe6/_new 2006-08-23 20:51:30.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: cpp fontconfig-devel freetype2-devel libpng-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 URL: http://xorg.freedesktop.org/ Version: 7.1 -Release: 16 +Release: 17 License: X11/MIT, Other License(s), see package BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities @@ -115,9 +115,11 @@ Source92: xwud-X11R7.0-1.0.1.tar.bz2 Source93: mkcomposecache-1.1.tar.bz2 Source94: rendercheck-1.1.tar.bz2 -Source95: xdm.tar.gz -Source96: suse-addons.tar.bz2 -Patch: xdm.diff +Source200: misc.tar.bz2 +Source201: twm.tar.bz2 +Source202: xdm.tar.bz2 +Source203: xfs.tar.bz2 +Source204: xinit.tar.bz2 Patch1: xfs.diff Patch2: lbxproxy.diff Patch3: proxymngr.diff @@ -126,7 +128,6 @@ Patch6: xedit.diff Patch7: xinit.diff Patch8: xsm.diff -Patch9: suse-addons.diff Patch10: xrx.diff Patch11: xconsole.diff Patch12: ps_suse.diff @@ -195,8 +196,7 @@ %prep %setup -n . -T -D rm -rf $RPM_BUILD_DIR/* -for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done -%patch9 +for i in $RPM_SOURCE_DIR/*-*.tar.bz2; do tar xjf $i; done pushd xfs-* %patch1 popd @@ -266,89 +266,103 @@ --mandir=%{_mandir} ${option} make make install DESTDIR=$RPM_BUILD_ROOT + # for some compatibility symlinks + mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin case $dir in - xdm-*) - pushd $RPM_BUILD_ROOT/etc/X11/xdm - rm -f GiveConsole TakeConsole Xsetup_0 # Not used anymore by SuSE - rm -f authdir # Correct location (FHS-2.1) - tar xzf $RPM_SOURCE_DIR/xdm.tar.gz # SuSE default XDM configuration - patch -p0 -s < $RPM_SOURCE_DIR/xdm.diff + xinit-*) + pushd $RPM_BUILD_ROOT + tar xjf $RPM_SOURCE_DIR/xinit.tar.bz2 popd - mv $RPM_BUILD_ROOT/etc/X11/xdm/xinitrc* \ - $RPM_BUILD_ROOT/etc/X11/xinit - mkdir -p $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d mkdir -p $RPM_BUILD_ROOT/etc/skel cp $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc \ $RPM_BUILD_ROOT/etc/skel/.xinitrc.template - mkdir -p $RPM_BUILD_ROOT/var/lib/xdm/authdir/authfiles - chmod 0700 $RPM_BUILD_ROOT/var/lib/xdm/authdir/authfiles - chmod 0700 $RPM_BUILD_ROOT/var/lib/xdm/authdir - ln -snf ../../../var/lib/xdm/authdir $RPM_BUILD_ROOT/etc/X11/xdm/authdir - mkdir -p $RPM_BUILD_ROOT/var/log - touch $RPM_BUILD_ROOT/var/log/xdm.errors - chmod 0640 $RPM_BUILD_ROOT/var/log/xdm.errors - mkdir -p $RPM_BUILD_ROOT/var/run - touch $RPM_BUILD_ROOT/var/run/xdm.pid - chmod 0640 $RPM_BUILD_ROOT/var/run/xdm.pid - mkdir -p $RPM_BUILD_ROOT/etc/pam.d - install -m 0644 ../suse/xdm.pamd $RPM_BUILD_ROOT/etc/pam.d/xdm - mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d - install -m 0644 ../suse/logrotate.xdm $RPM_BUILD_ROOT/etc/logrotate.d/xdm -%if %suse_version > 1010 - install -m 0755 ../suse/SuSEconfig.xdm $RPM_BUILD_ROOT/etc/X11/xdm -%else - mkdir -p $RPM_BUILD_ROOT/sbin/conf.d/ - install -m 0755 ../suse/SuSEconfig.xdm $RPM_BUILD_ROOT/sbin/conf.d/ + 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 +%if %suse_version <= 1010 + ln -s /usr/bin/startx $RPM_BUILD_ROOT/usr/X11R6/bin/startx %endif - # for FHS compliance (Bug #21857) - mv $RPM_BUILD_ROOT/etc/X11/xdm/chooser $RPM_BUILD_ROOT/usr/bin/ ;; mkcomposecache-*) install -m 0755 mkallcomposecaches.sh $RPM_BUILD_ROOT/usr/sbin/mkallcomposecaches ;; - *) + mkfontdir-*) +%if %suse_version <= 1010 + ln -s /usr/bin/mkfontdir $RPM_BUILD_ROOT/usr/X11R6/bin/mkfontdir +%endif ;; - esac + proxymngr-*) + 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 popd -done -sed -i s+$RPM_BUILD_ROOT++g $RPM_BUILD_ROOT/etc/X11/proxymngr/pmconfig -# some compatibility symlinks -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin + %suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/twm.desktop + ;; + xauth-*) + ln -s /usr/bin/xauth $RPM_BUILD_ROOT/usr/X11R6/bin/xauth + ;; + xcalc-*) + %suse_update_desktop_file -i -u xcalc Calculator + ;; + xclipboard-*) + %suse_update_desktop_file -i -u xclipboard DesktopUtility + ;; + xdm-*) + # Not used anymore by SuSE + 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 + 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 + # for FHS compliance (Bug #21857) + mv $RPM_BUILD_ROOT/etc/X11/xdm/chooser $RPM_BUILD_ROOT/usr/bin/ %if %suse_version <= 1010 -ln -s ../../bin/xdm $RPM_BUILD_ROOT/usr/X11R6/bin/xdm -ln -s ../../bin/xset $RPM_BUILD_ROOT/usr/X11R6/bin/xset -ln -s ../../bin/mkfontdir $RPM_BUILD_ROOT/usr/X11R6/bin/mkfontdir -ln -s ../../bin/startx $RPM_BUILD_ROOT/usr/X11R6/bin/startx + mkdir -p $RPM_BUILD_ROOT/sbin/conf.d + ln -snf /etc/X11/xdm/SuSEconfig.xdm \ + $RPM_BUILD_ROOT/sbin/conf.d/SuSEconfig.xdm + ln -s /usr/bin/xdm $RPM_BUILD_ROOT/usr/X11R6/bin/xdm %endif -ln -s ../../bin/xauth $RPM_BUILD_ROOT/usr/X11R6/bin/xauth -install -m 0444 suse/Xresources $RPM_BUILD_ROOT/etc/X11/ -# C/nls.dir: 'C' language support; still required for acroread and -# other Motif-based applications -mkdir -p $RPM_BUILD_ROOT/usr/share/X11/nls -install -m 0444 suse/C $RPM_BUILD_ROOT/usr/share/X11/nls/ -install -m 0444 suse/nls.dir $RPM_BUILD_ROOT/usr/share/X11/nls/ -gcc $RPM_OPT_FLAGS -fno-strict-aliasing -o suse/keygen suse/keygen.c -install -m 0711 suse/keygen $RPM_BUILD_ROOT/usr/bin/ -install -m 0444 suse/Xmodmap $RPM_BUILD_ROOT/etc/X11/ -install -m 0444 suse/Xmodmap.remote $RPM_BUILD_ROOT/etc/X11/ -install -m 0644 suse/config.xfs $RPM_BUILD_ROOT/etc/X11/fs/config -mkdir -p $RPM_BUILD_ROOT/etc/init.d -install -m 0755 suse/rcxfs $RPM_BUILD_ROOT/etc/init.d/xfs -ln -snf /etc/init.d/xfs $RPM_BUILD_ROOT/usr/sbin/rcxfs -mkdir -p $RPM_BUILD_ROOT/usr/share/xsessions/ -install -m 0644 suse/twm.desktop $RPM_BUILD_ROOT/usr/share/xsessions/ -%suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/twm.desktop -%ifnarch s390 s390x -install -m 0755 suse/xserverrc $RPM_BUILD_ROOT/etc/X11/xinit/xserverrc + ;; + xfs-*) + pushd $RPM_BUILD_ROOT + tar xjf $RPM_SOURCE_DIR/xfs.tar.bz2 + popd + mkdir -p $RPM_BUILD_ROOT/usr/sbin + ln -snf /etc/init.d/xfs $RPM_BUILD_ROOT/usr/sbin/rcxfs + ;; + xkill-*) + %suse_update_desktop_file -i -u Xkill DesktopUtility + ;; + xload-*) + %suse_update_desktop_file -i -u xload System Monitor + ;; + xmag-*) + %suse_update_desktop_file -i -u xmag DesktopUtility + ;; + xrefresh-*) + %suse_update_desktop_file -i -u Xrefresh DesktopUtility + ;; + xset-*) +%if %suse_version <= 1010 + ln -s /usr/bin/xset $RPM_BUILD_ROOT/usr/X11R6/bin/xset %endif -# desktop files -%suse_update_desktop_file -i -u xmag DesktopUtility -%suse_update_desktop_file -i -u xload System Monitor -%suse_update_desktop_file -i -u Xkill DesktopUtility -%suse_update_desktop_file -i -u xcalc Calculator -%suse_update_desktop_file -i -u Xrefresh DesktopUtility -%suse_update_desktop_file -i -u xclipboard DesktopUtility -%suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/xsessions/twm.desktop + ;; + *) + ;; + esac + popd +done +# Xresources, Xmodmap, ... +pushd $RPM_BUILD_ROOT +tar xjf $RPM_SOURCE_DIR/misc.tar.bz2 +popd %clean rm -rf "$RPM_BUILD_ROOT" @@ -410,6 +424,10 @@ /var/lib/xdm/authdir/ %changelog -n xorg-x11 +* Tue Aug 22 2006 - sndirsch@suse.de +- cleanup +* Mon Aug 21 2006 - sndirsch@suse.de +- integrated suse-addons.diff into suse-addons.tar.bz2 * Mon Aug 21 2006 - sndirsch@suse.de - SuSEconfig.xdm: only rewrite config files and X symlink when sysconfig file is more recent ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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@suse.de