- mv apache{,1}-* + minor fixes

[packages/apache1-mod_frontpage.git] / apache1-mod_frontpage.spec

diff --git a/apache1-mod_frontpage.spec b/apache1-mod_frontpage.spec
index 593e83e49c0bb9e7dcba4eae978dbfeba2bac951..4bd18ce89f1656b9c7d379b4d7af81286d882c03 100644 (file)
--- a/apache1-mod_frontpage.spec
+++ b/apache1-mod_frontpage.spec
@@ -1,32 +1,27 @@
 %define        mod_name        frontpage
-%define                arname          mod_%{mod_name}
-%define         apxs            /usr/sbin/apxs
-
+%define                apxs            /usr/sbin/apxs1
 Summary:       The improved mod_frontpage module for the Apache Web server
 Summary(pl):   Ulepszony modu³ mod_frontpage dla serwera Apache
-Name:          apache-mod_%{mod_name}
-Version:       1.6.1
-Release:       2
+Name:          apache1-mod_%{mod_name}
+Version:       1.6.2
+Release:       1
 License:       Apache
 Group:         Networking/Daemons
-#Source0: http://home.edo.uni-dortmund.de/~chripo/download/%{name}-%{version}mdk-1.3.19.tar.bz2
-#The patch is now maintained by FreeBSD
-Source0:       http://people.freebsd.org/~mbr/distfiles/mod_frontpage-%{version}.tar.bz2
-# Source0-md5: 62a91d885ea6cfb7c45662d7315659d8
-Patch0:                %{arname}-PLD.patch
-Patch1:                %{arname}-Makefile.patch
-Patch2:                %{arname}-fpexec-PLD.patch
-URL:           http://home.edo.uni-dortmund.de/~chripo/
-Prereq:                apache(EAPI)  >= 1.3.23
-Prereq:                %{apxs}
-Requires:      apache
-BuildRequires: apache(EAPI)-devel >= 1.3.23
-BuildRequires: perl
+Source0:       http://dl.sourceforge.net/mirfak/mod_%{mod_name}_mirfak-%{version}.tar.bz2
+# Source0-md5: f7480918382067ce16e7afc40a633be4
+Source1:       %{name}.pl
+Patch0:                %{name}-mirfak.patch
+URL:           http://mirfak.sourceforge.net/
+BuildRequires: apache1-devel >= 1.3.23
+BuildRequires: %{__perl}
+PreReq:                apache1 >= 1.3.23
+Requires(post,preun):  %{apxs}
+Requires:      apache1
+Obsoletes:     apache-mod_%{mod_name} <= %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes:     mod_frontpage
 
-%define         _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define         _sysconfdir     /etc/httpd
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+%define                _sysconfdir     /etc/apache
 
 %description
 This is a module for the Apache HTTP Server
@@ -52,14 +47,12 @@ rozszerzeniami FrontPage przy u
 uruchamiania fpinstall.sh lub fpsrvadm.exe z pow³oki systemowej).
 
 %prep
-%setup -q -n %{arname}-%{version}
-%patch -p0
-%patch1 -p0
-%patch2 -p0
+%setup -q -n mod_%{mod_name}_mirfak-%{version}
+%patch0 -p1
 
 %build
-perl Makefile.PL
-%{__make} CFLAGS="%{rpmcflags} -DLINUX=22 -DINET6 -Dss_family=__ss_family -Dss_len=__ss_len -DDEV_RANDOM=/dev/random -DEAPI -DEAPI_MM"
+%{__perl} %{SOURCE1}
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -73,21 +66,21 @@ 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
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES FEATURES LICENSE README
+%doc *.html CHANGES FEATURES README
 %attr(755,root,root) %{_pkglibdir}/*
 %attr(4750,root,root) %{_sbindir}/fpexec
 %attr(755,root,root) %{_sbindir}/fpstatic