SPECS: libapreq2.spec - unified bcond (s/static/static_libs/) - fi...

[qboosh]

Author: qboosh                       Date: Mon Feb 27 22:21:24 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified bcond (s/static/static_libs/)
- files cleanup

---- Files affected:
SPECS:
   libapreq2.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: SPECS/libapreq2.spec
diff -u SPECS/libapreq2.spec:1.27 SPECS/libapreq2.spec:1.28
--- SPECS/libapreq2.spec:1.27	Mon Feb 27 22:16:45 2006
+++ SPECS/libapreq2.spec	Mon Feb 27 23:21:18 2006
@@ -1,5 +1,8 @@
 # $Revision$, $Date$
-%bcond_without	static	# don't build static library
+#
+# Conditional build:
+%bcond_without	static_libs	# don't build static library
+#
 %include	/usr/lib/rpm/macros.perl
 %define	apxs	/usr/sbin/apxs
 %define	pdir	libapreq2
@@ -104,7 +107,7 @@
 %configure \
 	--enable-perl-glue \
 	--with-apache2-apxs=%{apxs} \
-	%{!?with_static:--disable-static}
+	%{!?with_static_libs:--disable-static}
 
 %{__make}
 
@@ -125,7 +128,7 @@
 %{__make} -C glue/perl install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/APR/Request.pod
+rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/APR/{Request.pod,Request/*.pod}
 rm -f $RPM_BUILD_ROOT%{_pkglibdir}/mod_apreq2.{a,la}
 install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/76_mod_apreq2.conf
 
@@ -146,32 +149,33 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGES README
-%attr(755,root,root) %{_libdir}/*.so.*.*
+%attr(755,root,root) %{_libdir}/libapreq2.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
+%attr(755,root,root) %{_libdir}/libapreq2.so
+%{_libdir}/libapreq2.la
 %{_includedir}/apreq2
 %attr(755,root,root) %{_bindir}/apreq2-config
 %dir %{_includedir}/apache/apreq2
 %{_includedir}/apache/apreq2/apreq_module_apache2.h
 
-%if %{with static}
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libapreq2.a
 %endif
 
 %files -n perl-%{name}
 %defattr(644,root,root,755)
 %{perl_vendorarch}/Apache2/*.pm
-%dir %{perl_vendorarch}/APR
 %{perl_vendorarch}/APR/*.pm
 %dir %{perl_vendorarch}/APR/Request
-%{perl_vendorarch}/APR/Request/*
-
-%{perl_vendorarch}/auto/APR/*
+%{perl_vendorarch}/APR/Request/*.pm
+%dir %{perl_vendorarch}/auto/APR/Request
+%dir %{perl_vendorarch}/auto/APR/Request/*
+%{perl_vendorarch}/auto/APR/Request/*/*.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/APR/Request/*/*.so
 
 # TODO: generate these manually; Makefile.PL (and overall logic) is broken
 %{_mandir}/man3/Apache*
@@ -188,6 +192,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2006/02/27 22:21:18  qboosh
+- unified bcond (s/static/static_libs/)
+- files cleanup
+
 Revision 1.27  2006/02/27 21:16:45  glen
 - simplify, compatible with apache 2.0 build, unify with other apache-mod* packages
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libapreq2.spec?r1=1.27&r2=1.28&f=u