From: frank <frank@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Thu, 14 Oct 2004 10:32:28 +0000 (+0000)
Subject: added new macro -> %dist_suffix to honor builds on Mandrake flavours
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e91aa9f392b7e941e40e4b04ff23d41059b59589;p=sope

added new macro -> %dist_suffix to honor builds on Mandrake flavours
(defaults to %{nil} on non mdk builds ofcourse) and fixed location
of mod_ngobjweb.so (will go into the appropr. apache dir soon).


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

diff --git a/maintenance/mod_ngobjweb_fedora.spec b/maintenance/mod_ngobjweb_fedora.spec
index 027c015d..bcf083af 100755
--- a/maintenance/mod_ngobjweb_fedora.spec
+++ b/maintenance/mod_ngobjweb_fedora.spec
@@ -1,7 +1,7 @@
 Summary:		mod_ngobjweb apache module
 Name:			mod_ngobjweb
 Version:		%{mod_ngobjweb_version}
-Release:		%{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}
+Release:		%{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
 Vendor:			OpenGroupware.org
 Packager:		Frank Reppin <frank@opengroupware.org>	
 License:		LGPL
@@ -37,9 +37,9 @@ echo "#this file contains the apache/httpd configuration for OpenGroupware.org
 #\`include OGo.conf\`
 #(or copy it into the dir where additonal configs end up)
 #
-LoadModule ngobjweb_module %{_var}/lib/opengroupware.org/mod_ngobjweb.so
+LoadModule ngobjweb_module %{prefix}/lib/sope-%{sope_major_version}.%{sope_minor_version}/mod_ngobjweb.so
 #
-Alias /OpenGroupware10a.woa/WebServerResources/ /usr/local/share/opengroupware.org-1.0a/www/
+Alias /OpenGroupware10a.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.0a/www/
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 <LocationMatch "^/OpenGroupware*">
diff --git a/maintenance/mod_ngobjweb_suse82.spec b/maintenance/mod_ngobjweb_suse82.spec
index 716047ce..1c59ad20 100755
--- a/maintenance/mod_ngobjweb_suse82.spec
+++ b/maintenance/mod_ngobjweb_suse82.spec
@@ -1,7 +1,7 @@
 Summary:		mod_ngobjweb apache module
 Name:			mod_ngobjweb
 Version:		%{mod_ngobjweb_version}
-Release:		%{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}
+Release:		%{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
 Vendor:			OpenGroupware.org
 Packager:		Frank Reppin <frank@opengroupware.org>	
 License:		LGPL
@@ -37,9 +37,9 @@ echo "#this file contains the apache/httpd configuration for OpenGroupware.org
 #\`include OGo.conf\`
 #(or copy it into the dir where additonal configs end up)
 #
-LoadModule ngobjweb_module %{_var}/lib/opengroupware.org/mod_ngobjweb.so
+LoadModule ngobjweb_module %{prefix}/lib/sope-%{sope_major_version}.%{sope_minor_version}/mod_ngobjweb.so
 #
-Alias /OpenGroupware10a.woa/WebServerResources/ /usr/local/share/opengroupware.org-1.0a/www/
+Alias /OpenGroupware10a.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.0a/www/
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 <LocationMatch "^/OpenGroupware*">
diff --git a/maintenance/mod_ngobjweb_suse91.spec b/maintenance/mod_ngobjweb_suse91.spec
index 716047ce..1c59ad20 100755
--- a/maintenance/mod_ngobjweb_suse91.spec
+++ b/maintenance/mod_ngobjweb_suse91.spec
@@ -1,7 +1,7 @@
 Summary:		mod_ngobjweb apache module
 Name:			mod_ngobjweb
 Version:		%{mod_ngobjweb_version}
-Release:		%{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}
+Release:		%{mod_ngobjweb_release}.%{mod_ngobjweb_buildcount}%{dist_suffix}
 Vendor:			OpenGroupware.org
 Packager:		Frank Reppin <frank@opengroupware.org>	
 License:		LGPL
@@ -37,9 +37,9 @@ echo "#this file contains the apache/httpd configuration for OpenGroupware.org
 #\`include OGo.conf\`
 #(or copy it into the dir where additonal configs end up)
 #
-LoadModule ngobjweb_module %{_var}/lib/opengroupware.org/mod_ngobjweb.so
+LoadModule ngobjweb_module %{prefix}/lib/sope-%{sope_major_version}.%{sope_minor_version}/mod_ngobjweb.so
 #
-Alias /OpenGroupware10a.woa/WebServerResources/ /usr/local/share/opengroupware.org-1.0a/www/
+Alias /OpenGroupware10a.woa/WebServerResources/ %{prefix}/share/opengroupware.org-1.0a/www/
 Alias /ArticleImages %{_var}/lib/opengroupware.org/news
 #
 <LocationMatch "^/OpenGroupware*">