X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=apache1-mod_perl.spec;h=dceb5dd123c774f9c6516375d615d469ba491178;hb=HEAD;hp=06fec02ca8b5b77526bbd7ed544320e1df12bd35;hpb=4c06d90ae2aa624120211ec1ef24542d90f8a2dd;p=packages%2Fapache1-mod_perl.git

diff --git a/apache1-mod_perl.spec b/apache1-mod_perl.spec
index 06fec02..dceb5dd 100644
--- a/apache1-mod_perl.spec
+++ b/apache1-mod_perl.spec
@@ -1,45 +1,47 @@
-# TODO:
-# - orphaned dirs for %{_manualdocdir}/mod/*html
+# TODO
+# - hard to solve and is it worth?
+#   Apache::Util::escape_html() can't be used outside Aapache it is xs and in shared library which is also the apache module
+#   fix would be probably link only Apachye symbols to apache module and put rest of the symbols as perl library
+#   perl-HTML-Menu-Select uses that method in test.
+# 
+# Conditional build:
+%bcond_without	ipv6	# IPv6 support (must match same bcond from apache1-devel)
 #
-%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
 Summary:	A Perl interpreter for the Apache Web server
-Summary(cs.UTF-8):   Vestavěný interpret Perlu pro WWW server Apache
-Summary(da.UTF-8):   En indbygget Perl-fortolker for webtjeneren Apache
-Summary(de.UTF-8):   Ein eingebetteter Perl-Interpreter für den Apache Web-Server
-Summary(es.UTF-8):   Intérprete Perl para el servidor Web Apache
-Summary(fr.UTF-8):   Interpréteur Perl intégré pour le serveur Web Apache
-Summary(id.UTF-8):   Interpreter Perl untuk web server Apache
-Summary(is.UTF-8):   Perl túlkur fyrir Apache vefþjóninn
-Summary(it.UTF-8):   Interprete Perl integrato per il server Web Apache
-Summary(ja.UTF-8):   Apache Web サーバー用の組込み Perl インタープリタ
-Summary(nb.UTF-8):   En Perl-fortolker for webtjeneren Apache
-Summary(pl.UTF-8):   Interpreter Perla dla serwera WWW Apache
-Summary(pt.UTF-8):   Um interpretador de Perl embebido para o servidor Web Apache
-Summary(ru.UTF-8):   Встроенный интерпретатор Perl для WWW-сервера Apache
-Summary(sk.UTF-8):   Interpreter jazyka Perl pre webový server Apache
-Summary(sl.UTF-8):   Vključeni perlovski tolmač za spletni strežnik Apache
-Summary(sv.UTF-8):   En inbyggd Perl-interpretator för webbservern Apache
-Summary(uk.UTF-8):   Модуль вбудовування інтерпретатора Perl в сервер Apache
-Summary(zh_CN.UTF-8):   用于 Apache web 服务程序的 Perl 解释程序。
+Summary(cs.UTF-8):	Vestavěný interpret Perlu pro WWW server Apache
+Summary(da.UTF-8):	En indbygget Perl-fortolker for webtjeneren Apache
+Summary(de.UTF-8):	Ein eingebetteter Perl-Interpreter für den Apache Web-Server
+Summary(es.UTF-8):	Intérprete Perl para el servidor Web Apache
+Summary(fr.UTF-8):	Interpréteur Perl intégré pour le serveur Web Apache
+Summary(id.UTF-8):	Interpreter Perl untuk web server Apache
+Summary(is.UTF-8):	Perl túlkur fyrir Apache vefþjóninn
+Summary(it.UTF-8):	Interprete Perl integrato per il server Web Apache
+Summary(ja.UTF-8):	Apache Web サーバー用の組込み Perl インタープリタ
+Summary(nb.UTF-8):	En Perl-fortolker for webtjeneren Apache
+Summary(pl.UTF-8):	Interpreter Perla dla serwera WWW Apache
+Summary(pt.UTF-8):	Um interpretador de Perl embebido para o servidor Web Apache
+Summary(ru.UTF-8):	Встроенный интерпретатор Perl для WWW-сервера Apache
+Summary(sk.UTF-8):	Interpreter jazyka Perl pre webový server Apache
+Summary(sl.UTF-8):	Vključeni perlovski tolmač za spletni strežnik Apache
+Summary(sv.UTF-8):	En inbyggd Perl-interpretator för webbservern Apache
+Summary(uk.UTF-8):	Модуль вбудовування інтерпретатора Perl в сервер Apache
+Summary(zh_CN.UTF-8):	用于 Apache web 服务程序的 Perl 解释程序。
 Name:		apache1-mod_perl
-Version:	1.29
-Release:	14
-License:	GPL
+Version:	1.31
+Release:	1
+License:	Apache v1.1
 Group:		Networking/Daemons
 Source0:	http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
-# Source0-md5:	1491931790509b9af06fc037d02b0e7a
+# Source0-md5:	d2188bf500e9f00cd78dc97c3fbf6b97
 Patch0:		apache-perl-rh.patch
 # from ftp://ftp.kddlabs.co.jp/Linux/packages/Kondara/pub/Jirai/
 Patch1:		mod_perl-v6.patch
 Patch2:		%{name}-optimize.patch
 URL:		http://perl.apache.org/
-BuildRequires:	%{apxs}
 %{?with_ipv6:BuildRequires:	apache1(ipv6)-devel}
-BuildRequires:	apache1-devel >= 1.3.33-2
+BuildRequires:	apache1-devel >= 1.3.39-2
 BuildRequires:	perl-B-Graph
 BuildRequires:	perl-BSD-Resource
 BuildRequires:	perl-Devel-Symdump
@@ -52,12 +54,9 @@ BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	sed >= 4.0
 Requires:	apache1(EAPI)
-Requires:	perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
 Provides:	apache(mod_perl)
 Obsoletes:	mod_perl
 Obsoletes:	mod_perl-common
-# older apache1-mod_perl could make bad autodeps to perl-mod_perl1
-BuildConflicts:	apache1-mod_perl < 1.29-12.1
 %{!?with_ipv6:Conflicts:	apache1(ipv6)}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -196,34 +195,47 @@ Apache web 服务程序， 并为 Apache 的 C 语言 API 提供面向对象的
 接口。 由于不必启动任何外部 Perl 解释程序，因此会使 CGI
 脚本回转过程更为快速。
 
-%package devel
+%package -n perl-mod_perl1
+Summary:	Perl APIs for mod_perl
+Summary(pl.UTF-8):	Perlowe API dla mod_perla
+Group:		Development/Languages/Perl
+
+%description -n perl-mod_perl1
+Perl APIs for mod_perl.
+
+%description -n perl-mod_perl1 -l pl.UTF-8
+Perlowe API dla mod_perl.
+
+%package -n perl-mod_perl1-devel
 Summary:	Files needed for building XS modules that use mod_perl
-Summary(pl.UTF-8):   Pliki potrzebne do budowania modułów XS korzystających z mod_perla
+Summary(pl.UTF-8):	Pliki potrzebne do budowania modułów XS korzystających z mod_perla
 Group:		Development/Libraries
 Requires:	apache1-devel
-Requires:	perl-mod_%{mod_name}1 = %{version}-%{release}
+Requires:	perl-mod_perl1 = %{version}-%{release}
+Obsoletes:	apache1-mod_perl-devel
 
-%description devel
+%description -n perl-mod_perl1-devel
 The apache1-mod_perl-devel package contains the files needed for
 building XS modules that use mod_perl.
 
-%description devel -l pl.UTF-8
+%description -n perl-mod_perl1-devel -l pl.UTF-8
 Ten pakiet zawiera pliki potrzebne do budowania modułów XS
 korzystających z mod_perla.
 
-%package -n perl-mod_%{mod_name}1
-Summary:	Perl APIs for mod_perl
-Summary(pl.UTF-8):   Perlowe API dla mod_perla
-Group:		Development/Languages/Perl
+%package doc
+Summary:	mod_perl documentation
+Summary(pl.UTF-8):	Dokumentacja do mod_perla
+Group:		Documentation
+Requires:	apache1-doc
 
-%description -n perl-mod_%{mod_name}1
-Perl APIs for mod_perl.
+%description doc
+mod_perl online documentation.
 
-%description -n perl-mod_%{mod_name}1 -l pl.UTF-8
-Perlowe API dla mod_perl.
+%description doc -l pl.UTF-8
+Dokumentacja do mod_perla dostępna przez Apache'a.
 
 %prep
-%setup  -q -n mod_perl-%{version}
+%setup -q -n mod_perl-%{version}
 %patch0 -p1
 %{?with_ipv6:%patch1 -p1}
 %patch2 -p1
@@ -259,10 +271,10 @@ echo 'LoadModule %{mod_name}_module	modules/lib%{mod_name}.so' > \
 	$RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
 
 # clean known unpackaged files
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/*.pod
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/Bundle/Apache.pm
-rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/mod_%{mod_name}/.packlist
-rm -f $RPM_BUILD_ROOT%{_mandir}/man3/Bundle::Apache.3pm*
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/*.pod
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Bundle/Apache.pm
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/mod_perl/.packlist
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/Bundle::Apache.3pm*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -283,31 +295,33 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README INSTALL CREDITS faq/*.html faq/*.txt apache-modlist.html eg
-# FIXME: parent dirs not owned as the manualdocdir (via apache1-doc) is not in deps
-%doc %{_manualdocdir}/mod/*html
-
+%doc CREDITS Changes INSTALL LICENSE README STATUS SUPPORT faq/*.html faq/*.txt apache-modlist.html eg
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(755,root,root) %{_pkglibdir}/libperl.so
 
-%files -n perl-mod_%{mod_name}1
+%files doc
 %defattr(644,root,root,755)
-%{perl_vendorarch}/*.pm
-%{perl_vendorarch}/*.PL
+%{_manualdocdir}/mod/mod_perl.html
 
-%dir %{perl_vendorarch}/Apache
+%files -n perl-mod_perl1
+%defattr(644,root,root,755)
+%{perl_vendorarch}/Apache.pm
+%{perl_vendorarch}/mod_perl*.pm
+%{perl_vendorarch}/mod_perl_hooks.pm.PL
 %{perl_vendorarch}/Apache/*.pm
 %{perl_vendorarch}/Apache/Constants
 %dir %{perl_vendorarch}/auto/Apache
 %dir %{perl_vendorarch}/auto/Apache/Leak
+%{perl_vendorarch}/auto/Apache/Leak/Leak.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/Apache/Leak/Leak.so
 %dir %{perl_vendorarch}/auto/Apache/Symbol
+%{perl_vendorarch}/auto/Apache/Symbol/Symbol.bs
+%attr(755,root,root) %{perl_vendorarch}/auto/Apache/Symbol/Symbol.so
+%{_mandir}/man3/Apache*.3pm*
+%{_mandir}/man3/cgi_to_mod_perl.3pm*
+%{_mandir}/man3/mod_perl*.3pm*
 
-%{perl_vendorarch}/auto/*/*/*.bs
-%attr(755,root,root) %{perl_vendorarch}/auto/*/*/*.so
-
-%{_mandir}/man3/[Acm]*
-
-%files devel
+%files -n perl-mod_perl1-devel
 %defattr(644,root,root,755)
 %{perl_vendorarch}/auto/Apache/typemap
 %{perl_vendorarch}/auto/Apache/mod_perl.exp