SPECS: apache-mod-ngobjweb.spec - unified - apache config moved to...

[glen]

Author: glen                         Date: Mon Dec 26 18:00:57 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified
- apache config moved to SOURCES

---- Files affected:
SPECS:
   apache-mod-ngobjweb.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/apache-mod-ngobjweb.spec
diff -u SPECS/apache-mod-ngobjweb.spec:1.6 SPECS/apache-mod-ngobjweb.spec:1.7
--- SPECS/apache-mod-ngobjweb.spec:1.6	Tue Sep  6 17:16:49 2005
+++ SPECS/apache-mod-ngobjweb.spec	Mon Dec 26 19:00:51 2005
@@ -1,38 +1,38 @@
 # $Revision$, $Date$
 # 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
-# - OGo.conf link to %{_sysconfdir}/httpd/httpd.conf/@XX_Ogo.conf
-
+# - mv SPECS/{apache-mod-ngobjweb.spec,apache-mod_ngobjweb.spec},v
 %define		mod_ngobjweb_makeflags		-v
 %define		sope_version			4.3
 %define		opengroupware.org_version	1.0a
 %define		datenightly			200508311705
 %define		sopename			sope-mod_ngobjweb
-
-Summary:	mod_ngobjweb apache module
+%define 	apxs		/usr/sbin/apxs
+%define		mod_name	ngobjweb
+Summary:	mod_ngobjweb Apache module
 Summary(pl):	Moduł Apacha mod_ngobjweb
-Name:		apache-mod_ngobjweb
+Name:		apache-mod_%{mod_name}
 Version:	r1098
 Release:	0.1
 Vendor:		OpenGroupware.org
 License:	LGPL
 Group:		Development/Libraries
-Source0:	http://download.opengroupware.org/nightly/sources/trunk/%{sopename}-trunk-%{version}-%{datenightly}.tar.gz	
+Source0:	http://download.opengroupware.org/nightly/sources/trunk/%{sopename}-trunk-%{version}-%{datenightly}.tar.gz
 # Source0-md5:	8f5ffde2db954a7722cd9e3597370e71
+Source1:	%{name}.conf
 Patch0:		%{name}-makefile.patch
 URL:		http://www.softwarestudio.org/libical
-Requires: 	apache >= 2.0.40
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	apache-devel
+BuildRequires:	apache-devel >= 2.0
 BuildRequires:	apr-devel
 BuildRequires:	apr-util-devel
-Requires:	apache >= 2.0.40
+BuildRequires:	autoconf
+BuildRequires:	automake
+Requires:	apache(modules-api) = %apache_modules_api
 Requires:	ogo-environment
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
+
 %description
 apache2 mod_ngobjweb adaptor (for OpenGroupware.org). Enables Apache
 to handle HTTP requests for the SOPE application server.
@@ -47,58 +47,24 @@
 
 %build
 . %{_libdir}/GNUstep/System/Library/Makefiles/GNUstep.sh
-export PATH=$PATH:%{_sbindir}
 %{__make} \
-	apxs=/usr/sbin/apxs \
-	HTTPD=/usr/sbin/httpd
-	
+	CC="%{__cc}" \
+	LD="%{__cc}" \
+	apxs=%{apxs}
+
 %install
 rm -rf $RPM_BUILD_ROOT
-export PATH=$PATH:%{_sbindir}
-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
-
-echo "#this file contains the apache/httpd configuration for OpenGroupware.org
-#it should be included from within your default httpd.conf ala:
-#`include OGo.conf`
-#(or copy it into the dir where additonal configs end up)
-#
-LoadModule ngobjweb_module %{_var}/lib/opengroupware.org/mod_ngobjweb.so
-#
-Alias /OpenGroupware10a.woa/WebServerResources/ %{_prefix}/local/share/opengroupware.org-%{opengroupware.org_version}/www/
-Alias /ArticleImages %{_var}/lib/opengroupware.org/news
-#
-<LocationMatch "^/OpenGroupware*">
-  SetAppPort 20000
-  SetHandler ngobjweb-adaptor
-</LocationMatch>
-#
-<LocationMatch "^/zidestore/*">
-SetHandler ngobjweb-adaptor
-SetAppPort 21000
-</LocationMatch>
-#
-<LocationMatch "^/RPC2*">
-SetHandler ngobjweb-adaptor
-SetAppPort 22000
-</LocationMatch>
-" > $RPM_BUILD_ROOT%{_var}/lib/opengroupware.org/OGo.conf
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf}
+install mod_ngobjweb.so $RPM_BUILD_ROOT%{_pkglibdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/88_mod_%{mod_name}.conf
 
 %clean
 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(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
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -106,6 +72,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/12/26 18:00:51  glen
+- unified
+- apache config moved to SOURCES
+
 Revision 1.6  2005/09/06 15:16:49  wolvverine
 - md5 Source0
 
@@ -123,4 +93,4 @@
 
 Revision 1.1  2005/04/21 21:42:17  wolvverine
 - NFY
--initial spec
+- initial spec
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod-ngobjweb.spec?r1=1.6&r2=1.7&f=u