Update of /cvsroot/monetdb/pathfinder
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22207
Modified Files:
Tag: M5XQ
rpm.mk.in
Log Message:
propagated changes of Thursday Apr 22 2010 - Friday Apr 23 2010
from the XQFT branch to the M5XQ branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/04/22 - sjoerd: rpm.mk.in,1.28.14.2
propagated changes of Wednesday Apr 21 2010 - Thursday Apr 22 2010
from the development trunk to the XQFT branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2010/04/21 - sjoerd: rpm.mk.in,1.30
Ported to Fedora 13: there is no macrofiles line in the output of rpmbuild
--showrc.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/rpm.mk.in,v
retrieving revision 1.28.4.1
retrieving revision 1.28.4.2
diff -u -d -r1.28.4.1 -r1.28.4.2
--- rpm.mk.in 7 Jan 2010 16:53:32 -0000 1.28.4.1
+++ rpm.mk.in 23 Apr 2010 10:59:33 -0000 1.28.4.2
@@ -27,7 +27,7 @@
rpmtopdir = $(shell cd $(top_builddir) && pwd)/rpmbuild
-rpmmacros = `rpmbuild --showrc | sed -n 's/macrofiles *:
*//p'`:$(rpmtopdir)/rpmmacros
+RPMBUILDARGS = --define="_tmppath /tmp" --define="_topdir $(rpmtopdir)"
--define="tmpdir %{_tmppath}" --define="rpmcflags -O2 " --define="dist
_...@linux_dist@" --define="packager MonetDB Database System
<[email protected]>" --define="o...@oids@ 1"
$(top_builddir)/$(distdir).tar.gz:
$(MAKE) $(AM_MAKEFLAGS) dist
@@ -39,26 +39,15 @@
mkdir -p $(rpmtopdir)/BUILD
mkdir -p $(rpmtopdir)/INSTALL
- echo "macrofiles: $(rpmmacros)" > $(rpmtopdir)/rpmrc
-
- echo "%_tmppath /tmp" > $(rpmtopdir)/rpmmacros
- echo "%_topdir $(rpmtopdir)" >> $(rpmtopdir)/rpmmacros
- echo "%tmpdir %{_tmppath}" >> $(rpmtopdir)/rpmmacros
- echo "%rpmcflags -O2 " >> $(rpmtopdir)/rpmmacros
- echo "#%top_builddirroot %{_topdir}/INSTALL/" >> $(rpmtopdir)/rpmmacros
- echo "%dist _...@linux_dist@" >>
$(rpmtopdir)/rpmmacros
- echo "%packager MonetDB Database System <[email protected]>" >>
$(rpmtopdir)/rpmmacros
- if test "@oids@" -eq 32; then echo "%oid32 1" >>
$(rpmtopdir)/rpmmacros; fi
-
rpm: MonetDB-XQuery.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --macros "$(rpmmacros)" --rcfile $(rpmtopdir)/rpmrc -ta
--target `uname -m` --define="buildsystem 1" --define="comp_cc @CC@"
$(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) $(RPMBUILDARGS) -ta --target `uname -m`
--define="buildsystem 1" --define="comp_cc @CC@"
$(top_builddir)/$(distdir).tar.gz
for i in $(rpmtopdir)/SRPMS/*...@linux_dist@....@oids@* ; do \
mv "$$i" "`echo "$$i" | sed 's|_...@linux_dist@....@oids@||'`"
; \
done
rm -rf $(rpmtopdir)/BUILD
srpm: MonetDB-XQuery.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --macros "$(rpmmacros)" --rcfile $(rpmtopdir)/rpmrc -ts
--define="buildsystem 1" $(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) $(RPMBUILDARGS) -ts --define="buildsystem 1"
$(top_builddir)/$(distdir).tar.gz
for i in $(rpmtopdir)/SRPMS/*...@linux_dist@....@oids@* ; do \
mv "$$i" "`echo "$$i" | sed 's|_...@linux_dist@....@oids@||'`"
; \
done
------------------------------------------------------------------------------
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
