SPECS: libapreq2.spec - use apache build system - define pdir for ...

[glen]

Author: glen                         Date: Mon Feb 27 13:33:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use apache build system
- define pdir for perl cleanup
- package more files

---- Files affected:
SPECS:
   libapreq2.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/libapreq2.spec
diff -u SPECS/libapreq2.spec:1.23 SPECS/libapreq2.spec:1.24
--- SPECS/libapreq2.spec:1.23	Mon Feb 27 13:16:15 2006
+++ SPECS/libapreq2.spec	Mon Feb 27 14:33:14 2006
@@ -2,10 +2,10 @@
 %bcond_without	static	# don't build static library
 %include	/usr/lib/rpm/macros.perl
 %define	apxs	/usr/sbin/apxs
+%define	pdir	libapreq2
 Summary:	Apache Request Library
 Summary(pl):	Biblioteka żądań Apache
 Name:		libapreq2
-#%define	_devel	03
 Version:	2.07
 Release:	1
 License:	Apache Group
@@ -14,16 +14,18 @@
 # Source0-md5:	6f2e5e4a14e8b190dead0fe91fc13080
 URL:		http://httpd.apache.org/apreq/
 BuildRequires:	%{apxs}
-BuildRequires:	apache >= 2.0.46
 BuildRequires:	apache-devel >= 2.0.46
 BuildRequires:	apache-mod_perl-devel >= 1.99
 BuildRequires:	apr-devel >= 1.0.0
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
-BuildRequires:	perl-ExtUtils-XSBuilder >= 0.23
 BuildRequires:	libtool
+BuildRequires:	perl-ExtUtils-XSBuilder >= 0.23
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
+
 %description
 libapreq is a safe, standards-compliant, high-performance library used
 for parsing HTTP cookies, query-strings and POST data.
@@ -44,6 +46,7 @@
 Summary(pl):	Pliki nagłówkowe libapreq2
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	apache-devel >= 2.0
 
 %description devel
 libapreq2 header files.
@@ -78,8 +81,8 @@
 %package -n apache-mod_%{name}
 Summary:	Apache module mod_libapreq2
 Summary(pl):	Moduł serwera Apache mod_libapreq2
-Group:		Development/Languages/Perl
-Requires:	apache
+Group:		Networking/Daemons
+Requires:	apache(modules-api) = %apache_modules_api
 
 %description -n apache-mod_%{name}
 Apache module mod_libapreq2.
@@ -91,8 +94,6 @@
 %setup -q
 
 %build
-#%{__perl} -pi -e "s:apr-config:apr-1-config:g" acinclude.m4 Makefile.PL
-#%{__perl} -pi -e "s:apu-config:apu-1-config:g" acinclude.m4 Makefile.PL
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
@@ -122,6 +123,9 @@
 %{__make} -C glue/perl install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/APR/Request.pod
+rm -f $RPM_BUILD_ROOT%{_pkglibdir}/mod_apreq2.{a,la}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -138,8 +142,9 @@
 %attr(755,root,root) %{_libdir}/*.so
 %{_libdir}/*.la
 %{_includedir}/apreq2
-#%{_mandir}/man3/libapreq.3*
-#%{_examplesdir}/%{name}-%{version}
+%attr(755,root,root) %{_bindir}/apreq2-config
+%dir %{_includedir}/apache/apreq2
+%{_includedir}/apache/apreq2/apreq_module_apache2.h
 
 %if %{with static}
 %files static
@@ -163,7 +168,7 @@
 
 %files -n apache-mod_%{name}
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/apache/mod_apreq2.so
+%attr(755,root,root) %{_pkglibdir}/mod_apreq2.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -171,6 +176,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/02/27 13:33:14  glen
+- use apache build system
+- define pdir for perl cleanup
+- package more files
+
 Revision 1.23  2006/02/27 12:16:15  qboosh
 - cosmetics
 
================================================================

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