OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=38

xorg-docs.diff

@@ -1,6 +1,5 @@
-diff -u -r ../xorg-docs-1.4.orig/Makefile.am ./Makefile.am
---- ../xorg-docs-1.4.orig/Makefile.am	2007-07-03 21:00:40.793307036 +0200
-+++ ./Makefile.am	2007-07-03 21:01:01.688462461 +0200
+--- Makefile.am
++++ Makefile.am
 @@ -20,7 +20,7 @@
  #
  #  Process this file with autoconf to create configure.
@@ -10,9 +9,19 @@ diff -u -r ../xorg-docs-1.4.orig/Makefile.am ./Makefile.am
  x11docdir = @X11DOCDIR@
  
  dist_x11doc_DATA = MAINTAINERS
-diff -u -r ../xorg-docs-1.4.orig/man/general/Makefile.am ./man/general/Makefile.am
---- ../xorg-docs-1.4.orig/man/general/Makefile.am	2007-07-03 21:00:32.984370109 +0200
-+++ ./man/general/Makefile.am	2007-07-03 21:01:45.729466901 +0200
+--- Makefile.am
++++ Makefile.am
+@@ -23,8 +23,6 @@
+ SUBDIRS = man
+ x11docdir = @X11DOCDIR@
+
+-dist_x11doc_DATA = MAINTAINERS
+-
+ EXTRA_DIST = \
+        MAINTAINERS \
+        misc/xlogo.epsi \
+--- man/general/Makefile.am
++++ man/general/Makefile.am
 @@ -23,13 +23,8 @@
  miscmandir = $(MISC_MAN_DIR)
  

xorg-x11-server.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Aug 11 14:02:02 CEST 2007 - dmueller@suse.de
+
+- fix fileconflict over doc/MAINTAINERS
+- build parallel
+
 -------------------------------------------------------------------
 Sat Aug  4 06:01:53 CEST 2007 - sndirsch@suse.de
 

xorg-x11-server.spec

@@ -21,7 +21,7 @@ BuildRequires:  libjpeg-devel
 URL:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.2
-Release:        114
+Release:        117
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -273,8 +273,8 @@ autoreconf -fi
             --with-fontdir="/usr/share/fonts" \
             --with-xkb-path="/usr/share/X11/xkb" \
             --with-xkb-output="/var/lib/xkb/compiled"
-make
-make -C hw/kdrive
+make %{?jobs:-j %jobs}
+make -C hw/kdrive %{?jobs:-j %jobs}
 
 %install
 make -C xorg-docs-* install DESTDIR=$RPM_BUILD_ROOT
@@ -502,18 +502,16 @@ exit 0
 /usr/include/X11/bitmaps/
 /usr/include/X11/pixmaps/
 /usr/%{_lib}/X11/*
+/usr/share/X11/
+/usr/%{_lib}/xorg/modules/
+%{_mandir}/man4/*
+%{_mandir}/man5/*
 %endif
 /usr/%{_lib}/pkgconfig/*.pc
-%ifnarch s390 s390x
-/usr/%{_lib}/xorg/modules/
-%endif
 /usr/%{_lib}/xserver/
-/usr/share/X11/
 %{_mandir}/man1/*
 %{_mandir}/man7/*
 %ifnarch s390 s390x
-%{_mandir}/man4/*
-%{_mandir}/man5/*
 /var/X11R6/bin/X
 %endif
 /var/lib/xkb/compiled/README.compiled
@@ -540,6 +538,9 @@ exit 0
 %endif
 
 %changelog
+* Sat Aug 11 2007 - dmueller@suse.de
+- fix fileconflict over doc/MAINTAINERS
+- build parallel
 * Sat Aug 04 2007 - sndirsch@suse.de
 - updated Mesa source to bugfix release 7.0.1
 * Fri Jul 20 2007 - sndirsch@suse.de