Attachment 889532 Details for Bug 993754 – patch -doc from unversioned to versioned

[patch] patch -doc from unversioned to versioned

flex-versioned-docdir.patch (text/plain), 2.44 KB, created by Christopher Meng on 2014-04-25 06:39:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christopher Meng

Created: 2014-04-25 06:39:44 UTC

Size: 2.44 KB

patch

obsolete

>--- flex.spec.orig	2014-04-25 14:28:25.790501319 +0800
>+++ flex.spec	2014-04-25 14:35:15.105607962 +0800
>@@ -1,13 +1,14 @@
>+%global flexdocdir %{_docdir}/flex-doc
>+
> Summary: A tool for creating scanners (text pattern recognizers)
> Name: flex
> Version: 2.5.37
>-Release: 5%{?dist}
>+Release: 6%{?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.
> # gettext.h (copied from gnulib) is under LGPLv2+
> License: BSD and LGPLv2+
>-Group: Development/Tools
> URL: http://flex.sourceforge.net/
> Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
> 
>@@ -23,7 +24,6 @@
> #fix test-bison-yylloc and test-bison-yylval test failures
> Patch3: 0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch
> 
>-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> Requires: m4
> BuildRequires: gettext bison m4
> Requires(post): /sbin/install-info
>@@ -47,7 +47,6 @@
> # installations of flex.
> %package devel
> Summary: Libraries for flex scanner generator
>-Group: Development/Tools
> Obsoletes: flex-static < 2.5.35-15
> Provides: flex-static
> 
>@@ -59,7 +58,7 @@
> 
> %package doc
> Summary: Documentation for flex scanner generator
>-Group: Documentation
>+BuildArch: noarch
> 
> %description doc
> 
>@@ -73,15 +72,12 @@
> %patch2 -p1
> %patch3 -p1
> 
>-%global flexdocdir %{_datadir}/doc/flex-doc-%{version}
>-
> %build
> %configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS"
> make %{?_smp_mflags}
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
>-make DESTDIR=$RPM_BUILD_ROOT docdir=%{flexdocdir} install
>+%make_install docdir=%{flexdocdir}
> rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
> rm -f $RPM_BUILD_ROOT/%{flexdocdir}/{README.cvs,TODO}
> 
>@@ -112,11 +108,7 @@
> make check
> echo ============END TESTING===========
> 
>-%clean
>-rm -rf ${RPM_BUILD_ROOT}
>-
> %files -f flex.lang
>-%defattr(-,root,root)
> %doc COPYING NEWS README
> %{_bindir}/*
> %{_mandir}/man1/*
>@@ -124,14 +116,15 @@
> %{_infodir}/flex.info*
> 
> %files devel
>-%defattr(-,root,root)
> %{_libdir}/*.a
> 
> %files doc
>-%defattr(-,root,root)
>-%{_datadir}/doc/flex-doc-%{version}
>+%{flexdocdir}/
> 
> %changelog
>+* Thu Apr 24 2014 Christopher Meng <rpm@cicku.me> - 2.5.37-6
>+- Versioned docdir for -doc package.
>+
> * Wed Apr 16 2014 Patsy Franklin <pfrankli@redhat.com> - 2.5.37-5
> - Add a patch to remove obsolete bison constructs YYLEX_PARAM and 
>   YYPARSE_PARAM. Use %lex-param, %parse-param, or %param.

Actions: View | Diff

Attachments on bug 993754: 889532