Hello community,

here is the log from the commit of package xorg-x11-doc for openSUSE:Factory 
checked in at 2011-10-25 17:22:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorg-x11-doc (Old)
 and      /work/SRC/openSUSE:Factory/.xorg-x11-doc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "xorg-x11-doc", Maintainer is "sndir...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/xorg-x11-doc/xorg-x11-doc.changes        
2011-09-23 12:52:12.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xorg-x11-doc.new/xorg-x11-doc.changes   
2011-10-28 15:31:00.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Oct 19 14:05:14 UTC 2011 - idon...@suse.com
+
+- Add xmlto dependency to fix bnc#698117
+- Cleanup spec file
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xorg-x11-doc.spec ++++++
--- /var/tmp/diff_new_pack.pdrOTL/_old  2011-10-28 15:31:38.000000000 +0200
+++ /var/tmp/diff_new_pack.pdrOTL/_new  2011-10-28 15:31:38.000000000 +0200
@@ -15,53 +15,43 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
+%define rversion 1.6
 
 Name:           xorg-x11-doc
-BuildRequires:  docbook-utils pkgconfig xorg-x11-util-devel
-Url:            http://xorg.freedesktop.org/
 Version:        7.6
 Release:        9
 License:        MIT
-BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Summary:        X
+Url:            http://xorg.freedesktop.org/
 Group:          Documentation/Other
-Summary:        X.Org documentation
 Source:         xorg-docs-1.6.tar.bz2
+BuildRequires:  docbook-utils
+# For xmlto txt support
+BuildRequires:  lynx
+BuildRequires:  pkgconfig
+BuildRequires:  xmlto
+BuildRequires:  xorg-x11-util-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 X.Org documentation in compressed PostScript format.
 
-
-
 %prep
-%setup -T -c %{name}
-for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
+%setup -q -n xorg-docs-%{rversion}
 
 %build
-for dir in $(ls */configure.ac); do
-  pushd $(dirname $dir)
-    autoreconf -fi
-    ./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
-                --prefix=/usr --libdir=%{_libdir} --mandir=%{_mandir} \
-                --disable-txt --enable-pdf --disable-ps --enable-html
-    make
-  popd
-done
+%configure CFLAGS="%{optflags} -fno-strict-aliasing"
+make
 
 %install
-for dir in $(ls */configure.ac); do
-  pushd $(dirname $dir); make install DESTDIR=$RPM_BUILD_ROOT; popd
-done
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
+%makeinstall
 
 %files
 %defattr(-,root,root)
 %doc %{_mandir}/man7/*
-%doc /usr/share/doc/xorg-docs/
+%doc %{_datadir}/doc/xorg-docs/
 # contained in server package
 %exclude %{_mandir}/man7/Xsecurity.*
 %exclude %{_mandir}/man7/X.*

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to