- spec adapterized.

Changed files:
    apache-mod_midgard.spec -> 1.4

diff --git a/apache-mod_midgard.spec b/apache-mod_midgard.spec
index bd25e53cf317442e7b3d1ad8771b7b36118ffd75..efbddac85ce8373e76e6da25bd187b9fbf623641 100644 (file)
--- a/apache-mod_midgard.spec
+++ b/apache-mod_midgard.spec
@@ -1,20 +1,20 @@
-Summary:  Midgard Apache module
-Name: mod_midgard
-Version: 1.2.1
-Release: 5mdk
-URL: http://www.midgard-project.org/
-Packager: Jean-Michel Dault <jmdault@netrevolution.com>
-Vendor: Midgard Project <http://www.midgard-project.org>
-Source: mod_midgard-%{version}.tar.bz2
-Source1: %{name}.conf
-Copyright: distributable
-Group: System Environment/Daemons
-Requires: mysql-shared-libs, apache = 1.3.9, midgard-lib = %{version}
-Provides: mod_midgard
+Summary:       Midgard Apache module
+Name:          mod_midgard
+Version:       1.2.1
+Release:       5mdk
+URL:           http://www.midgard-project.org/
+Vendor:                Midgard Project <http://www.midgard-project.org>
+Source0:       mod_midgard-%{version}.tar.bz2
+Source1:       %{name}.conf
+Copyright:     distributable
+Group:         System Environment/Daemons
+######         Unknown group!
+Requires:      mysql-shared-libs, apache = 1.3.9, midgard-lib = %{version}
+Provides:      mod_midgard
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %prep
-%setup
+%setup -q
 
 %description
 Midgard is a freely-available Web application development and
@@ -25,30 +25,31 @@ creating, modifying and maintaining dynamic database-enabled web
 services.
 
 %description
-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 ¶rodowisku.
-Midgard jest narzêdziem do tworzenia, modyfikacji i utrzymywania 
-dynamicznych, wykorzystuj±cych bazy danych serwisów WWW.
+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
+¶rodowisku. Midgard jest narzêdziem do tworzenia, modyfikacji i
+utrzymywania dynamicznych, wykorzystuj±cych bazy danych serwisów WWW.
 
 %build
-CFLAGS=$RPM_OPT_FLAGS PATH=/usr/sbin/:$PATH LDFLAGS="-L/usr/lib/mysql -lmidgard -lmysqlclient" ./configure --with-midgard=/usr/
+CFLAGS=$RPM_OPT_FLAGS PATH=%{_sbindir}/:$PATH LDFLAGS="-L%{_libdir}/mysql -lmidgard -lmysqlclient" ./configure --with-midgard=%{_prefix}/
 make
 
 %install
-mkdir -p $RPM_BUILD_ROOT/home/httpd/html/
-mkdir -p $RPM_BUILD_ROOT/usr/lib/apache/
-mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf/addon-modules/
+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/
 
 cp midgard-root.php3 $RPM_BUILD_ROOT/home/httpd/html/
-cp *.so $RPM_BUILD_ROOT/usr/lib/apache/
+cp *.so $RPM_BUILD_ROOT%{_libdir}/apache/
 
-cp %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/conf/addon-modules/
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/addon-modules/
 
 %post
 echo "Include conf/addon-modules/%{name}.conf" >> /etc/httpd/conf/httpd.conf
 if [ -f /etc/httpd/httpd.pid ]; then 
-   /usr/sbin/apachectl restart
+       /usr/sbin/apachectl restart
 fi
 
 %postun
@@ -57,20 +58,11 @@ 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
+       /usr/sbin/apachectl restart
 fi
 
 %files
+%defattr(644,root,root,755)
 %config /home/httpd/html/midgard-root.php3
-/usr/lib/apache/mod_midgard.so
-/etc/httpd/conf/addon-modules/%{name}.conf
-
-%changelog
-
-* Mon Sep 06 1999 Jean-Michel Dault <jmdault@netrevolution.com>
-- put in Group: System Environment/Daemons
-- re-build for EAPI 2.4.2 and mm 1.0.11
-
-* Fri Sep 03 1999 Jean-Michel Dault <jmdault@netrevolution.com>
-- updated to 1.2.1
-- fixed dependancies
+%{_libdir}/apache/mod_midgard.so
+%{_sysconfdir}/httpd/conf/addon-modules/%{name}.conf