Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15165
Modified Files:
rpm.mk.in
Log Message:
Added more precise Requires tags.
When building an RPM not using "make rpm", use more precise BuildRequires tags.
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/sql/rpm.mk.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- rpm.mk.in 23 Jun 2007 07:22:25 -0000 1.13
+++ rpm.mk.in 25 Jun 2007 15:37:31 -0000 1.14
@@ -30,8 +30,7 @@
$(top_builddir)/$(distdir).tar.gz:
$(MAKE) $(AM_MAKEFLAGS) dist
-rpm: MonetDB-SQL.spec $(top_builddir)/$(distdir).tar.gz
-
+$(rpmtopdir)/rpmmacros:
mkdir -p $(rpmtopdir)/RPMS
mkdir -p $(rpmtopdir)/SRPMS
mkdir -p $(rpmtopdir)/SPECS
@@ -46,9 +45,15 @@
echo "%rpmcflags -O2 " >> $(rpmtopdir)/rpmmacros
echo "#%top_builddirroot %{_topdir}/INSTALL/" >> $(rpmtopdir)/rpmmacros
- $(RPMBUILD) ${python} ${monetdb4} ${monetdb5} --define="buildsystem 1"
--target `uname -m` --rcfile $(rpmtopdir)/rpmrc -ta
$(top_builddir)/$(distdir).tar.gz
+rpm: MonetDB-SQL.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
+ $(RPMBUILD) -ta ${python} ${monetdb4} ${monetdb5} --define="buildsystem
1" --target `uname -m` --rcfile $(rpmtopdir)/rpmrc
$(top_builddir)/$(distdir).tar.gz
for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
done
-
rm -rf $(rpmtopdir)/BUILD
+
+srpm: MonetDB-SQL.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
+ $(RPMBUILD) -ts ${python} ${monetdb4} ${monetdb5} --define="buildsystem
1" --target `uname -m` --rcfile $(rpmtopdir)/rpmrc
$(top_builddir)/$(distdir).tar.gz
+ for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
+ mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
+ done
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
