- release 1: renamed to apache1-*; waiting for server-side cp

Changed files:
    apache1-mod_video.spec -> 1.19

diff --git a/apache1-mod_video.spec b/apache1-mod_video.spec
index 200ca0da5e5db5a887883f42a9ece0a9a4b38b4a..427399ab7d08f7db4f8299d24807eac1c28afc4d 100644 (file)
--- a/apache1-mod_video.spec
+++ b/apache1-mod_video.spec
@@ -1,22 +1,24 @@
 %define                mod_name        video
-%define        apxs            /usr/sbin/apxs
+%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:       3
-License:       GPL
+Release:       1
+License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://borud.no/mod_video/download/mod_%{mod_name}-%{version}.tar.gz
 # Source0-md5: c1def4425d597596a1c4c5bb0f607085
-Patch0:                %{name}-webcam.patch
+Patch0:                apache-mod_video-webcam.patch
 URL:           http://modvideo.sourceforge.net/
 BuildRequires: %{apxs}
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: zlib-devel
+BuildRequires: apache1-devel
 Requires(post,preun):  %{apxs}
-Requires:      apache
+Requires:      apache1
+Obsoletes:     apache-mod_%{mod_name} <= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
@@ -47,15 +49,15 @@ 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
+if [ -f /var/lock/subsys/apache ]; then
+       /etc/rc.d/init.d/apache restart 1>&2
 fi
 
 %preun
 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
+       if [ -f /var/lock/subsys/apache ]; then
+               /etc/rc.d/init.d/apache restart 1>&2
        fi
 fi