SPECS: hyperestraier.spec - %%files fixed: omitted lib*.a and lib*...

[twittner]

Author: twittner                     Date: Sat Apr 29 13:59:11 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- %%files fixed: omitted lib*.a and lib*.la files, moved libjestraier* to
  proper place (javanative subpackage)
- ldconfig invokation for -javanative subpkg. added
- unnecessary inner dependencies killed: {java,ruby}pure subpkg. don't
  require hyperestraier-libs
- bcond_without fcgi and appropriate BR added
- am_ac.patch: `--enable-fcgi' configure switch and appropriate tests added
- bcond_without static_libs added
- rel. 1

---- Files affected:
SPECS:
   hyperestraier.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/hyperestraier.spec
diff -u SPECS/hyperestraier.spec:1.12 SPECS/hyperestraier.spec:1.13
--- SPECS/hyperestraier.spec:1.12	Sat Apr 22 15:46:21 2006
+++ SPECS/hyperestraier.spec	Sat Apr 29 15:59:06 2006
@@ -1,15 +1,16 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	java # Java bindings
-%bcond_without	ruby # Ruby bindings
-%bcond_without	static_libs # don't build static libraries
+%bcond_without	fcgi	# build estseek.fcgi
+%bcond_with	java	# Java bindings
+%bcond_without	ruby	# Ruby bindings
+%bcond_without	static_libs	# don't build static libraries
 #
 Summary:	Full-text search system
 Summary(pl):	Pełnotekstowy system wyszukiwawczy
 Name:		hyperestraier
 Version:	1.2.3
-Release:	0.1
+Release:	1
 License:	LGPL
 Group:		Applications/Text
 Source0:	http://dl.sourceforge.net/hyperestraier/%{name}-%{version}.tar.gz
@@ -19,6 +20,7 @@
 URL:		http://hyperestraier.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
+%{?with_fcgi:BuildRequires:	fcgi-devel}
 BuildRequires:	libtool
 BuildRequires:	qdbm-devel >= 1.8.48-0.3
 %{?with_java:BuildRequires:	jdk}
@@ -114,8 +116,8 @@
 
 %package javapure
 Summary:	Java pure bindings for hyperestraier
+License:	BSD-style
 Group:		Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
 
 %description javapure
 Java pure bindings for hyperestraier.
@@ -131,8 +133,8 @@
 
 %package rubypure
 Summary:	Ruby pure bindings
+License:	BSD-style
 Group:		Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
 %ruby_ver_requires_eq
 
 %description rubypure
@@ -148,6 +150,7 @@
 %{__autoconf}
 %{__automake}
 %configure \
+	--enable-fcgi=%{?with_fcgi:yes}%{!?with_fcgi:no} \
 	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no}
 %{__make}
 
@@ -157,14 +160,14 @@
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-%configure
+%configure \
+	--enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no}
 %{__make}
 cd -
 
 cd javapure
 %{__aclocal}
 %{__autoconf}
-#{__automake}
 %configure
 %{__make}
 cd -
@@ -216,6 +219,9 @@
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
+%post	javanative -p /sbin/ldconfig
+%postun	javanative -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README THANKS hyperestraier.sh
@@ -231,7 +237,7 @@
 # your cgi-bin directory
 %dir %{_libexecdir}
 %attr(755,root,root) %{_libexecdir}/*.cgi
-%attr(755,root,root) %{_libexecdir}/*.fcgi
+%{?with_fcgi:%attr(755,root,root) %{_libexecdir}/*.fcgi}
 %{_mandir}/man1/*
 %dir %{_datadir}/%{name}
 # config templates - don't add to %%config, don't move it to /etc
@@ -258,29 +264,39 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libestraier.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/*
 %attr(755,root,root) %{_bindir}/estconfig
-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/libestraier.so
+%{_libdir}/libestraier.la
 %{_includedir}/*.h
 %{_pkgconfigdir}/*.pc
 %{_mandir}/man3/*
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libestraier.a
+%endif
 
+%if %{with java}
 %files javanative
 %defattr(644,root,root,755)
 %{_libdir}/estraier.jar
+%attr(755,root,root) %{_libdir}/libjestraier.so.*.*.*
+%attr(755,root,root) %{_libdir}/libjestraier.so
+%{_libdir}/libjestraier.la
+%{?with_static_libs:%{_libdir}/libjestraier.a}
 
 %files javapure
 %defattr(644,root,root,755)
 %{_libdir}/estraierpure.jar
+%endif
 
+%if %{with ruby}
 %files rubynative
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/estcmd.rb
@@ -290,6 +306,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/estcall.rb
 %{ruby_sitelibdir}/estraierpure.rb
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -297,6 +314,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/04/29 13:59:06  twittner
+- %%files fixed: omitted lib*.a and lib*.la files, moved libjestraier* to
+  proper place (javanative subpackage)
+- ldconfig invokation for -javanative subpkg. added
+- unnecessary inner dependencies killed: {java,ruby}pure subpkg. don't
+  require hyperestraier-libs
+- bcond_without fcgi and appropriate BR added
+- am_ac.patch: `--enable-fcgi' configure switch and appropriate tests added
+- bcond_without static_libs added
+- rel. 1
+
 Revision 1.12  2006/04/22 13:46:21  twittner
 - up to 1.2.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hyperestraier.spec?r1=1.12&r2=1.13&f=u