Author: glen Date: Thu Jan 5 17:00:07 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- add ipv6 patch; rel 1
---- Files affected:
SPECS:
apache1-mod_rpaf.spec (1.12 -> 1.13)
---- Diffs:
================================================================
Index: SPECS/apache1-mod_rpaf.spec
diff -u SPECS/apache1-mod_rpaf.spec:1.12 SPECS/apache1-mod_rpaf.spec:1.13
--- SPECS/apache1-mod_rpaf.spec:1.12 Fri Nov 25 12:29:13 2005
+++ SPECS/apache1-mod_rpaf.spec Thu Jan 5 18:00:01 2006
@@ -1,8 +1,7 @@
# $Revision$, $Date$
-# TODO
-# - need ipv6 support
#
-%bcond_with ipv6 # disable IPv6 support
+# Conditional build:
+%bcond_without ipv6 # disable IPv6 support
#
%define mod_name rpaf
%define apxs %{_sbindir}/apxs1
@@ -10,17 +9,19 @@
Summary(pl): Moduł Apache'a dodający przekazywanie dla odwrotnych proxy
Name: apache1-mod_%{mod_name}
Version: 0.5
-Release: 0.15
+Release: 1
License: Apache
Group: Networking/Daemons
Source0:
http://stderr.net/apache/rpaf/download/mod_%{mod_name}-%{version}.tar.gz
# Source0-md5: 471fb059d6223a394f319b7c8ab45c4d
Source1: %{name}.conf
+Patch0: %{name}-ipv6.patch
URL: http://stderr.net/apache/rpaf/
+%{?with_ipv6:BuildRequires: apache1(ipv6)-devel}
BuildRequires: apache1-devel >= 1.3.33-2
-%{!?with_ipv6:BuildConflicts: apache1(ipv6)-devel}
-%{!?with_ipv6:Conflicts: apache1(ipv6)}
+BuildRequires: rpmbuild(macros) >= 1.268
Requires: apache1 >= 1.3.33-2
+%{!?with_ipv6:Conflicts: apache1(ipv6)}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -47,6 +48,7 @@
%prep
%setup -q -n mod_%{mod_name}-%{version}
+%{?with_ipv6:%patch0 -p1}
%build
%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.so
@@ -62,15 +64,11 @@
rm -rf $RPM_BUILD_ROOT
%post
-if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
%postun
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache restart 1>&2
- fi
+ %service -q apache restart
fi
%files
@@ -85,6 +83,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.13 2006/01/05 17:00:01 glen
+- add ipv6 patch; rel 1
+
Revision 1.12 2005/11/25 11:29:13 glen
- if compiled without ipv6, then conflict with apache compiled with ipv6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/apache1-mod_rpaf.spec?r1=1.12&r2=1.13&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
