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

xorg-docs-1.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fffc67e50ce396e6ddd95e842fa8351954b8f09cb729a9a062e0496a8bda4925
+size 8300321

xorg-docs.diff

@@ -0,0 +1,30 @@
+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
+@@ -20,7 +20,7 @@
+ #
+ #  Process this file with autoconf to create configure.
+ 
+-SUBDIRS = hardcopy man sgml
++SUBDIRS = man
+ 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
+@@ -23,13 +23,8 @@
+ miscmandir = $(MISC_MAN_DIR)
+ 
+ miscman_PRE = \
+-	Consortium.man \
+ 	security.man \
+-	Standards.man \
+-	X.man \
+-	XOrgFoundation.man \
+-	Xprint.man \
+-	XProjectTeam.man
++	X.man
+ 
+ miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@)
+ 

xorg-x11-server.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul  3 21:09:06 CEST 2007 - sndirsch@suse.de
+
+- added X(7) and security(7) manual pages
+
 -------------------------------------------------------------------
 Sat Jun 23 04:56:28 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:        99
+Release:        101
 License:        X11/MIT
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4
@@ -44,6 +44,7 @@ Source5:        modprobe.nvidia
 %if %vnc
 Source6:        0018-vnc-support.txt.mbox
 %endif
+Source7:        xorg-docs-1.4.tar.bz2
 Patch:          64bit.diff
 Patch1:         fpic.diff
 Patch2:         p_default-module-path.diff
@@ -87,6 +88,7 @@ Patch63:        xorg-x11-server-1.2.99-unbreak-domain.patch
 Patch64:        support_mesa6.5.3.patch
 Patch65:        remove__GLinterface.patch
 Patch66:        commit-c09e68c
+Patch67:        xorg-docs.diff
 Patch334:       p_pci-domain.diff
 Patch357:       p_pci-ce-x.diff
 
@@ -142,7 +144,7 @@ An X Window System server for Virtual Network Computing (VNC).
 
 %endif
 %prep
-%setup -q -n xorg-server-%{dirsuffix} -b1 -a4
+%setup -q -n xorg-server-%{dirsuffix} -b1 -a4 -a7
 # make legal department happy (Bug #204110)
 test -f ../Mesa-7.0/src/mesa/drivers/directfb/idirectfbgl_mesa.c && exit 1
 test -f ../Mesa-7.0/progs/ggi/asc-view.c && exit 1
@@ -196,8 +198,17 @@ popd
 %patch64 -p2
 %patch65 -p2
 %patch66 -p1
+pushd xorg-docs-*
+%patch67
+popd
 
 %build
+pushd xorg-docs-*
+autoreconf -fi
+./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
+                --prefix=/usr --libdir=%{_libdir} --mandir=%{_mandir}
+make
+popd
 autoreconf -fi
 ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
 %if %fglrx_driver_hack
@@ -264,6 +275,7 @@ make
 make -C hw/kdrive
 
 %install
+make -C xorg-docs-* install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 make -C hw/kdrive install DESTDIR=$RPM_BUILD_ROOT
 %ifnarch s390 s390x
@@ -501,6 +513,7 @@ exit 0
 %ifnarch s390 s390x
 %{_mandir}/man4/*
 %{_mandir}/man5/*
+%{_mandir}/man7/*
 /var/X11R6/bin/X
 %endif
 /var/lib/xkb/compiled/README.compiled
@@ -527,6 +540,8 @@ exit 0
 %endif
 
 %changelog
+* Tue Jul 03 2007 - sndirsch@suse.de
+- added X(7) and security(7) manual pages
 * Sat Jun 23 2007 - sndirsch@suse.de
 - updated Mesa source to final release 7.0
 * Thu Jun 21 2007 - sndirsch@suse.de