Rel 3; ipv6 fix from git

[packages/apache-mod_rpaf.git] / apache-mod_rpaf.spec

diff --git a/apache-mod_rpaf.spec b/apache-mod_rpaf.spec
index 97500e0d1c7ec8dd08e8e0f7a2a71f87c56c9378..703412bc158592232314d27d59a7c72ccabae3dc 100644 (file)
--- a/apache-mod_rpaf.spec
+++ b/apache-mod_rpaf.spec
@@ -1,49 +1,44 @@
+# TODO
+# - broken: https://github.com/gnif/mod_rpaf/issues/27
+# or not https://github.com/gnif/mod_rpaf/issues/33#issuecomment-263519703 ?
+
 %define                mod_name        rpaf
-%define        apxs            %{_sbindir}/apxs
-Summary:       Reverse proxy add forward module for Apache2
+%define                apxs            %{_sbindir}/apxs
+Summary:       Reverse proxy add forward module for Apache
 Summary(pl.UTF-8):     Moduł Apache'a 2 dodający przekazywanie dla odwrotnych proxy
 Name:          apache-mod_%{mod_name}
-Version:       0.6
-Release:       2
-License:       Apache
+Version:       0.8.4
+Release:       3
+License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
-Source0:       http://stderr.net/apache/rpaf/download/mod_%{mod_name}-%{version}.tar.gz
-# Source0-md5: ba2b89274e1dd4c0f96f8d034fa305b1
+Source0:       https://github.com/gnif/mod_rpaf/archive/v%{version}/mod_%{mod_name}-%{version}.tar.gz
+# Source0-md5: 8fbd9ee19f8ea4e25ab8414685276105
 Source1:       %{name}.conf
-Patch0:                mod_rpaf_degtine.patch
-URL:           http://stderr.net/apache/rpaf/
+Patch0:                git.patch
+Patch1:                0.6-compat.patch
+URL:           https://github.com/gnif/mod_rpaf/
 BuildRequires: apache-devel >= 2.2
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      apache(modules-api) = %apache_modules_api
 Provides:      apache(mod_rpaf)
+Conflicts:     apache(mod_extract_forwarded)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 %define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
-rpaf is for backend Apache servers what mod_proxy_add_forward is for
-frontend Apache servers. It does excactly the opposite of
-mod_proxy_add_forward written by Ask Bjoern Hansen. It will also work
-with mod_proxy that is distributed with Apache2 from version 2.0.36.
-
-%description -l en.UTF-8
-rpaf is for backend Apache servers what mod_proxy_add_forward is for
-frontend Apache servers. It does excactly the opposite of
-mod_proxy_add_forward written by Ask Bjørn Hansen. It will also work
-with mod_proxy that is distributed with Apache2 from version 2.0.36.
+Sets REMOTE_ADDR, HTTPS, and HTTP_PORT to the values provided by an
+upstream proxy.
 
 %description -l pl.UTF-8
 rpaf jest dla backendowych serwerów Apache tym, czym
-mod_proxy_add_forward jest dla frontendowych. Wykonuje dokładnie
-przeciwne operacje do mod_proxy_add_forward napisanego przez Aska
-Bjorna Hansena. Będzie także działać z mod_proxy w Apache'u 2
-począwszy od wersji 2.0.36.
+mod_proxy_add_forward jest dla frontendowych.
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
-mv -f mod_%{mod_name}{-2.0,}.c
+%patch1 -p1
 
 %build
 %{apxs} -S CC="%{__cc}" -c -n mod_%{mod_name}.o mod_%{mod_name}.c
@@ -51,8 +46,8 @@ mv -f mod_%{mod_name}{-2.0,}.c
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
-install .libs/mod_rpaf.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/99_mod_%{mod_name}.conf
+install -p .libs/mod_rpaf.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/99_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,6 +62,6 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README CHANGES
+%doc README.md CHANGES
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so