rpms/flex
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Make docdir unversioned where appropriate (#993754)

Browse Source 
- Install docs to one common package doc dir, drop separate one for -doc
- Include COPYING in -devel
- Fix bogus dates in %changelog
This commit is contained in:
Ville Skyttä 2014-07-20 00:12:57 +03:00
parent 509ceeb03a
commit bc2fdd62f6
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
flex.spec
View File

@ -1,7 +1,9 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Summary: A tool for creating scanners (text pattern recognizers) Summary: A tool for creating scanners (text pattern recognizers)
Name: flex Name: flex
Version: 2.5.37 Version: 2.5.37
Release: 6%{?dist} Release: 7%{?dist}
# parse.c and parse.h are under GPLv3+ with exception which allows # parse.c and parse.h are under GPLv3+ with exception which allows
# relicensing. Since flex is shipped under BDS-style license, # relicensing. Since flex is shipped under BDS-style license,
# let's assume that the relicensing was done. # let's assume that the relicensing was done.
@ -73,17 +75,15 @@ plain text and PDF formats.
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%global flexdocdir %{_datadir}/doc/flex-doc-%{version}
%build %build
%configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS" %configure --docdir=%{_pkgdocdir} CFLAGS="-fPIC $RPM_OPT_FLAGS"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT 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/%{_infodir}/dir
rm -f $RPM_BUILD_ROOT/%{flexdocdir}/{README.cvs,TODO} rm -f $RPM_BUILD_ROOT/%{_pkgdocdir}/{README.cvs,TODO}
( cd ${RPM_BUILD_ROOT} ( cd ${RPM_BUILD_ROOT}
ln -sf flex .%{_bindir}/lex ln -sf flex .%{_bindir}/lex
@ -117,7 +117,10 @@ rm -rf ${RPM_BUILD_ROOT}
%files -f flex.lang %files -f flex.lang
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING NEWS README %dir %{_pkgdocdir}
%{_pkgdocdir}/COPYING
%{_pkgdocdir}/NEWS
%{_pkgdocdir}/README
%{_bindir}/* %{_bindir}/*
%{_mandir}/man1/* %{_mandir}/man1/*
%{_includedir}/FlexLexer.h %{_includedir}/FlexLexer.h
@ -125,13 +128,21 @@ rm -rf ${RPM_BUILD_ROOT}
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%dir %{_pkgdocdir}
%{_pkgdocdir}/COPYING
%{_libdir}/*.a %{_libdir}/*.a
%files doc %files doc
%defattr(-,root,root) %defattr(-,root,root)
%{_datadir}/doc/flex-doc-%{version} %{_pkgdocdir}
%changelog %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 * 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 - 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 * Wed Mar 8 2006 Petr Machata <pmachata@redhat.com> - 2.5.4a-37.4
- adding test for #183098 into build process - 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 - rebuilt, no changes inside. In hunt for #183098
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.5.4a-37.2 * 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 * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.5.4a-37.1
- rebuilt for new gcc4.1 snapshot and glibc changes - 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 - adding `make bigcheck' into build process. Refreshing initscan.c to
make this possible. make this possible.