X-Git-Url: https://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=apache1-mod_dynvhost.spec;h=919c6176c8794540b56acb3a59fecc4ebd29f5f7;hb=077f7c09b1ca63788c4f8b0bc1fdcaf98442e068;hp=c576a522f8b9ac36883fe19e5740284ad0504192;hpb=f93a0006766fe6a70de8a65ba400f1029c2de021;p=packages%2Fapache1-mod_dynvhost.git

diff --git a/apache1-mod_dynvhost.spec b/apache1-mod_dynvhost.spec
index c576a52..919c617 100644
--- a/apache1-mod_dynvhost.spec
+++ b/apache1-mod_dynvhost.spec
@@ -1,67 +1,71 @@
 %define		mod_name	dynvhost
+%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:	1
+Release:	4
 License:	GPL
 Group:		Networking/Daemons
-Group(de):	Netzwerkwesen/Server
-Group(pl):	Sieciowe/Serwery
 Source0:	http://funkcity.com/0101/projects/dynvhost/mod_%{mod_name}.tar.gz
-URL:		http://funkcity.com/0101
-BuildRequires:	/usr/sbin/apxs
-BuildRequires:	apache-devel
+# Source0-md5:	7608ca6ce5c906bfe960cd0f92bdb6d8
+URL:		http://funkcity.com/0101/
+BuildRequires:	apache1-devel >= 1.3.39
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
-Prereq:		/usr/sbin/apxs
-Requires:	apache
+Requires(triggerpostun):	%{apxs}
+Requires:	apache1(EAPI)
+Obsoletes:	apache-mod_dynvhost <= 1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_pkglibdir	%(/usr/sbin/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 
+%prep
 %setup -q -n %{mod_name}
 
 %build
-%{_sbindir}/apxs -c mod_%{mod_name}.c -o mod_%{mod_name}.so
+%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.so
 
 %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}
 
-gzip -9nf README ChangeLog
+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
-%{_sbindir}/apxs -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-	%{_sysconfdir}/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q apache restart
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-	/usr/sbin/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 *.gz
+%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}/*