- added %{apxs} local macro to avoid adapter problems

- fix use of %{apxs} and %{_sbindir}/apxs
- added BR %{apxs} & Prereq %{_sbindir}/apxs (if necessary); removed BR apache
- adapterized

Changed files:
    apache1-mod_video.spec -> 1.6

diff --git a/apache1-mod_video.spec b/apache1-mod_video.spec
index 97dfdaf29ce7585e2c99a13148dc311077b6ea6b..cb83f99a499bbb2f8f69a07e41e7906a83e63d48 100644 (file)
--- a/apache1-mod_video.spec
+++ b/apache1-mod_video.spec
@@ -1,4 +1,5 @@
 %define                mod_name        video
+%define        apxs            /usr/sbin/apxs
 Summary:       Shows images grabbed from a v4l device
 Summary(pl):   Wy¶wietla obrazy zrzucone z urz±dzenia v4l
 Name:          apache-mod_%{mod_name}
@@ -6,8 +7,20 @@ Version:       0.1.0
 Release:       2
 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:       http://borud.no/mod_video/download/mod_%{mod_name}-%{version}.tar.gz
 Patch0:                %{name}-webcam.patch
 URL:           http://modvideo.sourceforge.net/
@@ -15,11 +28,12 @@ BuildRequires:      apache(EAPI)-devel
 BuildRequires: zlib-devel
 BuildRequires: libpng-devel
 BuildRequires: libjpeg-devel
-Prereq:                /usr/sbin/apxs
+BuildRequires: %{apxs}
+Prereq:                %{_sbindir}/apxs
 Requires:      apache
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(/usr/sbin/apxs -q LIBEXECDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
 
 %description
 This package contains an Apache module for serving snapshots from the
@@ -35,7 +49,7 @@ API.
 %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 -lz -lpng -ljpeg
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,14 +61,14 @@ install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/sbin/apxs -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+%{_sbindir}/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
 
 %preun
 if [ "$1" = "0" ]; then
-       /usr/sbin/apxs -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+       %{_sbindir}/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