- up to 2.1.0

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

diff --git a/apache-mod_gzip.spec b/apache-mod_gzip.spec
index f062f1089f39e40c439c30a8c41c76a3a37376b7..58c66836f0ec4bfc53fd36b5151a6ddd6c681512 100644 (file)
--- a/apache-mod_gzip.spec
+++ b/apache-mod_gzip.spec
@@ -1,75 +1,69 @@
-# TODO
-# - add apache_modules_api dep
 %define                mod_name        gzip
 %define        apxs            /usr/sbin/apxs
 Summary:       Apache module: On-the-fly compression of HTML documents
-Summary(pl):   Modu³ do apache: kompresuje dokumenty HTML w locie
+Summary(pl.UTF-8):     Moduł do apache: kompresuje dokumenty HTML w locie
 Name:          apache-mod_%{mod_name}
-Version:       2.0.40
+Version:       2.1.0
 Release:       0.1
 License:       Apache
-Group:         Networking/Daemons
-Source0:       http://www.gknw.com/development/apache/httpd-2.0/unix/modules/mod_%{mod_name}-%{version}.tar.gz
-# Source0-md5: 30c17d999edb5d83368369cde1c921bb
+Group:         Networking/Daemons/HTTP
+Source0:       http://www.gknw.net/development/apache/httpd-2.0/unix/modules/mod_%{mod_name}-%{version}.tar.gz
+# Source0-md5: 9011aa2dc4701c0301e6c608269f8835
 Source1:       %{name}.conf
 Source2:       %{name}.logrotate
-#URL:          http://www.schroepl.net/projekte/mod_gzip/
+URL:           http://www.gknw.net/development/apache/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0.40
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: zlib-devel
-Requires(triggerpostun):       %{apxs}
-Requires(triggerpostun):       grep
-Requires(triggerpostun):       sed >= 4.0
-Requires:      apache >= 2.0.40
+Requires:      apache(modules-api) = %apache_modules_api
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 %define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
-%define                _pkglogdir      %(%{apxs} -q PREFIX 2>/dev/null)/logs
 
 %description
 Apache module: On-the-fly compression of HTML documents. Browser will
 transparently decompress and display such documents.
 
-%description -l pl
-Modu³ do apache: kompresuje dokumenty HTML w locie. Przegl±darki w
-sposób przezroczysty dekompresuj± i wy¶wietlaj± takie dokumenty.
+%description -l pl.UTF-8
+Moduł do apache: kompresuje dokumenty HTML w locie. Przeglądarki w
+sposób przezroczysty dekompresują i wyświetlają takie dokumenty.
 
 %prep
-%setup -q -n mod_%{mod_name}
+%setup -q -n mod_%{mod_name}-%{version}
 
 %build
-%{apxs} -Wc,-Wall,-pipe -c mod_%{mod_name}.c mod_%{mod_name}_debug.c mod_%{mod_name}_compress.c -o mod_%{mod_name}.so
+%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.la
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/etc/logrotate.d,%{_pkglogdir}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,/etc/logrotate.d,/var/log/httpd}
 
-install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
-> $RPM_BUILD_ROOT%{_pkglogdir}/mod_gzip.log
+touch $RPM_BUILD_ROOT/var/log/httpd/mod_gzip_log
+
+install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
 %clean
 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
+touch /var/log/httpd/mod_gzip_log && chown root:http /var/log/httpd/mod_gzip_log && chmod 620 /var/log/httpd/mod_gzip_log
 
 %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)
 %doc *.txt logos/*
-%attr(755,root,root) %{_pkglibdir}/*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
-%attr(640,root,root) %ghost %{_pkglogdir}/*
+# append by webserver
+%attr(620,root,http) %ghost /var/log/httpd/mod_gzip_log