rpms/mod_proxy_html/EL-5 mod_proxy_html.spec,1.2,1.3

[Philip Prindeville]

Author: philipp

Update of /cvs/pkgs/rpms/mod_proxy_html/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12963

Modified Files:
	mod_proxy_html.spec 
Log Message:
Include xml2enc.so




Index: mod_proxy_html.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mod_proxy_html/EL-5/mod_proxy_html.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mod_proxy_html.spec	16 Dec 2009 22:38:33 -0000	1.2
+++ mod_proxy_html.spec	16 Dec 2009 23:46:07 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Output filter to rewrite HTML links in a proxy situation
 Name: mod_proxy_html
 Version: 3.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Libraries
 URL: http://apache.webthing.com/mod_proxy_html/
@@ -25,16 +25,19 @@ an essential component of a reverse prox
 
 %build
 %{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_proxy_html.c
+%{_sbindir}/apxs -c -I . -I %{_includedir}/libxml2 -lxml2 mod_xml2enc.c
 
 
 %install
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}/%{modulesdir}
 %{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_proxy_html mod_proxy_html.la
+%{_sbindir}/apxs -i -S LIBEXECDIR=%{buildroot}/%{modulesdir} -n mod_xml2enc mod_xml2enc.la
 install -m 644 -D proxy_html.conf %{buildroot}/%{confdir}.d/proxy_html.conf
 %{__sed} -i \
 	-e '/^# LoadFile	\/usr\/lib\/libxml2\.so/d' \
-	-e '1,7s@^# \(LoadModule	proxy_html_module	modules/mod_proxy_html\.so\)$@\1@' \
+	-e '1,/Windows/s@^# \(LoadModule		*proxy_html_module		*modules/mod_proxy_html\.so\)$@\1@' \
+	-e '1,/Windows/s@^# \(LoadModule		*xml2enc_module		*modules/mod_xml2enc\.so\)$@\1@' \
 %ifarch x86_64
 	-e 's@/usr/lib/@%{_libdir}/@' \
 %endif
@@ -48,11 +51,15 @@ install -m 644 -D proxy_html.conf %{buil
 %files
 %defattr(-,root,root)
 %{modulesdir}/mod_proxy_html.so
+%{modulesdir}/mod_xml2enc.so
 %config(noreplace) %lang(en) %{confdir}.d/proxy_html.conf
 %doc COPYING README
 
 
 %changelog
+* Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-6
+- Include mod_xml2enc.  Fix sed script to properly uncomment LoadModule lines.
+
 * Wed Dec 16 2009 Philip Prindeville <philipp at fedoraproject.org> 3.1.2-2
 - Initial commit.