X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_macro.spec;h=3f1518dbc1e759d5c06b2081511445b2044075db;hb=7238e71d14df49eaec5974bfbbaaf322e36b04ef;hp=ba700758edc226c2e4a42f2b0ba5acffae8feda4;hpb=9c1e7ed91f95223a64ae06955a6f9743aacea3a0;p=packages%2Fapache-mod_macro.git

diff --git a/apache-mod_macro.spec b/apache-mod_macro.spec
index ba70075..3f1518d 100644
--- a/apache-mod_macro.spec
+++ b/apache-mod_macro.spec
@@ -4,14 +4,15 @@ Summary:	Apache module to allow macros in apache config files
 Summary(pl):	Modu³ do apache pozwalaj±cy u¿ywaæ makr w konfiguracji
 Name:		apache-mod_%{mod_name}
 Version:	1.1.6
-Release:	0.1
+Release:	1
 License:	Apache
 Group:		Networking/Daemons
 Source0:	http://www.cri.ensmp.fr/~coelho/mod_macro/mod_%{mod_name}-%{version}.tar.bz2
 # Source0-md5:	c79c299f650b35292d3b71da19e42e45
 URL:		http://www.cri.ensmp.fr/~coelho/mod_macro/
 BuildRequires:	apache-devel >= 2.0
-Requires:	apache
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires:	apache(modules-api) = %apache_modules_api
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -31,7 +32,7 @@ Modu
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
 
 install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
@@ -41,15 +42,11 @@ echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
 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
 
 %preun
 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