put OGo.conf into the apache conf.d dir where possible;

[sope] / maintenance / mod_ngobjweb_suse92.spec

diff --git a/maintenance/mod_ngobjweb_suse92.spec b/maintenance/mod_ngobjweb_suse92.spec
index 3f6588aaf294fc316d30c74442a6c8e21c96dd34..620166b62ed2f4471190beb88bdaaf6b963381fc 100644 (file)
--- a/maintenance/mod_ngobjweb_suse92.spec
+++ b/maintenance/mod_ngobjweb_suse92.spec
@@ -8,7 +8,7 @@ License:        LGPL
 URL:            http://sope.opengroupware.org/
 Group:          Development/Libraries
 AutoReqProv:    off
-Requires:       ogo-environment
+Requires:       apache2 ogo-environment
 Source:         %{mod_ngobjweb_source}
 Prefix:         %{mod_ngobjweb_prefix}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -28,14 +28,14 @@ make %{mod_ngobjweb_makeflags} APXS="/usr/sbin/apxs2" APXS_INCLUDE_DIRS="-I/usr/
 # ****************************** install ******************************
 %install
 export PATH=$PATH:/usr/sbin
-mkdir -p ${RPM_BUILD_ROOT}%{prefix}/lib/sope-%{sope_major_version}.%{sope_minor_version}
-cp mod_ngobjweb.so ${RPM_BUILD_ROOT}%{prefix}/lib/sope-%{sope_major_version}.%{sope_minor_version}/mod_ngobjweb.so
+mkdir -p ${RPM_BUILD_ROOT}%{_usr}/lib/apache2
+cp mod_ngobjweb.so ${RPM_BUILD_ROOT}%{_usr}/lib/apache2/mod_ngobjweb.so
 
-mkdir -p ${RPM_BUILD_ROOT}/var/lib/opengroupware.org
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/apache2/conf.d/
 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)
+#(or copy it into the dir where additonal configs end up - usually conf.d/)
 #
 #SUSEs httpd.conf denies access to everywhere (except /srv/www) per default
 <Directory %{prefix}/share/opengroupware.org-1.0a/www> 
@@ -43,7 +43,7 @@ echo "#this file contains the apache/httpd configuration for OpenGroupware.org
   Allow from all 
 </Directory>
 #
-LoadModule ngobjweb_module %{prefix}/lib/sope-%{sope_major_version}.%{sope_minor_version}/mod_ngobjweb.so
+LoadModule ngobjweb_module %{_usr}/lib/apache2/mod_ngobjweb.so
 #
 Alias /OpenGroupware10a.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.0a/www/
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
@@ -62,7 +62,7 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
   SetHandler ngobjweb-adaptor
   SetAppPort 22000
 </LocationMatch>
-" > ${RPM_BUILD_ROOT}%{_var}/lib/opengroupware.org/OGo.conf
+" > ${RPM_BUILD_ROOT}%{_sysconfdir}/apache2/conf.d/OGo.conf
 
 # ****************************** post *********************************
 %post
@@ -74,12 +74,17 @@ rm -fr ${RPM_BUILD_ROOT}
 # ****************************** files ********************************
 %files
 %defattr(-,root,root,-)
-%{prefix}/lib/sope-%{sope_major_version}.%{sope_minor_version}/mod_ngobjweb.so
-%config %{_var}/lib/opengroupware.org/OGo.conf
+%{_usr}/lib/apache2/mod_ngobjweb.so
+%config %{_sysconfdir}/apache2/conf.d/OGo.conf
 
 # ********************************* changelog *************************
 %changelog
-* Wed Dec 12 2004 Frank Reppin <frank@opengroupware.org>
+* Thu Dec 23 2004 Frank Reppin <frank@opengroupware.org>
+- requires apache2 -obviously-
+- mod_ngobjweb.so lives in /usr/lib/apache2/modules now
+- OGo.conf lives in /etc/apache2/conf.d now...
+- which fixes -> http://bugzilla.opengroupware.org/bugzilla/show_bug.cgi?id=1020
+* Wed Dec 21 2004 Frank Reppin <frank@opengroupware.org>
 - dealt with http://bugzilla.opengroupware.org/bugzilla/show_bug.cgi?id=1084
 * Wed Sep 09 2004 Frank Reppin <frank@opengroupware.org>
 - initial build