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

mod_ngobjweb.so gets installed into the apache modules dir... which
fixes OGo Bug #1020.

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@466 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/maintenance/mod_ngobjweb_fedora.spec b/maintenance/mod_ngobjweb_fedora.spec
index 14207bd9001617e6251c43bc63781054e90c1e6b..cd1849cfc6327bcc45542d72ec7ff1cd5eb1bba1 100644 (file)
--- a/maintenance/mod_ngobjweb_fedora.spec
+++ b/maintenance/mod_ngobjweb_fedora.spec
@@ -1,17 +1,17 @@
-Summary:               mod_ngobjweb apache module
-Name:                  mod_ngobjweb
-Version:               %{mod_ngobjweb_version}
-Release:               %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
-Vendor:                        OpenGroupware.org
-Packager:              Frank Reppin <frank@opengroupware.org>  
-License:               LGPL
-URL:                   http://sope.opengroupware.org/
-Group:                 Development/Libraries
-AutoReqProv:   off
-Requires:              ogo-environment
-Source:                        %{mod_ngobjweb_source}
-Prefix:                        %{mod_ngobjweb_prefix}
-BuildRoot:             %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary:      mod_ngobjweb apache module
+Name:         mod_ngobjweb
+Version:      %{mod_ngobjweb_version}
+Release:      %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
+Vendor:       OpenGroupware.org
+Packager:     Frank Reppin <frank@opengroupware.org>   
+License:      LGPL
+URL:          http://sope.opengroupware.org/
+Group:        Development/Libraries
+AutoReqProv:  off
+Requires:     httpd ogo-environment
+Source:       %{mod_ngobjweb_source}
+Prefix:       %{mod_ngobjweb_prefix}
+BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 apache2 mod_ngobjweb adaptor.
@@ -28,16 +28,16 @@ make %{mod_ngobjweb_makeflags} APXS_INCLUDE_DIRS="-I/usr/include/httpd -I/usr/in
 # ****************************** 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/httpd/modules
+cp mod_ngobjweb.so ${RPM_BUILD_ROOT}/usr/lib/httpd/modules/
 
-mkdir -p ${RPM_BUILD_ROOT}/var/lib/opengroupware.org
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/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/)
 #
-LoadModule ngobjweb_module %{prefix}/lib/sope-%{sope_major_version}.%{sope_minor_version}/mod_ngobjweb.so
+LoadModule ngobjweb_module %{_usr}/lib/httpd/modules/mod_ngobjweb.so
 #
 Alias /OpenGroupware10a.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.0a/www/
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
@@ -48,15 +48,15 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 </LocationMatch>
 #
 <LocationMatch "^/zidestore/*">
-SetHandler ngobjweb-adaptor
-SetAppPort 21000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 21000
 </LocationMatch>
 #
 <LocationMatch "^/RPC2*">
-SetHandler ngobjweb-adaptor
-SetAppPort 22000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 22000
 </LocationMatch>
-" > ${RPM_BUILD_ROOT}%{_var}/lib/opengroupware.org/OGo.conf
+" > ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/OGo.conf
 
 # ****************************** post *********************************
 %post
@@ -68,8 +68,14 @@ 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/httpd/modules/mod_ngobjweb.so
+%config %{_sysconfdir}/httpd/conf.d/OGo.conf
 
 # ********************************* changelog *************************
 %changelog
+* Thu Dec 23 2004 Frank Reppin <frank@opengroupware.org>
+- requires httpd -obviously-
+- mod_ngobjweb.so lives in /usr/lib/httpd/modules now
+- OGo.conf lives in /etc/httpd/conf.d now...
+* Wed Sep 09 2004 Frank Reppin <frank@opengroupware.org>
+- initial build

diff --git a/maintenance/mod_ngobjweb_mdk100.spec b/maintenance/mod_ngobjweb_mdk100.spec
index 30aa72c0ce4dcc9708f14e89b8538f1a81d4473a..4482274f10bcc3c34a79accd208dc6f16613d083 100644 (file)
--- a/maintenance/mod_ngobjweb_mdk100.spec
+++ b/maintenance/mod_ngobjweb_mdk100.spec
@@ -1,17 +1,17 @@
-Summary:               mod_ngobjweb apache module
-Name:                  mod_ngobjweb
-Version:               %{mod_ngobjweb_version}
-Release:               %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
-Vendor:                        OpenGroupware.org
-Packager:              Frank Reppin <frank@opengroupware.org>  
-License:               LGPL
-URL:                   http://sope.opengroupware.org/
-Group:                 Development/Libraries
-AutoReqProv:   off
-Requires:              ogo-environment
-Source:                        %{mod_ngobjweb_source}
-Prefix:                        %{mod_ngobjweb_prefix}
-BuildRoot:             %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary:      mod_ngobjweb apache module
+Name:         mod_ngobjweb
+Version:      %{mod_ngobjweb_version}
+Release:      %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
+Vendor:       OpenGroupware.org
+Packager:     Frank Reppin <frank@opengroupware.org>   
+License:      LGPL
+URL:          http://sope.opengroupware.org/
+Group:        Development/Libraries
+AutoReqProv:  off
+Requires:     apache2 ogo-environment
+Source:       %{mod_ngobjweb_source}
+Prefix:       %{mod_ngobjweb_prefix}
+BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 apache2 mod_ngobjweb adaptor.
@@ -23,21 +23,21 @@ rm -fr ${RPM_BUILD_ROOT}
 # ****************************** build ********************************
 %build
 export PATH=$PATH:/usr/sbin
-make %{mod_ngobjweb_makeflags} APXS="/usr/sbin/apxs2" APXS_INCLUDE_DIRS="-I/usr/include/apache2 -I/usr/include/apr-0"
+make %{mod_ngobjweb_makeflags} APXS="/usr/sbin/apxs2" APXS_INCLUDE_DIRS="-I/usr/include/apache2"
 
 # ****************************** 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/
 
-mkdir -p ${RPM_BUILD_ROOT}/var/lib/opengroupware.org
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/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/)
 #
-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
@@ -48,15 +48,15 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 </LocationMatch>
 #
 <LocationMatch "^/zidestore/*">
-SetHandler ngobjweb-adaptor
-SetAppPort 21000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 21000
 </LocationMatch>
 #
 <LocationMatch "^/RPC2*">
-SetHandler ngobjweb-adaptor
-SetAppPort 22000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 22000
 </LocationMatch>
-" > ${RPM_BUILD_ROOT}%{_var}/lib/opengroupware.org/OGo.conf
+" > ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/OGo.conf
 
 # ****************************** post *********************************
 %post
@@ -68,8 +68,14 @@ 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}/httpd/conf.d/OGo.conf
 
 # ********************************* changelog *************************
 %changelog
+* Thu Dec 23 2004 Frank Reppin <frank@opengroupware.org>
+- requires apache2 -obviously-
+- mod_ngobjweb.so lives in /usr/lib/apache2 now
+- OGo.conf lives in /etc/httpd/conf.d now...
+* Wed Sep 09 2004 Frank Reppin <frank@opengroupware.org>
+- initial build

diff --git a/maintenance/mod_ngobjweb_mdk101.spec b/maintenance/mod_ngobjweb_mdk101.spec
index 30aa72c0ce4dcc9708f14e89b8538f1a81d4473a..4482274f10bcc3c34a79accd208dc6f16613d083 100644 (file)
--- a/maintenance/mod_ngobjweb_mdk101.spec
+++ b/maintenance/mod_ngobjweb_mdk101.spec
@@ -1,17 +1,17 @@
-Summary:               mod_ngobjweb apache module
-Name:                  mod_ngobjweb
-Version:               %{mod_ngobjweb_version}
-Release:               %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
-Vendor:                        OpenGroupware.org
-Packager:              Frank Reppin <frank@opengroupware.org>  
-License:               LGPL
-URL:                   http://sope.opengroupware.org/
-Group:                 Development/Libraries
-AutoReqProv:   off
-Requires:              ogo-environment
-Source:                        %{mod_ngobjweb_source}
-Prefix:                        %{mod_ngobjweb_prefix}
-BuildRoot:             %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary:      mod_ngobjweb apache module
+Name:         mod_ngobjweb
+Version:      %{mod_ngobjweb_version}
+Release:      %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
+Vendor:       OpenGroupware.org
+Packager:     Frank Reppin <frank@opengroupware.org>   
+License:      LGPL
+URL:          http://sope.opengroupware.org/
+Group:        Development/Libraries
+AutoReqProv:  off
+Requires:     apache2 ogo-environment
+Source:       %{mod_ngobjweb_source}
+Prefix:       %{mod_ngobjweb_prefix}
+BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 apache2 mod_ngobjweb adaptor.
@@ -23,21 +23,21 @@ rm -fr ${RPM_BUILD_ROOT}
 # ****************************** build ********************************
 %build
 export PATH=$PATH:/usr/sbin
-make %{mod_ngobjweb_makeflags} APXS="/usr/sbin/apxs2" APXS_INCLUDE_DIRS="-I/usr/include/apache2 -I/usr/include/apr-0"
+make %{mod_ngobjweb_makeflags} APXS="/usr/sbin/apxs2" APXS_INCLUDE_DIRS="-I/usr/include/apache2"
 
 # ****************************** 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/
 
-mkdir -p ${RPM_BUILD_ROOT}/var/lib/opengroupware.org
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/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/)
 #
-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
@@ -48,15 +48,15 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 </LocationMatch>
 #
 <LocationMatch "^/zidestore/*">
-SetHandler ngobjweb-adaptor
-SetAppPort 21000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 21000
 </LocationMatch>
 #
 <LocationMatch "^/RPC2*">
-SetHandler ngobjweb-adaptor
-SetAppPort 22000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 22000
 </LocationMatch>
-" > ${RPM_BUILD_ROOT}%{_var}/lib/opengroupware.org/OGo.conf
+" > ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/OGo.conf
 
 # ****************************** post *********************************
 %post
@@ -68,8 +68,14 @@ 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}/httpd/conf.d/OGo.conf
 
 # ********************************* changelog *************************
 %changelog
+* Thu Dec 23 2004 Frank Reppin <frank@opengroupware.org>
+- requires apache2 -obviously-
+- mod_ngobjweb.so lives in /usr/lib/apache2 now
+- OGo.conf lives in /etc/httpd/conf.d now...
+* Wed Sep 09 2004 Frank Reppin <frank@opengroupware.org>
+- initial build

diff --git a/maintenance/mod_ngobjweb_redhat9.spec b/maintenance/mod_ngobjweb_redhat9.spec
index ef65905cc8b9596f5c935b85a2bc65e2e489ef7c..701beee1a424aa6e915a87c82e4d10a3369a5859 100644 (file)
--- a/maintenance/mod_ngobjweb_redhat9.spec
+++ b/maintenance/mod_ngobjweb_redhat9.spec
@@ -8,7 +8,7 @@ License:      LGPL
 URL:          http://sope.opengroupware.org/
 Group:        Development/Libraries
 AutoReqProv:  off
-Requires:     ogo-environment
+Requires:     httpd ogo-environment
 Source:       %{mod_ngobjweb_source}
 Prefix:       %{mod_ngobjweb_prefix}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -28,16 +28,16 @@ make %{mod_ngobjweb_makeflags} APXS_INCLUDE_DIRS="-I/usr/include/httpd"
 # ****************************** 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/httpd/modules
+cp mod_ngobjweb.so ${RPM_BUILD_ROOT}/usr/lib/httpd/modules/
 
-mkdir -p ${RPM_BUILD_ROOT}/var/lib/opengroupware.org
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/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/)
 #
-LoadModule ngobjweb_module %{prefix}/lib/sope-%{sope_major_version}.%{sope_minor_version}/mod_ngobjweb.so
+LoadModule ngobjweb_module %{_usr}/lib/httpd/modules/mod_ngobjweb.so
 #
 Alias /OpenGroupware10a.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.0a/www/
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
@@ -48,15 +48,15 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 </LocationMatch>
 #
 <LocationMatch "^/zidestore/*">
-SetHandler ngobjweb-adaptor
-SetAppPort 21000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 21000
 </LocationMatch>
 #
 <LocationMatch "^/RPC2*">
-SetHandler ngobjweb-adaptor
-SetAppPort 22000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 22000
 </LocationMatch>
-" > ${RPM_BUILD_ROOT}%{_var}/lib/opengroupware.org/OGo.conf
+" > ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/OGo.conf
 
 # ****************************** post *********************************
 %post
@@ -68,10 +68,14 @@ 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/httpd/modules/mod_ngobjweb.so
+%config %{_sysconfdir}/httpd/conf.d/OGo.conf
 
 # ********************************* changelog *************************
 %changelog
-* Wed Dec 12 2004 Frank Reppin <frank@opengroupware.org>
-- initial build on RedHat 9
+* Thu Dec 23 2004 Frank Reppin <frank@opengroupware.org>
+- requires httpd -obviously-
+- mod_ngobjweb.so lives in /usr/lib/httpd/modules now
+- OGo.conf lives in /etc/httpd/conf.d now...
+* Wed Sep 09 2004 Frank Reppin <frank@opengroupware.org>
+- initial build

diff --git a/maintenance/mod_ngobjweb_rhel3.spec b/maintenance/mod_ngobjweb_rhel3.spec
index f98328accdc57e459ab097fc3a3d7a1388d64236..701beee1a424aa6e915a87c82e4d10a3369a5859 100644 (file)
--- a/maintenance/mod_ngobjweb_rhel3.spec
+++ b/maintenance/mod_ngobjweb_rhel3.spec
@@ -1,17 +1,17 @@
-Summary:               mod_ngobjweb apache module
-Name:                  mod_ngobjweb
-Version:               %{mod_ngobjweb_version}
-Release:               %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
-Vendor:                        OpenGroupware.org
-Packager:              Frank Reppin <frank@opengroupware.org>  
-License:               LGPL
-URL:                   http://sope.opengroupware.org/
-Group:                 Development/Libraries
-AutoReqProv:   off
-Requires:              ogo-environment
-Source:                        %{mod_ngobjweb_source}
-Prefix:                        %{mod_ngobjweb_prefix}
-BuildRoot:             %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary:      mod_ngobjweb apache module
+Name:         mod_ngobjweb
+Version:      %{mod_ngobjweb_version}
+Release:      %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
+Vendor:       OpenGroupware.org
+Packager:     Frank Reppin <frank@opengroupware.org>   
+License:      LGPL
+URL:          http://sope.opengroupware.org/
+Group:        Development/Libraries
+AutoReqProv:  off
+Requires:     httpd ogo-environment
+Source:       %{mod_ngobjweb_source}
+Prefix:       %{mod_ngobjweb_prefix}
+BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 apache2 mod_ngobjweb adaptor.
@@ -28,16 +28,16 @@ make %{mod_ngobjweb_makeflags} APXS_INCLUDE_DIRS="-I/usr/include/httpd"
 # ****************************** 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/httpd/modules
+cp mod_ngobjweb.so ${RPM_BUILD_ROOT}/usr/lib/httpd/modules/
 
-mkdir -p ${RPM_BUILD_ROOT}/var/lib/opengroupware.org
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/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/)
 #
-LoadModule ngobjweb_module %{prefix}/lib/sope-%{sope_major_version}.%{sope_minor_version}/mod_ngobjweb.so
+LoadModule ngobjweb_module %{_usr}/lib/httpd/modules/mod_ngobjweb.so
 #
 Alias /OpenGroupware10a.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.0a/www/
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
@@ -48,15 +48,15 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 </LocationMatch>
 #
 <LocationMatch "^/zidestore/*">
-SetHandler ngobjweb-adaptor
-SetAppPort 21000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 21000
 </LocationMatch>
 #
 <LocationMatch "^/RPC2*">
-SetHandler ngobjweb-adaptor
-SetAppPort 22000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 22000
 </LocationMatch>
-" > ${RPM_BUILD_ROOT}%{_var}/lib/opengroupware.org/OGo.conf
+" > ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/OGo.conf
 
 # ****************************** post *********************************
 %post
@@ -68,8 +68,14 @@ 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/httpd/modules/mod_ngobjweb.so
+%config %{_sysconfdir}/httpd/conf.d/OGo.conf
 
 # ********************************* changelog *************************
 %changelog
+* Thu Dec 23 2004 Frank Reppin <frank@opengroupware.org>
+- requires httpd -obviously-
+- mod_ngobjweb.so lives in /usr/lib/httpd/modules now
+- OGo.conf lives in /etc/httpd/conf.d now...
+* Wed Sep 09 2004 Frank Reppin <frank@opengroupware.org>
+- initial build

diff --git a/maintenance/mod_ngobjweb_sles9.spec b/maintenance/mod_ngobjweb_sles9.spec
index 4450d3f33b92e362127cb6bfdcddc91ae3044440..620166b62ed2f4471190beb88bdaaf6b963381fc 100644 (file)
--- a/maintenance/mod_ngobjweb_sles9.spec
+++ b/maintenance/mod_ngobjweb_sles9.spec
@@ -1,17 +1,17 @@
-Summary:               mod_ngobjweb apache module
-Name:                  mod_ngobjweb
-Version:               %{mod_ngobjweb_version}
-Release:               %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
-Vendor:                        OpenGroupware.org
-Packager:              Frank Reppin <frank@opengroupware.org>  
-License:               LGPL
-URL:                   http://sope.opengroupware.org/
-Group:                 Development/Libraries
-AutoReqProv:   off
-Requires:              ogo-environment
-Source:                        %{mod_ngobjweb_source}
-Prefix:                        %{mod_ngobjweb_prefix}
-BuildRoot:             %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary:        mod_ngobjweb apache module
+Name:           mod_ngobjweb
+Version:        %{mod_ngobjweb_version}
+Release:        %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
+Vendor:         OpenGroupware.org
+Packager:       Frank Reppin <frank@opengroupware.org> 
+License:        LGPL
+URL:            http://sope.opengroupware.org/
+Group:          Development/Libraries
+AutoReqProv:    off
+Requires:       apache2 ogo-environment
+Source:         %{mod_ngobjweb_source}
+Prefix:         %{mod_ngobjweb_prefix}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 apache2 mod_ngobjweb adaptor.
@@ -28,16 +28,22 @@ 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/)
 #
-LoadModule ngobjweb_module %{prefix}/lib/sope-%{sope_major_version}.%{sope_minor_version}/mod_ngobjweb.so
+#SUSEs httpd.conf denies access to everywhere (except /srv/www) per default
+<Directory %{prefix}/share/opengroupware.org-1.0a/www> 
+  Order allow,deny 
+  Allow from all 
+</Directory>
+#
+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
@@ -48,15 +54,15 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 </LocationMatch>
 #
 <LocationMatch "^/zidestore/*">
-SetHandler ngobjweb-adaptor
-SetAppPort 21000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 21000
 </LocationMatch>
 #
 <LocationMatch "^/RPC2*">
-SetHandler ngobjweb-adaptor
-SetAppPort 22000
+  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
@@ -68,8 +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
+* 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

diff --git a/maintenance/mod_ngobjweb_slss8.spec b/maintenance/mod_ngobjweb_slss8.spec
index 0b963f3be82e71a580695830934f30d7aa6059a4..8fb004c96299a8bfdc43b208dec5af163e5bff09 100644 (file)
--- a/maintenance/mod_ngobjweb_slss8.spec
+++ b/maintenance/mod_ngobjweb_slss8.spec
@@ -1,20 +1,20 @@
-Summary:               mod_ngobjweb apache module
-Name:                  mod_ngobjweb
-Version:               %{mod_ngobjweb_version}
-Release:               %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
-Vendor:                        OpenGroupware.org
-Packager:              Frank Reppin <frank@opengroupware.org>  
-License:               LGPL
-URL:                   http://sope.opengroupware.org/
-Group:                 Development/Libraries
-AutoReqProv:   off
-Requires:              ogo-environment
-Source:                        %{mod_ngobjweb_source}
-Prefix:                        %{mod_ngobjweb_prefix}
-BuildRoot:             %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary:        mod_ngobjweb apache module
+Name:           mod_ngobjweb
+Version:        %{mod_ngobjweb_version}
+Release:        %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
+Vendor:         OpenGroupware.org
+Packager:       Frank Reppin <frank@opengroupware.org>
+License:        LGPL
+URL:            http://sope.opengroupware.org/
+Group:          Development/Libraries
+AutoReqProv:    off
+Requires:       apache ogo-environment
+Source:         %{mod_ngobjweb_source}
+Prefix:         %{mod_ngobjweb_prefix}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
-apache2 mod_ngobjweb adaptor.
+apache mod_ngobjweb adaptor.
 
 %prep
 rm -fr ${RPM_BUILD_ROOT}
@@ -28,16 +28,16 @@ make %{mod_ngobjweb_makeflags} APXS="/usr/sbin/apxs" APXS_INCLUDE_DIRS="-I/usr/i
 # ****************************** 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/apache
+cp mod_ngobjweb.so ${RPM_BUILD_ROOT}%{_usr}/lib/apache/mod_ngobjweb.so
 
-mkdir -p ${RPM_BUILD_ROOT}/var/lib/opengroupware.org
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd
 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 %{prefix}/lib/sope-%{sope_major_version}.%{sope_minor_version}/mod_ngobjweb.so
+LoadModule ngobjweb_module %{_usr}/lib/apache/mod_ngobjweb.so
 #
 Alias /OpenGroupware10a.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.0a/www/
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
@@ -48,15 +48,15 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 </LocationMatch>
 #
 <LocationMatch "^/zidestore/*">
-SetHandler ngobjweb-adaptor
-SetAppPort 21000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 21000
 </LocationMatch>
 #
 <LocationMatch "^/RPC2*">
-SetHandler ngobjweb-adaptor
-SetAppPort 22000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 22000
 </LocationMatch>
-" > ${RPM_BUILD_ROOT}%{_var}/lib/opengroupware.org/OGo.conf
+" > ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/OGo.conf
 
 # ****************************** post *********************************
 %post
@@ -68,8 +68,15 @@ 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/apache/mod_ngobjweb.so
+%config %{_sysconfdir}/httpd/OGo.conf
 
 # ********************************* changelog *************************
 %changelog
+* Thu Dec 23 2004 Frank Reppin <frank@opengroupware.org>
+- requires apache -obviously-
+- mod_ngobjweb.so lives in /usr/lib/apache/modules now
+- OGo.conf lives in /etc/httpd/conf.d now...
+- which fixes -> http://bugzilla.opengroupware.org/bugzilla/show_bug.cgi?id=1020
+* Wed Sep 09 2004 Frank Reppin <frank@opengroupware.org>
+- initial build

diff --git a/maintenance/mod_ngobjweb_suse82.spec b/maintenance/mod_ngobjweb_suse82.spec
index 4450d3f33b92e362127cb6bfdcddc91ae3044440..8e0bea8c0c87f66eecc77dc40bc1d90774e7a73b 100644 (file)
--- a/maintenance/mod_ngobjweb_suse82.spec
+++ b/maintenance/mod_ngobjweb_suse82.spec
@@ -1,17 +1,17 @@
-Summary:               mod_ngobjweb apache module
-Name:                  mod_ngobjweb
-Version:               %{mod_ngobjweb_version}
-Release:               %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
-Vendor:                        OpenGroupware.org
-Packager:              Frank Reppin <frank@opengroupware.org>  
-License:               LGPL
-URL:                   http://sope.opengroupware.org/
-Group:                 Development/Libraries
-AutoReqProv:   off
-Requires:              ogo-environment
-Source:                        %{mod_ngobjweb_source}
-Prefix:                        %{mod_ngobjweb_prefix}
-BuildRoot:             %{_tmppath}/%{name}-%{version}-%{release}-root
+Summary:        mod_ngobjweb apache module
+Name:           mod_ngobjweb
+Version:        %{mod_ngobjweb_version}
+Release:        %{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
+Vendor:         OpenGroupware.org
+Packager:       Frank Reppin <frank@opengroupware.org> 
+License:        LGPL
+URL:            http://sope.opengroupware.org/
+Group:          Development/Libraries
+AutoReqProv:    off
+Requires:       apache2 ogo-environment
+Source:         %{mod_ngobjweb_source}
+Prefix:         %{mod_ngobjweb_prefix}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 apache2 mod_ngobjweb adaptor.
@@ -28,16 +28,16 @@ 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/)
 #
-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
@@ -48,15 +48,15 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 </LocationMatch>
 #
 <LocationMatch "^/zidestore/*">
-SetHandler ngobjweb-adaptor
-SetAppPort 21000
+  SetHandler ngobjweb-adaptor
+  SetAppPort 21000
 </LocationMatch>
 #
 <LocationMatch "^/RPC2*">
-SetHandler ngobjweb-adaptor
-SetAppPort 22000
+  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
@@ -68,8 +68,15 @@ 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
+* 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 Sep 09 2004 Frank Reppin <frank@opengroupware.org>
+- initial build

diff --git a/maintenance/mod_ngobjweb_suse91.spec b/maintenance/mod_ngobjweb_suse91.spec
index 3f6588aaf294fc316d30c74442a6c8e21c96dd34..620166b62ed2f4471190beb88bdaaf6b963381fc 100644 (file)
--- a/maintenance/mod_ngobjweb_suse91.spec
+++ b/maintenance/mod_ngobjweb_suse91.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

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