%define mod_name frontpage
-%define arname mod_%{mod_name}
-%define apxs /usr/sbin/apxs
-
-Summary: The improved mod_frontpage module for the Apache Web server.
-Name: apache-mod_%{mod_name}
-Version: 1.6.1
-Release: 0.1
+%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: apache1-mod_%{mod_name}
+Version: 1.6.2
+Release: 2
+License: Apache
Group: Networking/Daemons
-URL: http://home.edo.uni-dortmund.de/~chripo/
-#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
-Patch0: %{arname}-PLD.patch
-Patch1: %{arname}-Makefile.patch
-Patch2: %{arname}-fpexec-PLD.patch
-License: Apache License
-Prereq: grep
-Prereq: apache(EAPI) >= 1.3.23
-Prereq: %{_sbindir}/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: %{__perl}
+BuildRequires: apache1-devel >= 1.3.33-2
+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 %(%{apxs} -q LIBEXECDIR)
-%define _sysconfdir /etc/httpd
+%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
%description
This is a module for the Apache HTTP Server
-<http://www.apache.org/httpd.html>. It replaces the Apache-FP patches
-and module supplied with the FrontPage Server Extensions available
-from Microsoft <http://www.microsoft.com> and Ready-to-Run Software
-<http://www.rtr.com/fpsupport>.
+<http://httpd.apache.org/>. It replaces the Apache-FP patches and
+module supplied with the FrontPage Server Extensions available from
+Microsoft <http://www.microsoft.com/> and Ready-to-Run Software
+<http://www.rtr.com/fpsupport/>.
Using this module allows you to use advanced features of the FrontPage
client with your Apache HTTP Server (e.g. creating FrontPage-extended
user "root" with "fpinstall.sh" or the "fpsrvadm.exe"-utility on the
system's shell).
+%description -l pl
+To jest modu³ dla serwera HTTP Apache. Zastêpuje ³aty Apache-FP oraz
+modu³ dodawany do FrontPage Server Extensions dostêpnych od Microsoftu
+i Ready-to-Run Software (<http://www.rtr.com/fpsupport/>).
+
+U¿ycie tego modu³u pozwala na u¿ywanie zaawansowanych mo¿liwo¶ci
+klienta FrontPage z serwerem Apache (np. tworzenie podstron z
+rozszerzeniami FrontPage przy u¿yciu klienta FrontPage zamiast przez
+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
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,%{_sbindir}}
+
install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
install fp{exec,static} $RPM_BUILD_ROOT%{_sbindir}
-gzip -9nf {CHANGES,FEATURES,INSTALL,LICENSE,README}
+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
-%{_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
+if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache restart 1>&2
+fi
+
+%postun
+if [ "$1" = "0" ]; then
+ if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache restart 1>&2
+ fi
fi
-%preun
- if [ "$1" = "0" ]; then
- %{_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
+%triggerpostun -- apache1-mod_%{mod_name} < 1.6.2-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 *.html CHANGES FEATURES README
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
%attr(755,root,root) %{_pkglibdir}/*
-%attr(4550,root,root) %{_sbindir}/fpexec
-%attr(0555,root,root) %{_sbindir}/fpstatic
-%doc *.gz
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%attr(4750,root,root) %{_sbindir}/fpexec
+%attr(755,root,root) %{_sbindir}/fpstatic