X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache1-mod_dav.spec;h=1f4d5c55164eb44964332a477f7aedf5a5b99a96;hb=refs%2Ftags%2Fauto%2Fth%2Fapache-2_2_9-1;hp=71cd8bfba9e362f54525069fc242ed174d1f8641;hpb=62de80c5556f9a7462bfb25e62b24259a32f3e1d;p=packages%2Fapache1-mod_dav.git

diff --git a/apache1-mod_dav.spec b/apache1-mod_dav.spec
index 71cd8bf..1f4d5c5 100644
--- a/apache1-mod_dav.spec
+++ b/apache1-mod_dav.spec
@@ -1,3 +1,5 @@
+%define		mod_name	dav
+%define 	apxs	/usr/sbin/apxs1
 Summary:	WebDAV module for the Apache Web server
 Summary(cs):	DAV modul pro WWW server Apache
 Summary(da):	En DAV-modul for Apache
@@ -6,45 +8,37 @@ Summary(es):	M
 Summary(fr):	Module DAV pour Apache
 Summary(it):	Modulo DAV per Apache
 Summary(ja):	Apache ÍѤΠDAV ¥â¥¸¥å¡¼¥ë
-Summary(no):	En DAV-modul for Apache
+Summary(nb):	En DAV-modul for Apache
 Summary(pl):	Modu³ WebDAV dla webserwera Apache
 Summary(pt):	Um módulo de DAV para o Apache
 Summary(ru):	íÏÄÕÌØ, ÒÅÁÌÉÚÕÀÝÉÊ ÐÒÏÔÏËÏÌ DAV × Apache
 Summary(sv):	En DAV-modul till Apache
 Summary(uk):	íÏÄÕÌØ, ÝÏ ÒÅÁ̦ÚÕ¤ ÐÒÏÔÏËÏÌ DAV × Apache
 %define		apache_version	1.3.6
-%define		mod_name	dav
-Name:		apache-mod_%{mod_name}
+Name:		apache1-mod_%{mod_name}
 Version:	1.0.3
-Release:	1
+Release:	2
 License:	OSI Approved
 Group:		Networking/Daemons
-Group(cs):	Sí»ové/Démoni
-Group(da):	Netværks/Dæmoner
-Group(de):	Netzwerkwesen/Server
-Group(es):	Red/Servidores
-Group(fr):	Réseau/Serveurs
-Group(is):	Net/Púkar
-Group(it):	Rete/Demoni
-Group(no):	Nettverks/Daemoner
-Group(pl):	Sieciowe/Serwery
-Group(pt):	Rede/Servidores
-Group(ru):	óÅÔØ/äÅÍÏÎÙ
-Group(sl):	Omre¾ni/Stre¾niki
-Group(sv):	Nätverk/Demoner
-Group(uk):	íÅÒÅÖÁ/äÅÍÏÎÉ
 Source0:	http://www.webdav.org/mod_dav/mod_%{mod_name}-%{version}-%{apache_version}.tar.gz
+# Source0-md5:	ba83f2aa6e13b216a11d465b82aab484
+Source1:	%{name}.conf
+Patch0:		%{name}-format.patch
 URL:		http://www.webdav.org/mod_dav/
-Prereq:		/usr/sbin/apxs
-BuildRequires:	/usr/sbin/apxs
+BuildRequires:	%{apxs}
+BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	apache(EAPI)-devel	>= %{apache_version}
-Requires:	apache(EAPI)		>= %{apache_version}
+BuildRequires:	expat-devel
+Requires(triggerpostun):	%{apxs}
+Requires(triggerpostun):	grep
+Requires(triggerpostun):	sed >= 4.0
+Requires:	apache1 >= 1.3.33-2
+Obsoletes:	apache-mod_%{mod_name} <= %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes:	mod_dav
 
-%define		_pkglibdir	%(%{_sbindir}/apxs -q LIBEXECDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 mod_dav enables Apache to understand DAV protocol (extensions to
@@ -112,7 +106,7 @@ oznacza "Dystrybuowane Oznaczanie i Wersjonowanie", i jest
 zdefiniowany w RFC 2518. Podstawow± misj± DAV jest zast±piæ takie
 protoko³y jak te u¿ywane w Frontpage czy NetObjects' Fusion. Lecz DAV
 to tak¿e kompletny zestaw protoko³ów s³u¿±cych do manipulowania
-plikami i katalogami serwera Web, oraz ich w³±¶ciwo¶ciami.
+plikami i katalogami serwera Web, oraz ich w³a¶ciwo¶ciami.
 
 %description -l pt
 O módulo mod_dav dá ao servidor Web Apache a possibilidade de aceitar
@@ -146,40 +140,57 @@ Fusion צ
 
 %prep
 %setup -q -n mod_%{mod_name}-%{version}-%{apache_version}
+%patch -p1
 
 %build
-aclocal
-autoconf
+%{__aclocal}
+%{__autoconf}
 %configure \
-	--with-apxs=/usr/sbin/apxs
-%{__make} APXS=/usr/sbin/apxs
+	--with-apxs=%{apxs} \
+	--with-expat=%{_prefix}
+%{__make} APXS=%{apxs}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/var/lock/mod_dav}
 
-install lib%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/
+install lib%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
 
-gzip -9nf README CHANGES INSTALL
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/sbin/apxs -e -a -n %{mod_name} %{_pkglibdir}/lib%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-	%{_sysconfdir}/rc.d/init.d/httpd restart 1>&2
+if [ -f /var/lock/subsys/apache ]; then
+	/etc/rc.d/init.d/apache restart 1>&2
 fi
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-	/usr/sbin/apxs -e -A -n %{mod_name} %{_pkglibdir}/lib%{mod_name}.so 1>&2
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
+	if [ -f /var/lock/subsys/apache ]; then
+		/etc/rc.d/init.d/apache restart 1>&2
 	fi
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%triggerpostun -- %{name} < 1.0.3-1.1
+if grep -q '^Include conf\.d/\*\.conf' /etc/apache/apache.conf; then
+	%{apxs} -e -A -n %{mod_name} %{_pkglibdir}/libdav.so 1>&2
+	sed -i -e '
+		/^Include.*mod_%{mod_name}\.conf/d
+	' /etc/apache/apache.conf
+else
+	# they're still using old apache.conf
+	sed -i -e '
+		s,^Include.*mod_%{mod_name}\.conf,Include %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf,
+	' /etc/apache/apache.conf
+fi
+if [ -f /var/lock/subsys/apache ]; then
+	/etc/rc.d/init.d/apache restart 1>&2
+fi
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz LICENSE.html
+%doc README CHANGES INSTALL LICENSE.html
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*
+%attr(750,http,http) /var/lock/mod_dav