X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_auth_mysql.spec;h=0cebeea9c35b34e0123c1f2ab92b3b7f3d43b3a9;hb=530d9142af10d71d51d6c8e6a1a7e52a1cc56579;hp=a0e1049fd1f0a6408d9924a6252bbc6eb061db55;hpb=c006e0d3d0e71ee28b2ac1f7d89697ca4ca881c1;p=packages%2Fapache-mod_auth_mysql.git

diff --git a/apache-mod_auth_mysql.spec b/apache-mod_auth_mysql.spec
index a0e1049..0cebeea 100644
--- a/apache-mod_auth_mysql.spec
+++ b/apache-mod_auth_mysql.spec
@@ -1,4 +1,5 @@
 %define		mod_name	auth_mysql
+%define		apxs		/usr/sbin/apxs
 Summary:	This is the MySQL authentication module for Apache
 Summary(cs):	Základní autentizace pro WWW server Apache pomocí MySQL
 Summary(da):	Autenticering for webtjeneren Apache fra en MySQL-database
@@ -7,45 +8,33 @@ Summary(es):	Autenticaci
 Summary(fr):	Authentification de base pour le serveur Web Apache utilisant une base de données MySQL
 Summary(it):	Autenticazione di base per il server Web Apache mediante un database MySQL
 Summary(ja):	MySQL ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò»È¤Ã¤¿ Apache Web ¥µ¡¼¥Ð¡¼¤Ø¤Î´ðËÜǧ¾Ú
-Summary(no):	Autentisering for webtjeneren Apache fra en MySQL-database
-Summary(pl):	Modu³ autentykacji MySQL dla Apache
+Summary(nb):	Autentisering for webtjeneren Apache fra en MySQL-database
+Summary(pl):	Modu³ uwierzytelnienia MySQL dla Apache
 Summary(pt_BR):	Autenticação via MySQL para o Apache
 Summary(sv):	Grundläggande autenticering för webbservern Apache med en MySQL-databas
 Name:		apache-mod_%{mod_name}
-Version:	0.11
-Release:	3
+Version:	4.3.9
+Release:	0.1
 License:	GPL
 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:	ftp://ftp.kcilink.com/pub/mod_%{mod_name}.c.gz
-Source1:	ftp://ftp.kciLink.com/pub/mysql-group-auth.txt
-Patch0:		%{name}-name.patch
+Source0:	ftp://ftp.debian.org/debian/pool/main/liba/libapache-mod-auth-mysql/libapache-mod-auth-mysql_%{version}.orig.tar.gz
+# Source0-md5:	9c1ecbe5fb64d4c93444311ff34bfe35
+BuildRequires:	apache-devel >= 2.0.0
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	mysql-devel
-BuildRequires:	/usr/sbin/apxs
-BuildRequires:	apache(EAPI)-devel
-Prereq:		/usr/sbin/apxs
-Requires:	apache(EAPI)
+BuildRequires:	%{apxs}
+Requires:	apache >= 2.0.0
 Requires:	apache-mod_auth
+Obsoletes:	apache-mod_%{mod_name} <= %{version}
 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
 This is an authentication module for Apache that allows you to
-authenticate HTTP clients using mysql RDBMS.
+authenticate HTTP clients using MySQL RDBMS.
 
 %description -l cs
 Balíèek mod_auth_mysql slou¾í pro omezení pøístupu k dokumentùm, které
@@ -77,8 +66,8 @@ mod_auth_mysql 
 ¤¬¤Ç¤­¤Þ¤¹¡£
 
 %description -l pl
-To jest modu³ autentykacji dla Apache pozwalaj±cy na autentykacjê
-klientów HTTP z u¿yciem bazy danych mysql.
+To jest modu³ uwierzytelnienia dla Apache pozwalaj±cy na
+uwierzytelnianie klientów HTTP z u¿yciem bazy danych MySQL.
 
 %description -l pt_BR
 Com o mod_auth_mysql você pode fazer autenticação no Apache usando o
@@ -90,41 +79,43 @@ servade av en webbserver genom att kontrollera data i en
 MySQL-databas.
 
 %prep
-%setup -q -T -c
-gzip -dc %{SOURCE0} > mod_%{mod_name}.c
-%patch -p1
+%setup -q -n mod-auth-mysql-%{version}
 
 %build
-%{_sbindir}/apxs -c mod_%{mod_name}.c -o mod_%{mod_name}.so -lmysqlclient
+sed -i -e 's#/usr/bin/apxs2#%{apxs}#g' configure*
+%configure \
+	--enable-apache2 \
+	--with-apxs=%{apxs} \
+	--with-mysql=%{_prefix}
+echo '#define APACHE2 1' >> config.h
+%{__make}
 
 %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}
 
-install %{SOURCE1} .
-
-gzip -9nf *.txt
+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
+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}/mod_%{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
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz
+%doc README* USAGE
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*