X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_vhost_mysql.spec;h=d95ff992c42f21d902662fff439cbe23c10b38af;hb=e94b885362f496bca03b55bcbe7c58e6cc1987e4;hp=6e2b942049540b545766ca2cb680af71777f1256;hpb=dcb01b724b523503f2aec69d484aa0a36bb0e6b9;p=packages%2Fapache-mod_vhost_mysql.git

diff --git a/apache-mod_vhost_mysql.spec b/apache-mod_vhost_mysql.spec
index 6e2b942..d95ff99 100644
--- a/apache-mod_vhost_mysql.spec
+++ b/apache-mod_vhost_mysql.spec
@@ -1,59 +1,71 @@
 #
-# TODO:
-# Summary clean +pl, description,
-
+# Conditional build:
+%bcond_with	publichtml	# enables search of public_html in home taken from mysql
+#
 %define		mod_name	vhost_mysql
 %define 	apxs		/usr/sbin/apxs
-Summary:	Apache vhost in mysql
+Summary:	Apache vhost in MySQL
+Summary(pl):	Wirtualne hosty dla Apache'a w bazie MySQL
 Name:		apache-mod_%{mod_name}
 Version:	0.10
-Release:	0.1
+Release:	6
 License:	GPL
 Group:		Networking/Daemons
-Source0:	http://fabienne.tc2.utelisys.net/~skinkie/mod_%{mod_name}2/mod_%{mod_name}2-%{version}.tar.gz
+Source0:	http://fabienne.tc2.utelisys.net/~skinkie/mod_vhost_mysql2/mod_%{mod_name}2-%{version}.tar.gz
 # Source0-md5:	c47c8dc4ac41e9ed2c91a239c876d272
+Source1:	apache_vhost_mysql.conf
+Patch0:		mod_%{mod_name}2-publichtml.patch		
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel
+BuildRequires:	apache-devel >= 2.0
 BuildRequires:	db-devel >= 4.2.52
 BuildRequires:	mysql-devel
-Requires(post,preun):	%{apxs}
-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)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
+This module provides dynamically configured virtual hosting using
+MySQL in Apache2.
+
+%description -l pl
+Ten modu³ umo¿liwia dynamicznie konfigurowanie hostów wirtualnych w
+Apache'u 2 przy u¿yciu bazy MySQL.
 
 %prep
 %setup -q -n mod_%{mod_name}2-%{version}
+rm -rf .libs *.{la,lo,o,slo}
+%if %{with publichtml}
+%patch -p1
+%endif
+
 
 %build
-%{__make} APXS=apxs
+%{__make} \
+	APXS=%{apxs}
 
 %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}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/21_vhost_mysql.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{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 httpd restart
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-	%{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 httpd restart
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc README vh.sql
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_vhost_mysql.conf
+%attr(755,root,root) %{_pkglibdir}/*.so