From: frank <frank@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Tue, 28 Sep 2004 20:13:09 +0000 (+0000)
Subject: move more stuff into .rpmmacros ...
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24eac841202f7ac829a07e43324fccfa3ad3f815;p=sope

move more stuff into .rpmmacros ...


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

diff --git a/maintenance/mod_ngobjweb.spec b/maintenance/mod_ngobjweb.spec
index df7c59fa..096d1c8a 100755
--- a/maintenance/mod_ngobjweb.spec
+++ b/maintenance/mod_ngobjweb.spec
@@ -8,7 +8,7 @@ License:		LGPL
 URL:			http://www.softwarestudio.org/libical
 Group:			Development/Libraries
 AutoReqProv:	off
-Source:			sope-mod_ngobjweb-trunk-latest.tar.gz
+Source:			%{mod_ngobjweb_source}
 Prefix:			/usr/lib
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -21,11 +21,12 @@ rm -fr ${RPM_BUILD_ROOT}
 
 # ****************************** build ********************************
 %build
-# on fedora core
+#on redhat/fedora core
 export PATH=$PATH:/usr/sbin
-make APXS_INCLUDE_DIRS="-I/usr/include/httpd -I/usr/include/apr-0"
-# for suse
-#make APXS="/usr/sbin/apxs2" APXS_INCLUDE_DIRS="-I/usr/include/apache2"
+#fedora core
+make %{mod_ngobjweb_makeflags} APXS_INCLUDE_DIRS="-I/usr/include/httpd -I/usr/include/apr-0"
+#suse91
+#make %{mod_ngobjweb_makeflags} APXS="/usr/sbin/apxs2" APXS_INCLUDE_DIRS="-I/usr/include/apache2"
 
 # ****************************** install ******************************
 %install
diff --git a/maintenance/sope.spec b/maintenance/sope.spec
index cb819a2e..d3313b3d 100755
--- a/maintenance/sope.spec
+++ b/maintenance/sope.spec
@@ -8,7 +8,7 @@ License:		GPL
 URL:			http://www.opengroupware.org
 Group:			Development/Libraries
 AutoReqProv:	off
-Source:			sope-trunk-latest.tar.gz
+Source:			%{sope_source}
 Prefix:			/usr/local
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 BuildPreReq:	ogo-gnustep_make
@@ -187,16 +187,16 @@ rm -fr ${RPM_BUILD_ROOT}
 # ****************************** build ********************************
 %build
 source %{prefix}/OGo-GNUstep/Library/Makefiles/GNUstep.sh
-make debug=yes
+make %{sope_makeflags}
 
 # ****************************** install ******************************
 %install
 source %{prefix}/OGo-GNUstep/Library/Makefiles/GNUstep.sh
 mkdir -p ${RPM_BUILD_ROOT}%{prefix}/lib/lib
-make debug=yes INSTALL_ROOT_DIR=${RPM_BUILD_ROOT} \
-               GNUSTEP_INSTALLATION_DIR=${RPM_BUILD_ROOT}%{prefix} \
-               FHS_INSTALL_ROOT=${RPM_BUILD_ROOT}%{prefix} \
-               install
+make %{sope_makeflags} INSTALL_ROOT_DIR=${RPM_BUILD_ROOT} \
+                       GNUSTEP_INSTALLATION_DIR=${RPM_BUILD_ROOT}%{prefix} \
+                       FHS_INSTALL_ROOT=${RPM_BUILD_ROOT}%{prefix} \
+                       install
 
 rm -f ${RPM_BUILD_ROOT}%{prefix}/bin/rss2plist1
 rm -f ${RPM_BUILD_ROOT}%{prefix}/bin/rss2plist2