X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_proxy_html.spec;h=6f0c833c9ec15b95f4b6ae209768111a91654c79;hb=9f40fe982708156c196c9a140deed44954a39eb3;hp=cc35b8060b4143c29a63f45f12416abb787df230;hpb=d2bd06e33a86042fd967d9c9756623e2cfa25190;p=packages%2Fapache-mod_proxy_html.git

diff --git a/apache-mod_proxy_html.spec b/apache-mod_proxy_html.spec
index cc35b80..6f0c833 100644
--- a/apache-mod_proxy_html.spec
+++ b/apache-mod_proxy_html.spec
@@ -1,14 +1,14 @@
 %define		mod_name	proxy_html
 %define 	apxs		/usr/sbin/apxs
 Summary:	mod_proxy_html - additional proxy module for rewriting HTML links
-Summary(pl):	mod_proxy_html - dodatkowy modu³ proxy do przepisywania odno¶ników HTML
+Summary(pl.UTF-8):	mod_proxy_html - dodatkowy moduł proxy do przepisywania odnośników HTML
 Name:		apache-mod_%{mod_name}
-Version:	2.3
-Release:	1
+Version:	3.0.1
+Release:	3
 License:	GPL
-Group:		Networking/Daemons
+Group:		Networking/Daemons/HTTP
 Source0:	http://apache.webthing.com/mod_proxy_html/mod_proxy_html.c
-# Source0-md5:	b1211dff5343d75ac376ef836557f11f
+# Source0-md5:	6d38fbcd58e6e5cac246da3d1fcd22f4
 URL:		http://apache.webthing.com/mod_proxy_html/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0.44
@@ -16,22 +16,22 @@ BuildRequires:	apr-devel >= 1:0.9.4-1
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libxml2-devel >= 2.5.10
-Requires(post,preun):	%{apxs}
-Requires:	apache >= 2.0.44
-Requires:	apache-mod_proxy >= 2.0.44
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires:	apache(modules-api) = %apache_modules_api
+Requires:	apache-mod_proxy
 Requires:	libxml2 >= 2.5.10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
 mod_proxy_html is additional proxy module for rewriting HTML links so
 that they don't break in a reverse proxy.
 
-%description -l pl
-mod_proxy_html to dodatkowy modu³ proxy do przepisywania odno¶ników
-HTML w ten sposób, by nie by³y uszkadzane przez odwrotne proxy.
+%description -l pl.UTF-8
+mod_proxy_html to dodatkowy moduł proxy do przepisywania odnośników
+HTML w ten sposób, by nie były uszkadzane przez odwrotne proxy.
 
 %prep
 %setup -q -c -T
@@ -45,10 +45,10 @@ cp %{SOURCE0} .
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
 
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/35_mod_%{mod_name}.conf
+cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/35_mod_%{mod_name}.conf
 LoadModule proxy_html_module	modules/mod_proxy_html.so
 
 # You will find configuration instructions here:
@@ -59,18 +59,14 @@ EOF
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
-	fi
+	%service -q httpd restart
 fi
 
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so