made mod_ngobjweb triggers usable for ogoall packages

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

diff --git a/maintenance/mod_ngobjweb_conectiva10.spec b/maintenance/mod_ngobjweb_conectiva10.spec
index 9d9eed697f16f651ecb78ca8fda8eebb5e209c77..fb6a4ac7bb8e198731dfd0bff69455c4174c58e3 100644 (file)
--- a/maintenance/mod_ngobjweb_conectiva10.spec
+++ b/maintenance/mod_ngobjweb_conectiva10.spec
@@ -12,7 +12,7 @@ License:      LGPL
 URL:          http://sope.opengroupware.org/
 Group:        Development/Libraries
 AutoReqProv:  off
-Requires:     %{ngobjweb_requires} ogo-environment
+Requires:     %{ngobjweb_requires}
 Source:       %{mod_ngobjweb_source}
 Prefix:       %{mod_ngobjweb_prefix}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -62,7 +62,7 @@ if [ $1 = 0 ]; then
 fi
 
 # ****************************** trigger ******************************
-%triggerin -- ogo-webui-app
+%triggerin -- ogo-webui-app, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
@@ -85,7 +85,7 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 " >%{apache_conf_dir}/ogo-webui.conf
 fi
 
-%triggerin -- ogo-xmlrpcd
+%triggerin -- ogo-xmlrpcd, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo XMLRPCd via http
 #
@@ -99,7 +99,7 @@ echo "# configuration needed to access the OGo XMLRPCd via http
 " >%{apache_conf_dir}/ogo-xmlrpcd.conf
 fi
 
-%triggerin -- ogo-zidestore
+%triggerin -- ogo-zidestore, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo ZideStore via http
 #
@@ -113,21 +113,21 @@ echo "# configuration needed to access the OGo ZideStore via http
 " >%{apache_conf_dir}/ogo-zidestore.conf
 fi
 
-%triggerun -- ogo-webui-app
+%triggerun -- ogo-webui-app, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-webui.conf ]; then
     rm -f %{apache_conf_dir}/ogo-webui.conf
   fi
 fi
 
-%triggerun -- ogo-xmlrpcd
+%triggerun -- ogo-xmlrpcd, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-xmlrpcd.conf ]; then
     rm -f %{apache_conf_dir}/ogo-xmlrpcd.conf
   fi
 fi
 
-%triggerun -- ogo-zidestore
+%triggerun -- ogo-zidestore, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-zidestore.conf ]; then
     rm -f %{apache_conf_dir}/ogo-zidestore.conf
@@ -149,6 +149,9 @@ rm -fr ${RPM_BUILD_ROOT}
 
 # ********************************* changelog *************************
 %changelog
+* Tue Mar 01 2005 Frank Reppin <frank@opengroupware.org>
+- drop dependency on ogo-environment
+- allow triggers on ogoall package
 * Sat Feb 19 2005 Frank Reppin <frank@opengroupware.org>
 - replaced common vars with 2 new macros (will make editing safer)
 - revisited last commit regarding OGo Bug #1254 and decided

diff --git a/maintenance/mod_ngobjweb_fedora.spec b/maintenance/mod_ngobjweb_fedora.spec
index f94e6ef7c882b75f7156e731abd7639c1c41c534..8cd568495d75c0d0f7b10e114a5bdfa426d2b2d8 100644 (file)
--- a/maintenance/mod_ngobjweb_fedora.spec
+++ b/maintenance/mod_ngobjweb_fedora.spec
@@ -12,7 +12,7 @@ License:      LGPL
 URL:          http://sope.opengroupware.org/
 Group:        Development/Libraries
 AutoReqProv:  off
-Requires:     %{ngobjweb_requires} ogo-environment
+Requires:     %{ngobjweb_requires}
 Source:       %{mod_ngobjweb_source}
 Prefix:       %{mod_ngobjweb_prefix}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -62,7 +62,7 @@ if [ $1 = 0 ]; then
 fi
 
 # ****************************** trigger ******************************
-%triggerin -- ogo-webui-app
+%triggerin -- ogo-webui-app, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
@@ -85,7 +85,7 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 " >%{apache_conf_dir}/ogo-webui.conf
 fi
 
-%triggerin -- ogo-xmlrpcd
+%triggerin -- ogo-xmlrpcd, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo XMLRPCd via http
 #
@@ -99,7 +99,7 @@ echo "# configuration needed to access the OGo XMLRPCd via http
 " >%{apache_conf_dir}/ogo-xmlrpcd.conf
 fi
 
-%triggerin -- ogo-zidestore
+%triggerin -- ogo-zidestore, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo ZideStore via http
 #
@@ -113,21 +113,21 @@ echo "# configuration needed to access the OGo ZideStore via http
 " >%{apache_conf_dir}/ogo-zidestore.conf
 fi
 
-%triggerun -- ogo-webui-app
+%triggerun -- ogo-webui-app, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-webui.conf ]; then
     rm -f %{apache_conf_dir}/ogo-webui.conf
   fi
 fi
 
-%triggerun -- ogo-xmlrpcd
+%triggerun -- ogo-xmlrpcd, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-xmlrpcd.conf ]; then
     rm -f %{apache_conf_dir}/ogo-xmlrpcd.conf
   fi
 fi
 
-%triggerun -- ogo-zidestore
+%triggerun -- ogo-zidestore, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-zidestore.conf ]; then
     rm -f %{apache_conf_dir}/ogo-zidestore.conf
@@ -149,6 +149,9 @@ rm -fr ${RPM_BUILD_ROOT}
 
 # ********************************* changelog *************************
 %changelog
+* Tue Mar 01 2005 Frank Reppin <frank@opengroupware.org>
+- drop dependency on ogo-environment
+- allow triggers on ogoall package
 * Sat Feb 19 2005 Frank Reppin <frank@opengroupware.org>
 - replaced common vars with 2 new macros (will make editing safer)
 - revisited last commit regarding OGo Bug #1254 and decided

diff --git a/maintenance/mod_ngobjweb_mdk100.spec b/maintenance/mod_ngobjweb_mdk100.spec
index 584335f31edbd829a978f8d6f9fff66eae3bb06b..64c2ceef9cdf32ea9017dc1d860f3dd0ac1f694e 100644 (file)
--- a/maintenance/mod_ngobjweb_mdk100.spec
+++ b/maintenance/mod_ngobjweb_mdk100.spec
@@ -12,7 +12,7 @@ License:      LGPL
 URL:          http://sope.opengroupware.org/
 Group:        Development/Libraries
 AutoReqProv:  off
-Requires:     %{ngobjweb_requires} ogo-environment
+Requires:     %{ngobjweb_requires}
 Source:       %{mod_ngobjweb_source}
 Prefix:       %{mod_ngobjweb_prefix}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -62,7 +62,7 @@ if [ $1 = 0 ]; then
 fi
 
 # ****************************** trigger ******************************
-%triggerin -- ogo-webui-app
+%triggerin -- ogo-webui-app, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
@@ -85,7 +85,7 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 " >%{apache_conf_dir}/ogo-webui.conf
 fi
 
-%triggerin -- ogo-xmlrpcd
+%triggerin -- ogo-xmlrpcd, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo XMLRPCd via http
 #
@@ -99,7 +99,7 @@ echo "# configuration needed to access the OGo XMLRPCd via http
 " >%{apache_conf_dir}/ogo-xmlrpcd.conf
 fi
 
-%triggerin -- ogo-zidestore
+%triggerin -- ogo-zidestore, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo ZideStore via http
 #
@@ -113,21 +113,21 @@ echo "# configuration needed to access the OGo ZideStore via http
 " >%{apache_conf_dir}/ogo-zidestore.conf
 fi
 
-%triggerun -- ogo-webui-app
+%triggerun -- ogo-webui-app, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-webui.conf ]; then
     rm -f %{apache_conf_dir}/ogo-webui.conf
   fi
 fi
 
-%triggerun -- ogo-xmlrpcd
+%triggerun -- ogo-xmlrpcd, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-xmlrpcd.conf ]; then
     rm -f %{apache_conf_dir}/ogo-xmlrpcd.conf
   fi
 fi
 
-%triggerun -- ogo-zidestore
+%triggerun -- ogo-zidestore, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-zidestore.conf ]; then
     rm -f %{apache_conf_dir}/ogo-zidestore.conf
@@ -149,6 +149,9 @@ rm -fr ${RPM_BUILD_ROOT}
 
 # ********************************* changelog *************************
 %changelog
+* Tue Mar 01 2005 Frank Reppin <frank@opengroupware.org>
+- drop dependency on ogo-environment
+- allow triggers on ogoall package
 * Sat Feb 19 2005 Frank Reppin <frank@opengroupware.org>
 - replaced common vars with 2 new macros (will make editing safer)
 - revisited last commit regarding OGo Bug #1254 and decided

diff --git a/maintenance/mod_ngobjweb_mdk101.spec b/maintenance/mod_ngobjweb_mdk101.spec
index 4c0a878867ced55ab5ba93a0a6d1b0725d2bb52d..e4901044f9c4b8497886b94f2d644d6894c70479 100644 (file)
--- a/maintenance/mod_ngobjweb_mdk101.spec
+++ b/maintenance/mod_ngobjweb_mdk101.spec
@@ -12,7 +12,7 @@ License:      LGPL
 URL:          http://sope.opengroupware.org/
 Group:        Development/Libraries
 AutoReqProv:  off
-Requires:     %{ngobjweb_requires} ogo-environment
+Requires:     %{ngobjweb_requires}
 Source:       %{mod_ngobjweb_source}
 Prefix:       %{mod_ngobjweb_prefix}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -62,7 +62,7 @@ if [ $1 = 0 ]; then
 fi
 
 # ****************************** trigger ******************************
-%triggerin -- ogo-webui-app
+%triggerin -- ogo-webui-app, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
@@ -85,7 +85,7 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 " >%{apache_conf_dir}/ogo-webui.conf
 fi
 
-%triggerin -- ogo-xmlrpcd
+%triggerin -- ogo-xmlrpcd, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo XMLRPCd via http
 #
@@ -99,7 +99,7 @@ echo "# configuration needed to access the OGo XMLRPCd via http
 " >%{apache_conf_dir}/ogo-xmlrpcd.conf
 fi
 
-%triggerin -- ogo-zidestore
+%triggerin -- ogo-zidestore, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo ZideStore via http
 #
@@ -113,21 +113,21 @@ echo "# configuration needed to access the OGo ZideStore via http
 " >%{apache_conf_dir}/ogo-zidestore.conf
 fi
 
-%triggerun -- ogo-webui-app
+%triggerun -- ogo-webui-app, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-webui.conf ]; then
     rm -f %{apache_conf_dir}/ogo-webui.conf
   fi
 fi
 
-%triggerun -- ogo-xmlrpcd
+%triggerun -- ogo-xmlrpcd, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-xmlrpcd.conf ]; then
     rm -f %{apache_conf_dir}/ogo-xmlrpcd.conf
   fi
 fi
 
-%triggerun -- ogo-zidestore
+%triggerun -- ogo-zidestore, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-zidestore.conf ]; then
     rm -f %{apache_conf_dir}/ogo-zidestore.conf
@@ -149,6 +149,9 @@ rm -fr ${RPM_BUILD_ROOT}
 
 # ********************************* changelog *************************
 %changelog
+* Tue Mar 01 2005 Frank Reppin <frank@opengroupware.org>
+- drop dependency on ogo-environment
+- allow triggers on ogoall package
 * Sat Feb 19 2005 Frank Reppin <frank@opengroupware.org>
 - replaced common vars with 2 new macros (will make editing safer)
 - revisited last commit regarding OGo Bug #1254 and decided

diff --git a/maintenance/mod_ngobjweb_redhat9.spec b/maintenance/mod_ngobjweb_redhat9.spec
index 36c171784611b76d1999671082fa4928a3a6eb1a..09830f79639622bac0d45723db8f152484e35f83 100644 (file)
--- a/maintenance/mod_ngobjweb_redhat9.spec
+++ b/maintenance/mod_ngobjweb_redhat9.spec
@@ -12,7 +12,7 @@ License:      LGPL
 URL:          http://sope.opengroupware.org/
 Group:        Development/Libraries
 AutoReqProv:  off
-Requires:     %{ngobjweb_requires} ogo-environment
+Requires:     %{ngobjweb_requires}
 Source:       %{mod_ngobjweb_source}
 Prefix:       %{mod_ngobjweb_prefix}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -62,7 +62,7 @@ if [ $1 = 0 ]; then
 fi
 
 # ****************************** trigger ******************************
-%triggerin -- ogo-webui-app
+%triggerin -- ogo-webui-app, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
@@ -85,7 +85,7 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 " >%{apache_conf_dir}/ogo-webui.conf
 fi
 
-%triggerin -- ogo-xmlrpcd
+%triggerin -- ogo-xmlrpcd, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo XMLRPCd via http
 #
@@ -99,7 +99,7 @@ echo "# configuration needed to access the OGo XMLRPCd via http
 " >%{apache_conf_dir}/ogo-xmlrpcd.conf
 fi
 
-%triggerin -- ogo-zidestore
+%triggerin -- ogo-zidestore, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo ZideStore via http
 #
@@ -113,21 +113,21 @@ echo "# configuration needed to access the OGo ZideStore via http
 " >%{apache_conf_dir}/ogo-zidestore.conf
 fi
 
-%triggerun -- ogo-webui-app
+%triggerun -- ogo-webui-app, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-webui.conf ]; then
     rm -f %{apache_conf_dir}/ogo-webui.conf
   fi
 fi
 
-%triggerun -- ogo-xmlrpcd
+%triggerun -- ogo-xmlrpcd, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-xmlrpcd.conf ]; then
     rm -f %{apache_conf_dir}/ogo-xmlrpcd.conf
   fi
 fi
 
-%triggerun -- ogo-zidestore
+%triggerun -- ogo-zidestore, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-zidestore.conf ]; then
     rm -f %{apache_conf_dir}/ogo-zidestore.conf
@@ -149,6 +149,9 @@ rm -fr ${RPM_BUILD_ROOT}
 
 # ********************************* changelog *************************
 %changelog
+* Tue Mar 01 2005 Frank Reppin <frank@opengroupware.org>
+- drop dependency on ogo-environment
+- allow triggers on ogoall package
 * Sat Feb 19 2005 Frank Reppin <frank@opengroupware.org>
 - replaced common vars with 2 new macros (will make editing safer)
 - revisited last commit regarding OGo Bug #1254 and decided

diff --git a/maintenance/mod_ngobjweb_rhel3.spec b/maintenance/mod_ngobjweb_rhel3.spec
index 165f3b7a19a2ea51ed7dbb2f51880d3abb2c02b8..bd27b0245a2048d1022fcfb83722e96d60918a99 100644 (file)
--- a/maintenance/mod_ngobjweb_rhel3.spec
+++ b/maintenance/mod_ngobjweb_rhel3.spec
@@ -12,7 +12,7 @@ License:      LGPL
 URL:          http://sope.opengroupware.org/
 Group:        Development/Libraries
 AutoReqProv:  off
-Requires:     %{ngobjweb_requires} ogo-environment
+Requires:     %{ngobjweb_requires}
 Source:       %{mod_ngobjweb_source}
 Prefix:       %{mod_ngobjweb_prefix}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -62,7 +62,7 @@ if [ $1 = 0 ]; then
 fi
 
 # ****************************** trigger ******************************
-%triggerin -- ogo-webui-app
+%triggerin -- ogo-webui-app, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
@@ -85,7 +85,7 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 " >%{apache_conf_dir}/ogo-webui.conf
 fi
 
-%triggerin -- ogo-xmlrpcd
+%triggerin -- ogo-xmlrpcd, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo XMLRPCd via http
 #
@@ -99,7 +99,7 @@ echo "# configuration needed to access the OGo XMLRPCd via http
 " >%{apache_conf_dir}/ogo-xmlrpcd.conf
 fi
 
-%triggerin -- ogo-zidestore
+%triggerin -- ogo-zidestore, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo ZideStore via http
 #
@@ -113,21 +113,21 @@ echo "# configuration needed to access the OGo ZideStore via http
 " >%{apache_conf_dir}/ogo-zidestore.conf
 fi
 
-%triggerun -- ogo-webui-app
+%triggerun -- ogo-webui-app, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-webui.conf ]; then
     rm -f %{apache_conf_dir}/ogo-webui.conf
   fi
 fi
 
-%triggerun -- ogo-xmlrpcd
+%triggerun -- ogo-xmlrpcd, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-xmlrpcd.conf ]; then
     rm -f %{apache_conf_dir}/ogo-xmlrpcd.conf
   fi
 fi
 
-%triggerun -- ogo-zidestore
+%triggerun -- ogo-zidestore, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-zidestore.conf ]; then
     rm -f %{apache_conf_dir}/ogo-zidestore.conf
@@ -149,6 +149,9 @@ rm -fr ${RPM_BUILD_ROOT}
 
 # ********************************* changelog *************************
 %changelog
+* Tue Mar 01 2005 Frank Reppin <frank@opengroupware.org>
+- drop dependency on ogo-environment
+- allow triggers on ogoall package
 * Sat Feb 19 2005 Frank Reppin <frank@opengroupware.org>
 - replaced common vars with 2 new macros (will make editing safer)
 - revisited last commit regarding OGo Bug #1254 and decided

diff --git a/maintenance/mod_ngobjweb_sles9.spec b/maintenance/mod_ngobjweb_sles9.spec
index 86c7661591c5b751d499f21bd059d4b184f97b27..f26adc0202f6d4704e1a3e0e257a5866a8ede3af 100644 (file)
--- a/maintenance/mod_ngobjweb_sles9.spec
+++ b/maintenance/mod_ngobjweb_sles9.spec
@@ -12,7 +12,7 @@ License:      LGPL
 URL:          http://sope.opengroupware.org/
 Group:        Development/Libraries
 AutoReqProv:  off
-Requires:     %{ngobjweb_requires} ogo-environment
+Requires:     %{ngobjweb_requires}
 Source:       %{mod_ngobjweb_source}
 Prefix:       %{mod_ngobjweb_prefix}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -62,7 +62,7 @@ if [ $1 = 0 ]; then
 fi
 
 # ****************************** trigger ******************************
-%triggerin -- ogo-webui-app
+%triggerin -- ogo-webui-app, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
@@ -85,7 +85,7 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 " >%{apache_conf_dir}/ogo-webui.conf
 fi
 
-%triggerin -- ogo-xmlrpcd
+%triggerin -- ogo-xmlrpcd, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo XMLRPCd via http
 #
@@ -99,7 +99,7 @@ echo "# configuration needed to access the OGo XMLRPCd via http
 " >%{apache_conf_dir}/ogo-xmlrpcd.conf
 fi
 
-%triggerin -- ogo-zidestore
+%triggerin -- ogo-zidestore, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo ZideStore via http
 #
@@ -113,21 +113,21 @@ echo "# configuration needed to access the OGo ZideStore via http
 " >%{apache_conf_dir}/ogo-zidestore.conf
 fi
 
-%triggerun -- ogo-webui-app
+%triggerun -- ogo-webui-app, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-webui.conf ]; then
     rm -f %{apache_conf_dir}/ogo-webui.conf
   fi
 fi
 
-%triggerun -- ogo-xmlrpcd
+%triggerun -- ogo-xmlrpcd, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-xmlrpcd.conf ]; then
     rm -f %{apache_conf_dir}/ogo-xmlrpcd.conf
   fi
 fi
 
-%triggerun -- ogo-zidestore
+%triggerun -- ogo-zidestore, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-zidestore.conf ]; then
     rm -f %{apache_conf_dir}/ogo-zidestore.conf
@@ -149,6 +149,9 @@ rm -fr ${RPM_BUILD_ROOT}
 
 # ********************************* changelog *************************
 %changelog
+* Tue Mar 01 2005 Frank Reppin <frank@opengroupware.org>
+- drop dependency on ogo-environment
+- allow triggers on ogoall package
 * Sat Feb 19 2005 Frank Reppin <frank@opengroupware.org>
 - replaced common vars with 2 new macros (will make editing safer)
 - revisited last commit regarding OGo Bug #1254 and decided

diff --git a/maintenance/mod_ngobjweb_slss8.spec b/maintenance/mod_ngobjweb_slss8.spec
index 1889d2cfeccac0b0e7a06d451d48b1b7a63a95a5..b97fd1bcc65899a58141a4b9df7592f6d842f04b 100644 (file)
--- a/maintenance/mod_ngobjweb_slss8.spec
+++ b/maintenance/mod_ngobjweb_slss8.spec
@@ -12,7 +12,7 @@ License:      LGPL
 URL:          http://sope.opengroupware.org/
 Group:        Development/Libraries
 AutoReqProv:  off
-Requires:     %{ngobjweb_requires} ogo-environment
+Requires:     %{ngobjweb_requires}
 Source:       %{mod_ngobjweb_source}
 Prefix:       %{mod_ngobjweb_prefix}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -62,7 +62,7 @@ if [ $1 = 0 ]; then
 fi
 
 # ****************************** trigger ******************************
-%triggerin -- ogo-webui-app
+%triggerin -- ogo-webui-app, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
@@ -85,7 +85,7 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 " >%{apache_conf_dir}/ogo-webui.conf
 fi
 
-%triggerin -- ogo-xmlrpcd
+%triggerin -- ogo-xmlrpcd, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo XMLRPCd via http
 #
@@ -99,7 +99,7 @@ echo "# configuration needed to access the OGo XMLRPCd via http
 " >%{apache_conf_dir}/ogo-xmlrpcd.conf
 fi
 
-%triggerin -- ogo-zidestore
+%triggerin -- ogo-zidestore, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo ZideStore via http
 #
@@ -113,21 +113,21 @@ echo "# configuration needed to access the OGo ZideStore via http
 " >%{apache_conf_dir}/ogo-zidestore.conf
 fi
 
-%triggerun -- ogo-webui-app
+%triggerun -- ogo-webui-app, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-webui.conf ]; then
     rm -f %{apache_conf_dir}/ogo-webui.conf
   fi
 fi
 
-%triggerun -- ogo-xmlrpcd
+%triggerun -- ogo-xmlrpcd, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-xmlrpcd.conf ]; then
     rm -f %{apache_conf_dir}/ogo-xmlrpcd.conf
   fi
 fi
 
-%triggerun -- ogo-zidestore
+%triggerun -- ogo-zidestore, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-zidestore.conf ]; then
     rm -f %{apache_conf_dir}/ogo-zidestore.conf
@@ -149,6 +149,9 @@ rm -fr ${RPM_BUILD_ROOT}
 
 # ********************************* changelog *************************
 %changelog
+* Tue Mar 01 2005 Frank Reppin <frank@opengroupware.org>
+- drop dependency on ogo-environment
+- allow triggers on ogoall package
 * Sat Feb 19 2005 Frank Reppin <frank@opengroupware.org>
 - replaced common vars with 2 new macros (will make editing safer)
 - revisited last commit regarding OGo Bug #1254 and decided

diff --git a/maintenance/mod_ngobjweb_suse82.spec b/maintenance/mod_ngobjweb_suse82.spec
index 483d1157c5ee1fec0fc1edd01516c7784795f4a6..0409847015d4df03fa9f2898e5ba96affa098f12 100644 (file)
--- a/maintenance/mod_ngobjweb_suse82.spec
+++ b/maintenance/mod_ngobjweb_suse82.spec
@@ -12,7 +12,7 @@ License:      LGPL
 URL:          http://sope.opengroupware.org/
 Group:        Development/Libraries
 AutoReqProv:  off
-Requires:     %{ngobjweb_requires} ogo-environment
+Requires:     %{ngobjweb_requires}
 Source:       %{mod_ngobjweb_source}
 Prefix:       %{mod_ngobjweb_prefix}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -62,7 +62,7 @@ if [ $1 = 0 ]; then
 fi
 
 # ****************************** trigger ******************************
-%triggerin -- ogo-webui-app
+%triggerin -- ogo-webui-app, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
@@ -85,7 +85,7 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 " >%{apache_conf_dir}/ogo-webui.conf
 fi
 
-%triggerin -- ogo-xmlrpcd
+%triggerin -- ogo-xmlrpcd, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo XMLRPCd via http
 #
@@ -99,7 +99,7 @@ echo "# configuration needed to access the OGo XMLRPCd via http
 " >%{apache_conf_dir}/ogo-xmlrpcd.conf
 fi
 
-%triggerin -- ogo-zidestore
+%triggerin -- ogo-zidestore, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo ZideStore via http
 #
@@ -113,21 +113,21 @@ echo "# configuration needed to access the OGo ZideStore via http
 " >%{apache_conf_dir}/ogo-zidestore.conf
 fi
 
-%triggerun -- ogo-webui-app
+%triggerun -- ogo-webui-app, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-webui.conf ]; then
     rm -f %{apache_conf_dir}/ogo-webui.conf
   fi
 fi
 
-%triggerun -- ogo-xmlrpcd
+%triggerun -- ogo-xmlrpcd, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-xmlrpcd.conf ]; then
     rm -f %{apache_conf_dir}/ogo-xmlrpcd.conf
   fi
 fi
 
-%triggerun -- ogo-zidestore
+%triggerun -- ogo-zidestore, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-zidestore.conf ]; then
     rm -f %{apache_conf_dir}/ogo-zidestore.conf
@@ -149,6 +149,9 @@ rm -fr ${RPM_BUILD_ROOT}
 
 # ********************************* changelog *************************
 %changelog
+* Tue Mar 01 2005 Frank Reppin <frank@opengroupware.org>
+- drop dependency on ogo-environment
+- allow triggers on ogoall package
 * Sat Feb 19 2005 Frank Reppin <frank@opengroupware.org>
 - replaced common vars with 2 new macros (will make editing safer)
 - revisited last commit regarding OGo Bug #1254 and decided

diff --git a/maintenance/mod_ngobjweb_suse91.spec b/maintenance/mod_ngobjweb_suse91.spec
index 86c7661591c5b751d499f21bd059d4b184f97b27..f26adc0202f6d4704e1a3e0e257a5866a8ede3af 100644 (file)
--- a/maintenance/mod_ngobjweb_suse91.spec
+++ b/maintenance/mod_ngobjweb_suse91.spec
@@ -12,7 +12,7 @@ License:      LGPL
 URL:          http://sope.opengroupware.org/
 Group:        Development/Libraries
 AutoReqProv:  off
-Requires:     %{ngobjweb_requires} ogo-environment
+Requires:     %{ngobjweb_requires}
 Source:       %{mod_ngobjweb_source}
 Prefix:       %{mod_ngobjweb_prefix}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -62,7 +62,7 @@ if [ $1 = 0 ]; then
 fi
 
 # ****************************** trigger ******************************
-%triggerin -- ogo-webui-app
+%triggerin -- ogo-webui-app, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
@@ -85,7 +85,7 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 " >%{apache_conf_dir}/ogo-webui.conf
 fi
 
-%triggerin -- ogo-xmlrpcd
+%triggerin -- ogo-xmlrpcd, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo XMLRPCd via http
 #
@@ -99,7 +99,7 @@ echo "# configuration needed to access the OGo XMLRPCd via http
 " >%{apache_conf_dir}/ogo-xmlrpcd.conf
 fi
 
-%triggerin -- ogo-zidestore
+%triggerin -- ogo-zidestore, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo ZideStore via http
 #
@@ -113,21 +113,21 @@ echo "# configuration needed to access the OGo ZideStore via http
 " >%{apache_conf_dir}/ogo-zidestore.conf
 fi
 
-%triggerun -- ogo-webui-app
+%triggerun -- ogo-webui-app, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-webui.conf ]; then
     rm -f %{apache_conf_dir}/ogo-webui.conf
   fi
 fi
 
-%triggerun -- ogo-xmlrpcd
+%triggerun -- ogo-xmlrpcd, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-xmlrpcd.conf ]; then
     rm -f %{apache_conf_dir}/ogo-xmlrpcd.conf
   fi
 fi
 
-%triggerun -- ogo-zidestore
+%triggerun -- ogo-zidestore, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-zidestore.conf ]; then
     rm -f %{apache_conf_dir}/ogo-zidestore.conf
@@ -149,6 +149,9 @@ rm -fr ${RPM_BUILD_ROOT}
 
 # ********************************* changelog *************************
 %changelog
+* Tue Mar 01 2005 Frank Reppin <frank@opengroupware.org>
+- drop dependency on ogo-environment
+- allow triggers on ogoall package
 * Sat Feb 19 2005 Frank Reppin <frank@opengroupware.org>
 - replaced common vars with 2 new macros (will make editing safer)
 - revisited last commit regarding OGo Bug #1254 and decided

diff --git a/maintenance/mod_ngobjweb_suse92.spec b/maintenance/mod_ngobjweb_suse92.spec
index 86c7661591c5b751d499f21bd059d4b184f97b27..f26adc0202f6d4704e1a3e0e257a5866a8ede3af 100644 (file)
--- a/maintenance/mod_ngobjweb_suse92.spec
+++ b/maintenance/mod_ngobjweb_suse92.spec
@@ -12,7 +12,7 @@ License:      LGPL
 URL:          http://sope.opengroupware.org/
 Group:        Development/Libraries
 AutoReqProv:  off
-Requires:     %{ngobjweb_requires} ogo-environment
+Requires:     %{ngobjweb_requires}
 Source:       %{mod_ngobjweb_source}
 Prefix:       %{mod_ngobjweb_prefix}
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -62,7 +62,7 @@ if [ $1 = 0 ]; then
 fi
 
 # ****************************** trigger ******************************
-%triggerin -- ogo-webui-app
+%triggerin -- ogo-webui-app, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo webui
 #
@@ -85,7 +85,7 @@ Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 " >%{apache_conf_dir}/ogo-webui.conf
 fi
 
-%triggerin -- ogo-xmlrpcd
+%triggerin -- ogo-xmlrpcd, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo XMLRPCd via http
 #
@@ -99,7 +99,7 @@ echo "# configuration needed to access the OGo XMLRPCd via http
 " >%{apache_conf_dir}/ogo-xmlrpcd.conf
 fi
 
-%triggerin -- ogo-zidestore
+%triggerin -- ogo-zidestore, ogoall
 if [ $2 = 1 ]; then
 echo "# configuration needed to access the OGo ZideStore via http
 #
@@ -113,21 +113,21 @@ echo "# configuration needed to access the OGo ZideStore via http
 " >%{apache_conf_dir}/ogo-zidestore.conf
 fi
 
-%triggerun -- ogo-webui-app
+%triggerun -- ogo-webui-app, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-webui.conf ]; then
     rm -f %{apache_conf_dir}/ogo-webui.conf
   fi
 fi
 
-%triggerun -- ogo-xmlrpcd
+%triggerun -- ogo-xmlrpcd, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-xmlrpcd.conf ]; then
     rm -f %{apache_conf_dir}/ogo-xmlrpcd.conf
   fi
 fi
 
-%triggerun -- ogo-zidestore
+%triggerun -- ogo-zidestore, ogoall
 if [ $2 = 0 ]; then
   if [ -f %{apache_conf_dir}/ogo-zidestore.conf ]; then
     rm -f %{apache_conf_dir}/ogo-zidestore.conf
@@ -149,6 +149,9 @@ rm -fr ${RPM_BUILD_ROOT}
 
 # ********************************* changelog *************************
 %changelog
+* Tue Mar 01 2005 Frank Reppin <frank@opengroupware.org>
+- drop dependency on ogo-environment
+- allow triggers on ogoall package
 * Sat Feb 19 2005 Frank Reppin <frank@opengroupware.org>
 - replaced common vars with 2 new macros (will make editing safer)
 - revisited last commit regarding OGo Bug #1254 and decided