SPECS: apache1-mod_perl.spec - fix mod_perl.html document location...

[glen]

Author: glen                         Date: Thu Dec 29 19:29:40 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix mod_perl.html document location
- remove Provides: mod_perl (no PLD package uses it)
- drop Obsoletes: perl-Apache-Test as it's not clear why it's needed
  and it causes apache2 mod_perl being obsoleted with each this mod_perl package
- fix (activate) apache ipv6 dep
- please test

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

---- Diffs:

================================================================
Index: SPECS/apache1-mod_perl.spec
diff -u SPECS/apache1-mod_perl.spec:1.27 SPECS/apache1-mod_perl.spec:1.28
--- SPECS/apache1-mod_perl.spec:1.27	Mon Dec 26 00:22:14 2005
+++ SPECS/apache1-mod_perl.spec	Thu Dec 29 20:29:35 2005
@@ -1,9 +1,10 @@
 # $Revision$, $Date$
 # TODO:
 # - add devel subpackage
-
-%bcond_without	ipv6		# disable IPv6 support
-
+# - orphaned dirs for %{_manualdocdir}/mod/*html
+#
+%bcond_without	ipv6		# disable IPv6 support. must match same bcond from apache1-devel
+#
 %include	/usr/lib/rpm/macros.perl
 %define		mod_name	perl
 %define 	apxs	/usr/sbin/apxs1
@@ -28,7 +29,7 @@
 Summary(zh_CN):	ÓĂÓÚ Apache web ˇţÎńłĚĐňľÄ Perl ˝âĘÍłĚĐňĄŁ
 Name:		apache1-mod_perl
 Version:	1.29
-Release:	10
+Release:	10.4
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
@@ -39,7 +40,7 @@
 Patch2:		%{name}-optimize.patch
 URL:		http://perl.apache.org/
 BuildRequires:	%{apxs}
-#{?with_ipv6:BuildRequires:	apache1(ipv6)-devel}
+%{?with_ipv6:BuildRequires:	apache1(ipv6)-devel}
 BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	perl-B-Graph
 BuildRequires:	perl-BSD-Resource
@@ -55,16 +56,16 @@
 Requires:	apache1(EAPI)
 Requires:	perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
 Provides:	apache(mod_perl)
-Provides:	mod_perl
 Provides:	perl(mod_perl_hooks)
 Obsoletes:	mod_perl
 Obsoletes:	mod_perl-common
-Obsoletes:	perl-Apache-Test
+%{!?with_ipv6:Conflicts:	apache1(ipv6)}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
 %define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 %define		_noautoreqdep	'perl(Apache::.*)' 'perl(mod_perl)'
+%define		_manualdocdir	%{_datadir}/apache1-manual
 
 %description
 Mod_perl incorporates a Perl interpreter into the Apache web server,
@@ -220,14 +221,14 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/home/apache/manual/mod}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,%{_manualdocdir}/mod}
 
 %{__make} pure_install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install apaci/libperl.so $RPM_BUILD_ROOT%{_pkglibdir}
 install htdocs/manual/mod/mod_perl.html \
-	$RPM_BUILD_ROOT/home/apache/manual/mod
+	$RPM_BUILD_ROOT%{_manualdocdir}/mod
 
 echo 'LoadModule %{mod_name}_module	modules/lib%{mod_name}.so' > \
 	$RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
@@ -264,7 +265,8 @@
 %files
 %defattr(644,root,root,755)
 %doc README INSTALL CREDITS faq/*.html faq/*.txt apache-modlist.html eg
-%doc /home/apache/manual/mod/*html
+# FIXME: parent dirs not owned as the manualdocdir (via apache1-doc) is not in required
+%doc %{_manualdocdir}/mod/*html
 
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*
@@ -295,6 +297,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2005/12/29 19:29:35  glen
+- fix mod_perl.html document location
+- remove Provides: mod_perl (no PLD package uses it)
+- drop Obsoletes: perl-Apache-Test as it's not clear why it's needed
+  and it causes apache2 mod_perl being obsoleted with each this mod_perl package
+- fix (activate) apache ipv6 dep
+- please test
+
 Revision 1.27  2005/12/25 23:22:14  glen
 - Provide apache(mod_perl)
 - sort preamble; rel 10
================================================================

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