X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache1-mod_auth_samba.spec;h=5d736cc1be5f214e1b84fadeb242e445de0c4490;hb=a253e19d1cc617208c141cbcc161effa72bfd67f;hp=2f7e929809afd76f9bd60ee39437e867767951ce;hpb=9a8c546dae1e969abee137dbf385aa60161af322;p=packages%2Fapache1-mod_auth_samba.git

diff --git a/apache1-mod_auth_samba.spec b/apache1-mod_auth_samba.spec
index 2f7e929..5d736cc 100644
--- a/apache1-mod_auth_samba.spec
+++ b/apache1-mod_auth_samba.spec
@@ -3,10 +3,10 @@
 %define		mod_name	auth_samba
 %define 	apxs	/usr/sbin/apxs1
 Summary:	This is the samba authentication module for Apache
-Summary(pl):	Modu³ uwierzytelnienia samba dla Apache
+Summary(pl.UTF-8):	Moduł uwierzytelnienia samba dla Apache
 Name:		apache1-mod_%{mod_name}
 Version:	1.1
-Release:	3
+Release:	4
 Epoch:		1
 License:	GPL
 Group:		Networking/Daemons
@@ -14,15 +14,16 @@ Source0:	http://dl.sourceforge.net/modauthsamba/mod_%{mod_name}-%{version}.tar.g
 # Source0-md5:	9478a055e5cedd8c00beaed83d324240
 Patch0:		%{name}-symbol_fix.patch
 URL:		http://modauthsamba.sourceforge.net/
-BuildRequires:	%{apxs}
+BuildRequires:	apache1-apxs
 BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	gdbm-devel
 BuildRequires:	pam-devel
 BuildRequires:	pam-pam_smb
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(triggerpostun):	%{apxs}
-Requires:	apache1 >= 1.3.33-2
+Requires:	apache1(EAPI)
 Requires:	pam-pam_smb
-Obsoletes:	apache-mod_%{mod_name} <= %{epoch}:%{version}
+Obsoletes:	apache-mod_auth_samba <= 1:1.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
@@ -33,9 +34,9 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 This is an authentication module for Apache that allows you to
 authenticate HTTP clients using user entries in an samba directory.
 
-%description -l pl
-To jest modu³ uwierzytelnienia dla Apache pozwalaj±cy na
-uwierzytelnianie klientów HTTP z u¿yciem wpisów w katalogu samby.
+%description -l pl.UTF-8
+To jest moduł uwierzytelnienia dla Apache pozwalający na
+uwierzytelnianie klientów HTTP z użyciem wpisów w katalogu samby.
 
 %prep
 %setup -q -n mod_%{mod_name}
@@ -58,15 +59,11 @@ echo 'LoadModule %{mod_name}_module	modules/mod_%{mod_name}.so' > \
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/apache ]; then
-	/etc/rc.d/init.d/apache restart 1>&2
-fi
+%service -q apache restart
 
 %postun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache restart 1>&2
-	fi
+	%service -q apache restart
 fi
 
 %triggerpostun -- apache1-mod_%{mod_name} < 1:1.1-2.1