From bc2fdd62f6505f8ccb6c08854bea88122f0c9d3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 20 Jul 2014 00:12:57 +0300
Subject: [PATCH] Make docdir unversioned where appropriate (#993754)

- Install docs to one common package doc dir, drop separate one for -doc
- Include COPYING in -devel
- Fix bogus dates in %changelog
---
 flex.spec | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/flex.spec b/flex.spec
index 8fbb43c..96a2370 100644
--- a/flex.spec
+++ b/flex.spec
@@ -1,7 +1,9 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.37
-Release: 6%{?dist}
+Release: 7%{?dist}
 # parse.c and parse.h are under GPLv3+ with exception which allows
 #	relicensing.  Since flex is shipped under BDS-style license,
 #	let's  assume that the relicensing was done.
@@ -73,17 +75,15 @@ plain text and PDF formats.
 %patch2 -p1
 %patch3 -p1
 
-%global flexdocdir %{_datadir}/doc/flex-doc-%{version}
-
 %build
-%configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS"
+%configure --docdir=%{_pkgdocdir} CFLAGS="-fPIC $RPM_OPT_FLAGS"
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT docdir=%{flexdocdir} install
+make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT/%{flexdocdir}/{README.cvs,TODO}
+rm -f $RPM_BUILD_ROOT/%{_pkgdocdir}/{README.cvs,TODO}
 
 ( cd ${RPM_BUILD_ROOT}
   ln -sf flex .%{_bindir}/lex
@@ -117,7 +117,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -f flex.lang
 %defattr(-,root,root)
-%doc COPYING NEWS README
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/COPYING
+%{_pkgdocdir}/NEWS
+%{_pkgdocdir}/README
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_includedir}/FlexLexer.h
@@ -125,13 +128,21 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files devel
 %defattr(-,root,root)
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/COPYING
 %{_libdir}/*.a
 
 %files doc
 %defattr(-,root,root)
-%{_datadir}/doc/flex-doc-%{version}
+%{_pkgdocdir}
 
 %changelog
+* Sat Jul 19 2014 Ville Skyttä <ville.skytta@iki.fi> - 2.5.37-7
+- Make docdir unversioned where appropriate (#993754)
+- Install docs to one common package doc dir, drop separate one for -doc
+- Include COPYING in -devel
+- Fix bogus dates in %%changelog
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.37-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -317,7 +328,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Wed Mar  8 2006 Petr Machata <pmachata@redhat.com> - 2.5.4a-37.4
 - adding test for #183098 into build process
 
-* Fri Mar  2 2006 Petr Machata <pmachata@redhat.com> - 2.5.4a-37.3
+* Thu Mar  2 2006 Petr Machata <pmachata@redhat.com> - 2.5.4a-37.3
 - rebuilt, no changes inside. In hunt for #183098
 
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.5.4a-37.2
@@ -326,7 +337,7 @@ rm -rf ${RPM_BUILD_ROOT}
 * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.5.4a-37.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-* Wed Feb 02 2006 Petr Machata <pmachata@redhat.com> 2.5.4a-37
+* Thu Feb 02 2006 Petr Machata <pmachata@redhat.com> 2.5.4a-37
 - adding `make bigcheck' into build process.  Refreshing initscan.c to
   make this possible.