SPECS: prelude-manager.spec - strict internal dep, less greedy *.l...

[qboosh]

Author: qboosh                       Date: Sun Jan 14 20:50:01 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- strict internal dep, less greedy *.la removal

---- Files affected:
SPECS:
   prelude-manager.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/prelude-manager.spec
diff -u SPECS/prelude-manager.spec:1.11 SPECS/prelude-manager.spec:1.12
--- SPECS/prelude-manager.spec:1.11	Tue Jan  9 14:21:34 2007
+++ SPECS/prelude-manager.spec	Sun Jan 14 21:49:56 2007
@@ -3,9 +3,9 @@
 # TODO:		- config file templates
 #
 # Conditional build:
-%bcond_without	tcp_wrappers
-%bcond_without	sql
-%bcond_without	xml
+%bcond_without	tcp_wrappers	# build without tcp wrappers support
+%bcond_without	sql		# don't build sql plugin
+%bcond_without	xml		# don't build xml plugin
 #
 Summary:	A Network Intrusion Detection System
 Summary(pl):	System do wykrywania intruzów w sieci
@@ -26,7 +26,7 @@
 %{?with_tcp_wrappers:BuildRequires:	libwrap-devel}
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	rc-scripts
-Requires:	%{name}-libs >= %{version}
+Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -73,18 +73,6 @@
 %description xml -l pl
 Biblioteki dzielone xml prelude-managera.
 
-%package static
-Summary:	Static prelude-manager library
-Summary(pl):	Statyczna biblioteka prelude-managera
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static prelude-manager library.
-
-%description static -l pl
-Statyczna biblioteka prelude-managera.
-
 %package devel
 Summary:	Header files for prelude-manager
 Summary(pl):	Pliki nagłówkowe dla prelude-managera
@@ -97,6 +85,18 @@
 %description devel -l pl
 Pliki nagłówkowe dla prelude-managera.
 
+%package static
+Summary:	Static prelude-manager library
+Summary(pl):	Statyczna biblioteka prelude-managera
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description static
+Static prelude-manager library.
+
+%description static -l pl
+Statyczna biblioteka prelude-managera.
+
 %prep
 %setup -q
 
@@ -111,14 +111,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 # are generating wrong dependencies (and are not needed anyway)
-find $RPM_BUILD_ROOT -iregex .*.la -exec rm {} \;
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*/*.la
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
@@ -178,20 +177,23 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/reports/db.so
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/%{name}/*/*.a
-
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/%{name}
 
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/*/*.a
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007/01/14 20:49:56  qboosh
+- strict internal dep, less greedy *.la removal
+
 Revision 1.11  2007/01/09 13:21:34  alucard
 - unified
 
================================================================

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