[xorg-x11-docs/f21] Update to 1.7, clean up SPEC file

[Simone Caronni]

commit fd9158636e9ba0f517bf6ea5d59825f116a196f5
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Tue Nov 4 18:19:04 2014 +0100

    Update to 1.7, clean up SPEC file

 .gitignore         |    1 +
 sources            |    2 +-
 xorg-x11-docs.spec |   88 ++++++++++++++++------------------------------------
 3 files changed, 29 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8705ac..a671e53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xorg-docs-1.3.tar.bz2
 /xorg-docs-1.6.tar.bz2
+/xorg-docs-1.7.tar.bz2
diff --git a/sources b/sources
index ae09eba..73675c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86101433834b485ab243f235757d7079  xorg-docs-1.6.tar.bz2
+f9405a1692671d843725b90166370e00  xorg-docs-1.7.tar.bz2
diff --git a/xorg-x11-docs.spec b/xorg-x11-docs.spec
index c350d0a..b1d12b2 100644
--- a/xorg-x11-docs.spec
+++ b/xorg-x11-docs.spec
@@ -1,26 +1,27 @@
 %define tarname xorg-docs
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
-Summary: X.Org X11 documentation
-Name: xorg-x11-docs
-Version: 1.6
-Release: 8%{?dist}
-License: MIT
-Group: Documentation
-URL: http://www.x.org
-
-BuildArch: noarch
-
-Source0: ftp://ftp.x.org/pub/individual/doc/%{tarname}-%{version}.tar.bz2
-Patch0: docs-1.3-registry.patch
-
-BuildRequires: pkgconfig autoconf automake libtool
-BuildRequires: xorg-sgml-doctools >= 1.1.1
-BuildRequires: xorg-x11-util-macros
-BuildRequires: ghostscript
-BuildRequires: xmlto >= 0.0.24-2
-BuildRequires: xmlto-tex fop
-BuildRequires: java-devel
+Summary:    X.Org X11 documentation
+Name:       xorg-x11-docs
+Version:    1.7
+Release:    1%{?dist}
+License:    MIT
+URL:        http://www.x.org
+
+BuildArch:  noarch
+
+Source0:    http://www.x.org/pub/individual/doc/%{tarname}-%{version}.tar.bz2
+Patch0:     docs-1.3-registry.patch
+
+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:  xmlto >= 0.0.22-2
+BuildRequires:  xmlto-tex
 
 %description
 Protocol and other technical documentation for the X.Org X11 X Window System
@@ -31,21 +32,14 @@ implementation.
 %patch0 -p1 -b .registry
 
 %build
-autoreconf -v --install || exit 1
+autoreconf -v --install
 %configure --docdir=%{_pkgdocdir}
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_mandir}/man7/Xprint.7*
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%make_install
 
 %files
-%defattr(-,root,root,-)
 %{_pkgdocdir}
 %{_mandir}/man7/Consortium.7*
 %{_mandir}/man7/Standards.7*
@@ -55,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/Xsecurity.7*
 
 %changelog
+* Tue Nov 04 2014 Simone Caronni <negativo17 at gmail.com> - 1.7-1
+- Update to 1.7.
+- Clean up SPEC file, fix rpmlint warnings.
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -81,35 +79,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Nov 22 2010 Adam Jackson <ajax at redhat.com> 1.3-7
 - Fix ps-to-pdf conversion even harder.
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Feb 13 2009 Adam Jackson <ajax at redhat.com> 1.3-4
-- Fix %%x11docdir to match %%name. (#484734)
-
-* Tue Jul 15 2008 Adam Jackson <ajax at redhat.com> 1.3-3
-- Fix license tag.
-
-* Tue Dec 25 2007 Adam Jackson <ajax at redhat.com> 1.3-2
-- Install PDF instead of gzipped PostScript.
-- Move everything to /usr/share/doc to be more like other doc packages.
-- Add 'registry' to the doc set.
-
-* Mon Feb 05 2007 Adam Jackson <ajax at redhat.com> 1.3-1
-- Update to 1.3
-
-* Tue Jul 25 2006 Mike A. Harris <mharris at redhat.com> 1.2-4.fc6
-- Fix the package summary/description.
-
-* Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 1.2-3.fc6
-- Added "Provides: XFree86-doc, xorg-x11-doc" as per request in (#199927)
-
-* Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 1.2-2.fc6
-- Change rpm Group to "Documentation", which is what other docs packages use.
-
-* Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 1.2-1.fc6
-- Initial build.