diff --git a/xlog2xconf.sh b/xlog2xconf.sh deleted file mode 100644 index 89a6507..0000000 --- a/xlog2xconf.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/sh -# -# Create minimal xorg.conf extracted from Xorg..log -# -# -c (use to specify configfile to create) -# -e (edit file with $EDITOR after creation) -# -f (overwrite existing ) -# -l (use to specify X logfile to read) -# - -if [ $UID -ne 0 ]; then - echo "You must be root" - exit 1 -fi - -configfile=/etc/X11/xorg.conf -editor=false -overwrite=false -logfile=/var/log/Xorg.0.log - -while getopts ":c:efl:" opt; do - case $opt in - c ) configfile=${OPTARG} - ;; - e ) editor=true - ;; - f ) overwrite=true - ;; - l ) logfile=${OPTARG} - ;; - * ) echo 'usage: minimal-xconfig [-c ] [-e] [-f] [-l ]' - exit 1 - ;; - esac -done - -if [ ! -f $logfile ]; then - echo "$logfile does not exist." - echo "Use \"-l \" to specify a different logfile." - exit 1 -fi - -if ! grep -q -- "(==) --- Start of built-in configuration ---" $logfile; then - echo "$logfile does not contain the required xorg.conf section." - echo "Probably it uses a regular xorg.conf." - echo "Use \"-l \" to specify a different logfile." - exit 1 -fi - -if [ -f $configfile -a "$overwrite" == "false" ]; then - echo "$configfile already exists." - echo "Use \"-f\" to overwrite or \"-c \" to specify a different configfile." - exit 1 -fi - -begin=false - -cat $logfile | \ -while read line; do - if [ "$begin" == "true" ]; then - if echo $line | grep -q -- "(==) --- End of built-in configuration ---"; then - break - else - if ! echo $line | grep -q ^Section; then - if ! echo $line | grep -q ^EndSection; then - echo -n " " - fi - fi - echo $line - test "$line" == "EndSection" && echo - fi - elif echo $line | grep -q -- "(==) --- Start of built-in configuration ---"; then - begin=true - fi -done > $configfile - -if [ "$editor" == "true" ]; then - $EDITOR $configfile -else - echo "created $configfile" -fi - -exit 0 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 0fb49cd..2554e54 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Apr 10 20:54:18 CEST 2010 - sndirsch@suse.de + +- specfile cleanup +- removed no longer useful xlog2xconf.sh + ------------------------------------------------------------------- Sat Apr 10 12:26:46 CEST 2010 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 67785a1..09e95e9 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -21,8 +21,6 @@ Name: xorg-x11-server %define dirsuffix 1.8.0 -%define fglrx_driver_hack 0 -### FIXME %define vnc 1 BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-fonts-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 ### udev support (broken on openSUSE 11.2, see also bnc #589997) @@ -33,7 +31,6 @@ BuildRequires: libudev-devel BuildRequires: libjpeg-devel %endif Url: http://xorg.freedesktop.org/ -%define EXPERIMENTAL 0 Version: 7.5_%{dirsuffix} Release: 3 License: GPLv2+ ; MIT License (or similar) @@ -43,27 +40,20 @@ Group: System/X11/Servers/XF86_4 PreReq: %fillup_prereq %endif Requires: pkgconfig xorg-x11-fonts-core xorg-x11 -%if %suse_version > 1010 %ifnarch s390 s390x Provides: VIDEO_ABI_VERSION = 7 Provides: INPUT_ABI_VERSION = 9 Requires: libpixman-1-0 >= 0.15.2 %endif -%endif Provides: xorg-x11-server-glx Obsoletes: xorg-x11-server-glx Summary: X.Org Server Source: xorg-server-%{dirsuffix}.tar.bz2 -%ifnarch s390 s390x Source1: sysconfig.displaymanager.template -%endif Source3: README.updates Source4: xorgcfg.tar.bz2 -%if %suse_version > 1010 Source5: modprobe.nvidia -%endif Source7: xorg-docs-1.4.tar.bz2 -Source8: xlog2xconf.sh Patch1: fpic.diff Patch2: p_default-module-path.diff Patch6: pu_fixes.diff @@ -251,63 +241,35 @@ popd %build pushd xorg-docs-* autoreconf -fi -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -%configure -make +%configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +%{__make} %{?jobs:-j%jobs} popd autoreconf -fi -# DRI2 disabled for Xserver 1.5 as libdrm 2.3.1 doesn't have the -# drmBO functionality. -./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ -%if %fglrx_driver_hack - --with-release-major=7 \ - --with-release-minor=2 \ - --with-release-patch=0 \ - --with-release-snap=0 \ - --with-release-date="%(date)" \ - --with-release-version=7.2.0.0 \ -%endif -%if %vnc - --enable-vnc \ - --disable-xcliplist \ -%endif - --prefix=/usr \ +%configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ --sysconfdir=/etc \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} \ --enable-builddocs \ --enable-install-libxf86config \ -%ifarch %EXPERIMENTAL - --enable-glx-tls \ - --enable-multibuffer \ -%endif -%ifarch s390 s390x - --disable-aiglx \ -%else - --enable-aiglx \ -%endif - --enable-lbx \ --enable-xdmcp \ --enable-xdm-auth-1 \ --enable-dri \ --enable-dri2 \ -%ifarch s390 s390x - --disable-xorg \ -%else - --enable-xorg \ -%endif --disable-dmx \ --enable-xnest \ --enable-kdrive \ --enable-xephyr \ - --disable-xsdl \ - --enable-xprint \ - --disable-kbd_mode \ - --disable-xprint \ --enable-record \ --enable-xcsecurity \ +%ifarch s390 s390x + --disable-xorg \ + --disable-aiglx \ +%else + --enable-xorg \ %if %suse_version > 1120 --enable-config-udev \ +%endif +%endif +%if %vnc + --disable-xcliplist \ %endif --with-log-dir="/var/log" \ --with-os-name="openSUSE" \ @@ -315,8 +277,7 @@ autoreconf -fi --with-fontrootdir="/usr/share/fonts" \ --with-xkb-path="/usr/share/X11/xkb" \ --with-xkb-output="/var/lib/xkb/compiled" -#make %{?jobs:-j %jobs} -make V=1 +make %{?jobs:-j %jobs} make -C hw/kdrive %{?jobs:-j %jobs} %install @@ -329,36 +290,16 @@ find $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/ -name "*.la" | \ xargs rm install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \ $RPM_BUILD_ROOT/usr/include/xorg -# add compatibility symlinks for SUSE <= 10.1 -%if %suse_version <= 1010 -mkdir -p $RPM_BUILD_ROOT/usr/X11R6/bin -ln -snf ../../bin/X $RPM_BUILD_ROOT/usr/X11R6/bin/X -ln -snf ../../bin/Xorg $RPM_BUILD_ROOT/usr/X11R6/bin/Xorg -%endif chmod u+s $RPM_BUILD_ROOT/usr/bin/Xorg mkdir -p $RPM_BUILD_ROOT/var/lib/X11 ln -snf ../../../usr/bin/Xorg $RPM_BUILD_ROOT/var/lib/X11/X ln -snf ../../var/lib/X11/X $RPM_BUILD_ROOT/usr/bin/X mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates/{fonts,input,linux,drivers,multimedia,extensions} install -m 644 $RPM_SOURCE_DIR/README.updates $RPM_BUILD_ROOT/usr/%{_lib}/xorg/modules/updates -%if %suse_version <= 1010 -mkdir -p $RPM_BUILD_ROOT/etc/permissions.d -cat > $RPM_BUILD_ROOT/etc/permissions.d/xorg-x11-server.easy << EOF -/usr/bin/Xorg root:root 4711 -EOF -cat > $RPM_BUILD_ROOT/etc/permissions.d/xorg-x11-server.paranoid << EOF -/usr/bin/Xorg root:root 0711 -EOF -cat > $RPM_BUILD_ROOT/etc/permissions.d/xorg-x11-server.secure << EOF -/usr/bin/Xorg root:root 0711 -EOF -%endif -%else -rm -f $RPM_BUILD_ROOT/usr/share/aclocal/*.m4 -%endif -%if %suse_version > 1010 mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d install -m 644 $RPM_SOURCE_DIR/modprobe.nvidia $RPM_BUILD_ROOT/etc/modprobe.d/50-nvidia.conf +%else +rm -f $RPM_BUILD_ROOT/usr/share/aclocal/*.m4 %endif %if %vnc mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services @@ -372,7 +313,7 @@ EOF rm $RPM_BUILD_ROOT/usr/%{_lib}/pkgconfig/*.pc make -C hw/xfree86/parser mkdir -p $RPM_BUILD_ROOT/usr/include/xorg \ - $RPM_BUILD_ROOT//usr/%{_lib} + $RPM_BUILD_ROOT/usr/%{_lib} install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \ $RPM_BUILD_ROOT/usr/include/xorg install -m 644 hw/xfree86/parser/libxf86config.a \ @@ -383,7 +324,6 @@ mkdir -p %buildroot/var/adm/fillup-templates install -m 644 %_sourcedir/sysconfig.displaymanager.template \ %buildroot/var/adm/fillup-templates/sysconfig.displaymanager-%name %endif -install -m 755 %_sourcedir/xlog2xconf.sh %buildroot/usr/bin/xlog2xconf %clean rm -rf "$RPM_BUILD_ROOT" @@ -392,66 +332,11 @@ rm -rf "$RPM_BUILD_ROOT" %verify_permissions -e /usr/bin/Xorg %endif -%pre -test -L usr/lib/X11 && rm usr/lib/X11 -rm -rf etc/X11/xserver/ -exit 0 - %post %ifnarch s390 s390x %{fillup_only -an displaymanager} %run_permissions -rm -f var/log/XFree86.*.log* -# SaX2 writes xorg.conf since SuSE 9.3 -# - create backup of XF86Config -# - copy XF86Config to xorg.conf -# - set XF86Config symlink to xorg.conf -pushd etc/X11 &> /dev/null - # get rid of symlinks - for file in xorg.conf XF86Config; do - if [ -L $file ]; then - symlink=$file - while test -L $symlink; do - tmp=$(readlink $symlink) - rm -f $symlink - symlink=$tmp - done - mv $symlink $file - fi - done - if [ ! -f xorg.conf -a -f XF86Config ]; then - cp XF86Config xorg.conf - fi - if [ -f xorg.conf ]; then - #test -f XF86Config && old XF86Config - ln -snf xorg.conf XF86Config - fi -popd &> /dev/null if [ -f etc/X11/xorg.conf ]; then - # SuSE 10.1 --> SuSE 10.2: X11 fonts have moved to /usr/share/fonts - # SuSE 10.1 --> SuSE 10.2: radeonold --> radeon - # openSUSE 11.0 --> openSUSE 11.1: i810 --> intel (Bug #448458) - if grep -q -e /usr/X11R6/lib/X11/fonts/ \ - -e /usr/X11/lib/X11/fonts/ \ - -e /usr/lib/X11/fonts/ \ - etc/X11/xorg.conf; then - sed -i.post_xorg-x11-server \ - -e 's+/usr/X11R6/lib/X11/fonts/+/usr/share/fonts/+g' \ - -e 's+/usr/X11/lib/X11/fonts/+/usr/share/fonts/+g' \ - -e 's+/usr/lib/X11/fonts/+/usr/share/fonts/+g' \ - etc/X11/xorg.conf - fi - if grep -q \"radeonold\" etc/X11/xorg.conf; then - # only switch to radeon if radeonold is no longer available (Bug #355009) - if test ! -f /usr/%{_lib}/xorg/modules/drivers/radeonold_drv.so; then - sed -i.post_xorg-x11-server -e 's/\"radeonold\"/\"radeon\"/g' \ - etc/X11/xorg.conf - fi - fi - if grep -q \"i810\" etc/X11/xorg.conf; then - sed -i.post_xorg-x11-server -e 's/\"i810\"/\"intel\"/g' \ - etc/X11/xorg.conf - fi # Document how to restore previous input driver behaviour in xorg.conf files created # on openSUSE <= 11.1 if ! grep -q "will be disabled unless 'Option \"AutoAddDevices\" \"off\"'" etc/X11/xorg.conf; then @@ -470,97 +355,49 @@ a\ fi fi %endif -# Installation of init script seems to be disabled by default -# Create symbolic run level links for xprint start script -if false; then - %{fillup_and_insserv -p xprint} -fi -exit 0 - -%preun -# Installation of init script seems to be disabled by default -if false; then - %stop_on_removal xprint -fi -exit 0 - -%postun -# installation of init script seems to be disabled by default -# Rearrange run level symlinks after removing the xprint init script -if false; then - %{insserv_cleanup} -fi -exit 0 - -%pre sdk -test -L usr/include/X11 && rm usr/include/X11 exit 0 %files %defattr(-,root,root) -%if %suse_version > 1010 -%dir /etc/modprobe.d -/etc/modprobe.d/50-nvidia.conf -%endif -#%ifarch ppc64 x86_64 -#%dir /usr/%{_lib}/X11 -#%endif -%dir /usr/%{_lib}/xorg %ifnarch s390 s390x +%if %suse_version > 1120 +%dir /etc/X11/xorg.conf.d +%endif +%dir /etc/modprobe.d %dir /var/lib/X11 %endif %dir /var/lib/xkb %dir /var/lib/xkb/compiled -%ifnarch s390 s390x -%if %suse_version <= 1010 -/etc/permissions.d/%name.* -%endif -%if %suse_version <= 1010 -/usr/X11R6/bin/X -/usr/X11R6/bin/Xorg -%endif -/usr/bin/X -%endif -%ifnarch s390 s390x -%verify(not mode) /usr/bin/Xorg -/usr/bin/xlog2xconf -%endif -%ifnarch s390 s390x -/usr/bin/cvt -%endif -%ifnarch s390 s390x -/usr/bin/gtf -%endif -%ifnarch s390 s390x -#/usr/%{_lib}/X11/* -/usr/%{_lib}/xorg/modules/ -%{_mandir}/man4/* -%endif +%dir /usr/%{_lib}/xorg /usr/%{_lib}/xorg/protocol.txt %{_mandir}/man1/* +%exclude %{_mandir}/man1/Xephyr.1* %exclude %{_mandir}/man1/Xnest.1* %exclude %{_mandir}/man1/Xvfb.1* -%ifnarch s390 s390x -%{_mandir}/man5/* -%endif %{_mandir}/man7/* -%ifnarch s390 s390x -/var/lib/X11/X -%endif /var/lib/xkb/compiled/README.compiled %ifnarch s390 s390x -/var/adm/fillup-templates/sysconfig.displaymanager-%name -%endif %if %suse_version > 1120 -%dir /etc/X11/xorg.conf.d /etc/X11/xorg.conf.d/10-evdev.conf %endif +/etc/modprobe.d/50-nvidia.conf +%verify(not mode) /usr/bin/Xorg +/usr/bin/X +/usr/bin/cvt +/usr/bin/gtf +/usr/%{_lib}/xorg/modules/ +%{_mandir}/man4/* +%{_mandir}/man5/* +/var/adm/fillup-templates/sysconfig.displaymanager-%name +/var/lib/X11/X +%endif %files extra %defattr(-,root,root) /usr/bin/Xephyr /usr/bin/Xnest /usr/bin/Xvfb +%{_mandir}/man1/Xephyr.1* %{_mandir}/man1/Xnest.1* %{_mandir}/man1/Xvfb.1*