- apxs1 in apache1-devel now

[packages/apache1-mod_dynvhost.git] / apache1-mod_dynvhost.spec

diff --git a/apache1-mod_dynvhost.spec b/apache1-mod_dynvhost.spec
index 36741e867b85dde59aa9829de048345619245f77..919c6176c8794540b56acb3a59fecc4ebd29f5f7 100644 (file)
--- a/apache1-mod_dynvhost.spec
+++ b/apache1-mod_dynvhost.spec
@@ -1,34 +1,36 @@
 %define                mod_name        dynvhost
-%define        apxs            /usr/sbin/apxs
+%define        apxs            /usr/sbin/apxs1
 Summary:       Dynamic Virtual Hosting
-Summary(pl):   Dynamiczne Serwery Wirtualne
-Name:          apache-mod_%{mod_name}
+Summary(pl.UTF-8):     Dynamiczne Serwery Wirtualne
+Name:          apache1-mod_%{mod_name}
 Version:       1
-Release:       2
+Release:       4
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://funkcity.com/0101/projects/dynvhost/mod_%{mod_name}.tar.gz
 # Source0-md5: 7608ca6ce5c906bfe960cd0f92bdb6d8
 URL:           http://funkcity.com/0101/
-BuildRequires: %{apxs}
-BuildRequires: apache(EAPI)-devel
+BuildRequires: apache1-devel >= 1.3.39
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: zlib-devel
-Prereq:                %{_sbindir}/apxs
-Requires:      apache(EAPI)
+Requires(triggerpostun):       %{apxs}
+Requires:      apache1(EAPI)
+Obsoletes:     apache-mod_dynvhost <= 1
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 The "mod_dynvhost" module will create pseudo name based VirtualHosts
 on the fly. All you need is a directory with the fully qualified
-domain name ( FQDN ) of your virtual site and the module will take
-care of the rest.
+domain name (FQDN) of your virtual site and the module will take care
+of the rest.
 
-%description -l pl
-Modu³ "mod_dynvhost" pozwala na tworzenie pseudo serwerów wirtualnych
-(name based). Wszystko czego potrzebujesz to katalog o pe³nej nazwie
-(FQDN) wirtualnego serwera - modu³ zajmie siê reszt±.
+%description -l pl.UTF-8
+Moduł "mod_dynvhost" pozwala na tworzenie pseudo serwerów wirtualnych
+(name based). Wszystko czego potrzebujesz to katalog o pełnej nazwie
+(FQDN) wirtualnego serwera - moduł zajmie się resztą.
 
 %prep
 %setup -q -n %{mod_name}
@@ -38,28 +40,32 @@ Modu
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
 
 install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 
+echo 'LoadModule %{mod_name}_module    modules/mod_%{mod_name}.so' > \
+       $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post
-%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q apache restart
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
-       fi
+       %service -q apache restart
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%triggerpostun -- apache1-mod_%{mod_name} < 1-2.1
+# check that they're not using old apache.conf
+if grep -q '^Include conf\.d' /etc/apache/apache.conf; then
+       %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+fi
 
 %files
 %defattr(644,root,root,755)
 %doc README ChangeLog
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*