- partial cleanup

Changed files:
    apache-mod_ngobjweb.spec -> 1.4

diff --git a/apache-mod_ngobjweb.spec b/apache-mod_ngobjweb.spec
index 955b0b196a420256db9decb117b2901b37903329..9bb7c809820d70e92b06160c9adbbc7220214fdd 100644 (file)
--- a/apache-mod_ngobjweb.spec
+++ b/apache-mod_ngobjweb.spec
@@ -1,8 +1,12 @@
+# TODO:
+# - mv SPECS/{apache-mod-ngobjweb.spec,apache-mod_ngobjweb.spec},v (if it's apache module)
+# - why Name and install dir is sope-* ???
+# - strange /var/*/*.so and /usr/local paths in generated OGo.conf
+
 %define                mod_ngobjweb_makeflags          -v
 %define                sope_version                    4.3
 %define                opengroupware.org_version       1.0a
 
-
 Summary:       mod_ngobjweb apache module
 Summary(pl):   Modu³ Apacha mod_ngobjweb
 Name:          sope-mod_ngobjweb
@@ -11,8 +15,6 @@ Release:      1
 Vendor:                OpenGroupware.org
 License:       LGPL
 Group:         Development/Libraries
-Requires:      ogo-environment
-Requires:      apache >= 2.0.40
 Source0:       http://download.opengroupware.org/sources/trunk/sope-mod_ngobjweb-trunk-latest.tar.gz
 URL:           http://www.softwarestudio.org/libical
 Requires:      apache >= 2.0.40
@@ -21,32 +23,37 @@ BuildRequires:      automake
 BuildRequires: apache-devel
 BuildRequires: apr-devel
 BuildRequires: apr-util-devel
+Requires:      apache >= 2.0.40
+Requires:      ogo-environment
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-apache2 mod_ngobjweb adaptor (for OpenGroupware.org) .
-Enables apache to handle HTTP requests for the SOPE application server
+apache2 mod_ngobjweb adaptor (for OpenGroupware.org). Enables Apache
+to handle HTTP requests for the SOPE application server.
 
 %description -l pl
-Modu³ adaptera ngobjweb (dla OpenGroupware.org).
-Enables apache to handle HTTP requests for the SOPE application server
+Modu³ adaptera ngobjweb (dla OpenGroupware.org). Pozwala serwerowi
+Apache obs³ugiwaæ ¿±dania HTTP dla serwera aplikacji SOPE.
 
 %prep
-
 %setup -n sope-mod_ngobjweb
 
 %build
 . /usr/lib/GNUstep/System/Library/Makefiles/GNUstep.sh
 export PATH=$PATH:%{_sbindir}
-make %{mod_ngobjweb_makeflags} apxs=/usr/sbin/apxs HTTPD=/usr/sbin/httpd APXS_INCLUDE_DIRS="-I%{_includedir}/apr -I%{_includedir}/apr-util -I%{_includedir}/apache"
+%{__make} %{mod_ngobjweb_makeflags} \
+       apxs=/usr/sbin/apxs \
+       HTTPD=/usr/sbin/httpd \
+       APXS_INCLUDE_DIRS="-I%{_includedir}/apr -I%{_includedir}/apr-util -I%{_includedir}/apache"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export PATH=$PATH:%{_sbindir}
-install -d ${RPM_BUILD_ROOT}%{_libdir}/sope-%{sope_version}
-cp mod_ngobjweb.so ${RPM_BUILD_ROOT}%{_libdir}/sope-%{sope_version}/mod_ngobjweb.so
+install -d $RPM_BUILD_ROOT%{_libdir}/sope-%{sope_version}
+
+install mod_ngobjweb.so $RPM_BUILD_ROOT%{_libdir}/sope-%{sope_version}/mod_ngobjweb.so
 
-install -d ${RPM_BUILD_ROOT}%{_var}/lib/opengroupware.org
+install -d $RPM_BUILD_ROOT%{_var}/lib/opengroupware.org
 
 echo "#this file contains the apache/httpd configuration for OpenGroupware.org
 #it should be included from within your default httpd.conf ala:
@@ -72,18 +79,17 @@ SetAppPort 21000
 SetHandler ngobjweb-adaptor
 SetAppPort 22000
 </LocationMatch>
-" > ${RPM_BUILD_ROOT}%{_var}/lib/opengroupware.org/OGo.conf
-
-
-%post
-cp %{_var}/lib/opengroupware.org/OGo.conf /etc/httpd/httpd.conf/88_OGo.conf
+" > $RPM_BUILD_ROOT%{_var}/lib/opengroupware.org/OGo.conf
 
 %clean
-rm -fr ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
 
+# NOT THIS WAY
+#%post
+#cp %{_var}/lib/opengroupware.org/OGo.conf /etc/httpd/httpd.conf/88_OGo.conf
 
 %files
 %defattr(644,root,root,755)
-%config %{_sysconfdir}/httpd/httpd.conf/88_OGo.conf
-%{_libdir}/sope-%{sope_version}/mod_ngobjweb.so
-%config %{_var}/lib/opengroupware.org/OGo.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/httpd.conf/88_OGo.conf
+%attr(755,root,root) %{_libdir}/sope-%{sope_version}/mod_ngobjweb.so
+%config(noreplace) %verify(not md5 mtime size) %{_var}/lib/opengroupware.org/OGo.conf