SPECS: apache1-mod_perl.spec - splitting perl-mod_perl1 so that ap...
glen
glen at pld-linux.org
Wed May 3 01:44:46 CEST 2006
Author: glen Date: Tue May 2 23:44:46 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- splitting perl-mod_perl1 so that apache1 is not needed on builders
---- Files affected:
SPECS:
apache1-mod_perl.spec (1.35 -> 1.36)
---- Diffs:
================================================================
Index: SPECS/apache1-mod_perl.spec
diff -u SPECS/apache1-mod_perl.spec:1.35 SPECS/apache1-mod_perl.spec:1.36
--- SPECS/apache1-mod_perl.spec:1.35 Wed May 3 00:46:00 2006
+++ SPECS/apache1-mod_perl.spec Wed May 3 01:44:40 2006
@@ -28,7 +28,7 @@
Summary(zh_CN): ÓĂÓÚ Apache web ˇţÎńłĚĐňľÄ Perl ˝âĘÍłĚĐňĄŁ
Name: apache1-mod_perl
Version: 1.29
-Release: 12
+Release: 12.3
License: GPL
Group: Networking/Daemons
Source0: http://perl.apache.org/dist/mod_perl-%{version}.tar.gz
@@ -58,6 +58,8 @@
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)
@@ -200,8 +202,8 @@
Summary: Files needed for building XS modules that use mod_perl
Summary(pl): Pliki potrzebne do budowania modułów XS korzystających z mod_perla
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
Requires: apache1-devel
+Requires: perl-mod_%{mod_name}1 = %{version}-%{release}
%description devel
The apache1-mod_perl-devel package contains the files needed for
@@ -211,6 +213,16 @@
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
+Group: Development/Languages/Perl
+
+%description -n perl-mod_%{mod_name}1
+Perl APIs for mod_perl.
+
+%description -n perl-mod_%{mod_name}1 -l pl
+Perlowe API dla mod_perl.
+
%prep
%setup -q -n mod_perl-%{version}
%patch0 -p1
@@ -267,18 +279,20 @@
%triggerpostun -- apache1-mod_%{mod_name} < 1.29-7.1
# check that they're not using old apache.conf
if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
- sed -i -e '/^\(Add\|Load\)Module.*libperl\.\(so\|c\)/d' /etc/apache/apache.conf
+ %{__sed} -i -e '/^\(Add\|Load\)Module.*libperl\.\(so\|c\)/d' /etc/apache/apache.conf
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 required
+# FIXME: parent dirs not owned as the manualdocdir (via apache1-doc) is not in deps
%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}/*
+%files -n perl-mod_%{mod_name}1
+%defattr(644,root,root,755)
%{perl_vendorarch}/*.pm
%{perl_vendorarch}/*.PL
@@ -306,6 +320,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.36 2006/05/02 23:44:40 glen
+- splitting perl-mod_perl1 so that apache1 is not needed on builders
+
Revision 1.35 2006/05/02 22:46:00 glen
- plain apache require (it's internals will never change anymore), rel 12
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/apache1-mod_perl.spec?r1=1.35&r2=1.36&f=u
More information about the pld-cvs-commit
mailing list