rpms/flex/devel flex.spec,1.61,1.62

[Petr Machata]

Author: pmachata

Update of /cvs/pkgs/rpms/flex/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9475

Modified Files:
	flex.spec 
Log Message:
- Move libraries into a sub-package of their own.



Index: flex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/flex/devel/flex.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- flex.spec	12 Jan 2010 14:09:08 -0000	1.61
+++ flex.spec	21 Jan 2010 16:14:15 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: A tool for creating scanners (text pattern recognizers)
 Name: flex
 Version: 2.5.35
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Development/Tools
 URL: http://flex.sourceforge.net/
@@ -15,6 +15,14 @@ BuildRequires: gettext bison m4
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
+# We need to pull in the static library package.  That's necessary so
+# that packages that just do BuildRequires: flex can still use -lfl.
+# I suspect that linking to -lfl is actually rare and those (few)
+# packages that do use it could be taught to require the sub-package
+# explicitly.  So at some point in future, this dependency may be
+# dropped.
+Requires: flex-static = %{version}
+
 %description
 The flex program generates scanners.  Scanners are programs which can
 recognize lexical patterns in text.  Flex takes pairs of regular
@@ -29,6 +37,18 @@ build process.
 You should install flex if you are going to use your system for
 application development.
 
+# We keep the libraries in separate sub-package to allow for multilib
+# installations of flex.
+%package static
+Summary: Libraries for flex scanner generator
+Group: Development/Tools
+
+%description static
+
+This package contains the library with default implementations of
+`main' and `yywrap' functions that the client binary can choose to use
+instead of implementing their own.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -79,11 +99,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc COPYING NEWS README
 %{_bindir}/*
 %{_mandir}/man1/*
-%{_libdir}/*.a
 %{_includedir}/FlexLexer.h
 %{_infodir}/flex.info*
 
+%files static
+%defattr(-,root,root)
+%{_libdir}/*.a
+
 %changelog
+* Wed Jan 20 2010 Petr Machata <pmachata at redhat.com> - 2.5.35-9
+- Move libraries into a sub-package of their own.
+
 * Tue Jan 12 2010 Petr Machata <pmachata at redhat.com> - 2.5.35-8
 - Add source URL