X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache1-mod_video.spec;h=d1e62c81eb7a04c41487a4b1b7a6304782d2f974;hb=8812585923d4b2cebe675884bd2b88ac01128ef6;hp=4e3a191a7d01d35e1b7e1aa06877d2ec4c52ab61;hpb=3637f4820a129934779f547bf550dee064723da3;p=packages%2Fapache1-mod_video.git

diff --git a/apache1-mod_video.spec b/apache1-mod_video.spec
index 4e3a191..d1e62c8 100644
--- a/apache1-mod_video.spec
+++ b/apache1-mod_video.spec
@@ -1,66 +1,78 @@
 %define		mod_name	video
+%define 	apxs		/usr/sbin/apxs1
 Summary:	Shows images grabbed from a v4l device
 Summary(pl):	Wy¶wietla obrazy zrzucone z urz±dzenia v4l
-Name:		apache-mod_%{mod_name}
+Name:		apache1-mod_%{mod_name}
 Version:	0.1.0
-Release:	1
-License:	GPL
+Release:	1.1
+License:	GPL v2
 Group:		Networking/Daemons
-Group(de):	Netzwerkwesen/Server
-Group(pl):	Sieciowe/Serwery
 Source0:	http://borud.no/mod_video/download/mod_%{mod_name}-%{version}.tar.gz
+# Source0-md5:	c1def4425d597596a1c4c5bb0f607085
 Patch0:		%{name}-webcam.patch
 URL:		http://modvideo.sourceforge.net/
-BuildRequires:	apache(EAPI)-devel
-BuildRequires:	zlib-devel
-BuildRequires:	libpng-devel
+BuildRequires:	%{apxs}
+BuildRequires:	apache1-devel >= 1.3.33-2
 BuildRequires:	libjpeg-devel
-Prereq:		/usr/sbin/apxs
-Requires:	apache
+BuildRequires:	libpng-devel
+BuildRequires:	zlib-devel
+Requires(triggerpostun):	%{apxs}
+Requires:	apache1 >= 1.3.33-2
+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 package contain an Apache module for serving snapshots from the
+This package contains an Apache module for serving snapshots from the
 video4linux API.
 
 %description -l pl
-Pakeit ten zawiera modu³ do Apache umo¿liwiajacey serwowanie zdjêæ
+Pakiet ten zawiera modu³ do Apache umo¿liwiaj±cy serwowanie zdjêæ
 bezpo¶rednio generowanych z kamer obs³ugiwanych poprzez video4linux
 API.
 
-%prep 
+%prep
 %setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
 
 %build
-apxs -c mod_%{mod_name}.c -o mod_%{mod_name}.so -lz -lpng -ljpeg
+%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.so -lpng -ljpeg
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
 
-install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
+
+install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/mod_%{mod_name}.so
+
+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
 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
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%triggerpostun -- apache1-mod_%{mod_name} < 0.1.0-1.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 doc/*
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*