slaanesh pushed to xorg-x11-docs (f22). "Update to 1.7.1"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri May 1 10:35:05 UTC 2015


>From 7dc41ad4e460fa78e70cbcb130815618f4b51180 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17 at gmail.com>
Date: Fri, 1 May 2015 12:34:43 +0200
Subject: Update to 1.7.1


diff --git a/.gitignore b/.gitignore
index a671e53..4182658 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xorg-docs-1.3.tar.bz2
 /xorg-docs-1.6.tar.bz2
 /xorg-docs-1.7.tar.bz2
+/xorg-docs-1.7.1.tar.bz2
diff --git a/sources b/sources
index 73675c0..30413cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f9405a1692671d843725b90166370e00  xorg-docs-1.7.tar.bz2
+ce5a04d87b330b9091576b3410dc26d3  xorg-docs-1.7.1.tar.bz2
diff --git a/xorg-x11-docs.spec b/xorg-x11-docs.spec
index b1d12b2..66157fd 100644
--- a/xorg-x11-docs.spec
+++ b/xorg-x11-docs.spec
@@ -3,7 +3,7 @@
 
 Summary:    X.Org X11 documentation
 Name:       xorg-x11-docs
-Version:    1.7
+Version:    1.7.1
 Release:    1%{?dist}
 License:    MIT
 URL:        http://www.x.org
@@ -13,13 +13,14 @@ BuildArch:  noarch
 Source0:    http://www.x.org/pub/individual/doc/%{tarname}-%{version}.tar.bz2
 Patch0:     docs-1.3-registry.patch
 
-BuildRequires:  fop
+#BuildRequires:  fop
 BuildRequires:  ghostscript
 BuildRequires:  java-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(xorg-macros) >= 1.12
 BuildRequires:  pkgconfig(xorg-sgml-doctools) >= 1.1.1
+#BuildRequires:  xmlgraphics-commons
 BuildRequires:  xmlto >= 0.0.22-2
 BuildRequires:  xmlto-tex
 
@@ -33,22 +34,24 @@ implementation.
 
 %build
 autoreconf -v --install
-%configure --docdir=%{_pkgdocdir}
+%configure --docdir=%{_pkgdocdir} --without-fop
 make
 
 %install
 %make_install
+find %{buildroot} -name "*.db" -delete
 
 %files
 %{_pkgdocdir}
-%{_mandir}/man7/Consortium.7*
-%{_mandir}/man7/Standards.7*
-%{_mandir}/man7/X.7*
-%{_mandir}/man7/XOrgFoundation.7*
-%{_mandir}/man7/XProjectTeam.7*
-%{_mandir}/man7/Xsecurity.7*
+%{_mandir}/man7/*
 
 %changelog
+* Fri May 01 2015 Simone Caronni <negativo17 at gmail.com> - 1.7.1-1
+- Update to 1.7.1.
+- Skip PDF document generation through fop. It fixes FTBFS on Fedora 22. Tarball
+  is not yet compatible with Fedora xmlgraphics-commons >= 2.0.
+- Remove useless db files.
+
 * Tue Nov 04 2014 Simone Caronni <negativo17 at gmail.com> - 1.7-1
 - Update to 1.7.
 - Clean up SPEC file, fix rpmlint warnings.
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xorg-x11-docs.git/commit/?h=f22&id=7dc41ad4e460fa78e70cbcb130815618f4b51180


More information about the scm-commits mailing list