- BR s@%{apxs}@apache1-apxs@g

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

diff --git a/apache1-mod_auth_samba.spec b/apache1-mod_auth_samba.spec
index eff4fa15ec3214b180271161088afae33593f1dd..5d736cc1be5f214e1b84fadeb242e445de0c4490 100644 (file)
--- a/apache1-mod_auth_samba.spec
+++ b/apache1-mod_auth_samba.spec
@@ -1,66 +1,79 @@
+# TODO
+# - Cannot load mod_auth_samba.so into server: mod_auth_samba.so: undefined symbol: dbm_fetch
 %define                mod_name        auth_samba
+%define        apxs    /usr/sbin/apxs1
 Summary:       This is the samba authentication module for Apache
-Summary(pl):   Modu³ autentykacji samba dla Apache
-Name:          apache-mod_%{mod_name}
+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
-Group(de):     Netzwerkwesen/Server
-Group(pl):     Sieciowe/Serwery
-Source0:       ftp://download.sourceforge.net/pub/sourceforge/modauthsamba/mod_%{mod_name}-%{version}.tar.gz
+Source0:       http://dl.sourceforge.net/modauthsamba/mod_%{mod_name}-%{version}.tar.gz
+# Source0-md5: 9478a055e5cedd8c00beaed83d324240
 Patch0:                %{name}-symbol_fix.patch
 URL:           http://modauthsamba.sourceforge.net/
-BuildRequires: /usr/sbin/apxs
-BuildRequires: apache(EAPI)-devel
+BuildRequires: apache1-apxs
+BuildRequires: apache1-devel >= 1.3.33-2
 BuildRequires: gdbm-devel
 BuildRequires: pam-devel
-Prereq:                /usr/sbin/apxs
-Prereq:                pam_smb
-Requires:      apache(EAPI)
+BuildRequires: pam-pam_smb
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires(triggerpostun):       %{apxs}
+Requires:      apache1(EAPI)
+Requires:      pam-pam_smb
+Obsoletes:     apache-mod_auth_samba <= 1:1.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)
+%define                _noautoreq      /%{_lib}/security/pam_smb_auth.so
 
 %description
 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³ autentykacji dla Apache pozwalaj±cy na autentykacjê
-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 
+%prep
 %setup -q -n mod_%{mod_name}
 %patch0 -p1
 
 %build
-/usr/sbin/apxs -c mod_%{mod_name}.c -o mod_%{mod_name}.so -lgdbm -lcrypt -lpam /lib/security/pam_smb_auth.so
+%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.so \
+       -lgdbm -lcrypt -lpam /%{_lib}/security/pam_smb_auth.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}
 
+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
-/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
 
-%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
+
+%triggerpostun -- apache1-mod_%{mod_name} < 1:1.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 *.html
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*