SPECS: apache-mod_xslt2.spec - unified

[glen]

Author: glen                         Date: Tue Dec 27 01:28:34 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_xslt2.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_xslt2.spec
diff -u SPECS/apache-mod_xslt2.spec:1.9 SPECS/apache-mod_xslt2.spec:1.10
--- SPECS/apache-mod_xslt2.spec:1.9	Mon Dec 12 14:44:44 2005
+++ SPECS/apache-mod_xslt2.spec	Tue Dec 27 02:28:29 2005
@@ -1,11 +1,13 @@
 # $Revision$, $Date$
+# TODO
+# - update to current apr, apu
 %define		mod_name	xslt
 %define		apxs		/usr/sbin/apxs
+%define		snap	2004083000
 Summary:	Module to serve XML based content
 Summary(pl):	Moduł do udostępniania dokumentów XML
 Name:		apache-mod_%{mod_name}2
 Version:	1.3.6
-%define		snap	2004083000
 Release:	1
 License:	GPL
 Group:		Networking/Daemons
@@ -15,17 +17,17 @@
 Patch0:		%{name}-makefile.patch
 URL:		http://www.mod-xslt2.com/
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel
+BuildRequires:	apache-devel >= 2.0
 BuildRequires:	libxslt-devel
 BuildRequires:	pcre-devel
 Requires(post):	/sbin/ldconfig
-Requires(post,preun):	%{apxs}
-Conflicts:	apache-mod_xslt
+Requires:	apache(modules-api) = %apache_modules_api
 Obsoletes:	apache-mod_xslt
+Conflicts:	apache-mod_xslt
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 mod_xslt is a simple Apache module to serve XML based content. Data is
@@ -77,9 +79,11 @@
 %patch0 -p1
 
 %build
-%configure
-%{__make} \
-	APXS=%{apxs}
+%configure \
+	--with-apr-config=%{_bindir}/apr-1-config \
+	--with-apu-config=%{_bindir}/apu-1-config
+	--with-apxs=%{apxs}
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -88,7 +92,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_xslt2.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -110,8 +114,8 @@
 
 %files
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
 %attr(755,root,root) %{_libdir}/libmodxslt0.so.*.*.*
 
 %files devel
@@ -130,6 +134,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/12/27 01:28:29  glen
+- unified
+
 Revision 1.9  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 
@@ -187,11 +194,11 @@
 - silly polish translation fixed
 
 Revision 1.14  2002/04/25 15:47:07  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.13  2002/04/25 06:51:07  ggodlewski
-Regular expression fixed. Now it works.
-STBR
+- Regular expression fixed. Now it works.
+- STBR
 
 Revision 1.12  2002/03/26 23:47:23  misiek
 - fixed huge bug (zeroing httpd.conf after deinstalation)
@@ -204,13 +211,13 @@
 - release 3
 
 Revision 1.9  2002/02/17 18:52:20  ankry
-- added %%{apxs} local macro to avoid adapter problems
-- fix use of %%{apxs} and %%{_sbindir}/apxs
-- added BR %%{apxs} and Prereq %%{_sbindir}/apxs (if necessary); removed BR apache
+- added %{apxs} local macro to avoid adapter problems
+- fix use of %{apxs} and %{_sbindir}/apxs
+- added BR %{apxs} and Prereq %{_sbindir}/apxs (if necessary); removed BR apache
 - adapterized
 
 Revision 1.8  2002/01/18 02:12:21  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.7  2001/11/22 15:08:38  filon
 - added -DEAPI flag for compiler (new apache API)
@@ -227,10 +234,10 @@
 - fixes
 
 Revision 1.3  2001/05/02 00:42:07  qboosh
-- adapterized and made spec %%debug ready or using %%rpm*flags macros
+- adapterized and made spec %debug ready or using %rpm*flags macros
 
 Revision 1.2  2001/01/25 20:03:20  misiek
-Massive attack. We use -O0 instead -O flags while debug enabled.
+- Massive attack. We use -O0 instead -O flags while debug enabled.
 
 Revision 1.1  2000/07/21 15:44:35  klakier
 - initial version
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_xslt2.spec?r1=1.9&r2=1.10&f=u