- updated to 1.4.1_5

- adaptarized spec

Changed files:
    apache-mod_midgard.spec -> 1.8

diff --git a/apache-mod_midgard.spec b/apache-mod_midgard.spec
index 94dab28880b165d7e4f61e2b44cb5c6afc5c9277..a17e2cebcbb74d2473800087d6842ae4a193c13e 100644 (file)
--- a/apache-mod_midgard.spec
+++ b/apache-mod_midgard.spec
@@ -1,21 +1,25 @@
+%define         mod_name        midgard
+%define                arname          mod_midgard
 Summary:       Midgard Apache module
-Name:          mod_midgard
-Version:       1.2.1
-Release:       5mdk
+Name:          apache-mod_midgard
+Version:       1.4.1_5
+Release:       0.1
 URL:           http://www.midgard-project.org/
 Vendor:                Midgard Project <http://www.midgard-project.org>
-Source0:       %{name}-%{version}.tar.bz2
-Source1:       %{name}.conf
+Source0:       %{arname}-%{version}.tar.bz2
 Copyright:     distributable
 Group:         Networking/Daemons
 Group(de):     Netzwerkwesen/Server
 Group(pl):     Sieciowe/Serwery
-Requires:      mysql-shared-libs, apache = 1.3.9, midgard-lib = %{version}
+Requires:      midgard-lib = %{version}, apache >= 1.3.12
 Provides:      mod_midgard
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRoot:      %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define         _pkglibdir      %(%{_sbindir}/apxs -q LIBEXECDIR)
+%define         _sysconfdir     /etc/httpd
 
 %prep
-%setup -q
+%setup -q -n %{arname}-%{version}
 
 %description
 Midgard is a freely-available Web application development and
@@ -25,7 +29,7 @@ your solutions in an open environment. Midgard is the tool for
 creating, modifying and maintaining dynamic database-enabled web
 services.
 
-%description
+%description -l pl
 Midgard jest wolnodostêpn± platform± rozwoju i publikowania aplikacji
 opart± na popularnym jêzyku skryptowym, PHP. Jest to projekt Open
 Source, umo¿liwiaj±cy uzytkownikowi tworzenie rozwi±zañ w otwartym
@@ -33,40 +37,44 @@ Source, umo
 utrzymywania dynamicznych, wykorzystuj±cych bazy danych serwisów WWW.
 
 %build
-CFLAGS="%{rpmcflags}" PATH=%{_sbindir}/:$PATH LDFLAGS="-L%{_libdir}/mysql -lmidgard -lmysqlclient %{rpmldflags}" ./configure --with-midgard=%{_prefix}/
+./configure \
+       --with-apxs=%{_sbindir}/apxs \
+       --with-mysql \
+       --with-midgar=/usr \
+       --with-expat
 %{__make}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/home/httpd/html/
-install -d $RPM_BUILD_ROOT%{_libdir}/apache/
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/addon-modules/
+%{__install} -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
+%{__install} midgard-root.php $RPM_BUILD_ROOT%{_pkglibdir}
+%{__install} mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+%{__install} midgard.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
-cp -f midgard-root.php3 $RPM_BUILD_ROOT/home/httpd/html/
-cp -f *.so $RPM_BUILD_ROOT%{_libdir}/apache/
-
-cp -f %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/addon-modules/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+gzip -9nf AUTHORS COPYING ChangeLog INSTALL INSTALL.ru NEWS README README.ru
 
 %post
-echo "Include conf/addon-modules/%{name}.conf" >> /etc/httpd/conf/httpd.conf
-if [ -f /etc/httpd/httpd.pid ]; then 
-       /usr/sbin/apachectl restart
+%{_sbindir}/apxs -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+echo "Include %{_sysconfdir}/%{mod_name}.conf" >> %{_sysconfdir}/httpd.conf
+if [ -f /var/lock/subsys/httpd ]; then
+    /etc/rc.d/init.d/httpd restart 1>&2
 fi
-
-%postun
-if [ `uname` = "Linux" ]; then perl="/usr/bin/perl"; fi
-if [ `uname` = "SunOS" ]; then perl="/usr/local/bin/perl"; fi
-$perl -pi -e "s|Include conf/addon-modules/%{name}.conf\n||g;" \
-       /etc/httpd/conf/httpd.conf
-if [ -f /etc/httpd/httpd.pid ]; then 
-       /usr/sbin/apachectl restart
+       
+%preun
+if [ "$1" = "0" ]; then
+    %{_sbindir}/apxs -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
+    %__perl -pi -e "s|Include %{_sysconfdir}/%{mod_name}.conf\n||g;" \
+            %{_sysconfdir}/httpd.conf
+    if [ -f /var/lock/subsys/httpd ]; then
+        /etc/rc.d/init.d/httpd restart 1>&2
+    fi
 fi
 
 %files
 %defattr(644,root,root,755)
-%config /home/httpd/html/midgard-root.php3
-%{_libdir}/apache/mod_midgard.so
-%{_sysconfdir}/httpd/conf/addon-modules/%{name}.conf
+%config %{_pkglibdir}/midgard-root.php
+%config(noreplace) %{_sysconfdir}/midgard.conf
+%attr(755,root,root) %{_pkglibdir}/mod_midgard.so
+%doc *.gz
+
+%clean
+rm -rf $RPM_BUILD_ROOT