Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2427
Modified Files:
MonetDB-SQL.spec.in rpm.mk.in
Log Message:
It seems order matters for the rpmbuild command.
Index: MonetDB-SQL.spec.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.spec.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- MonetDB-SQL.spec.in 25 Jul 2007 20:46:50 -0000 1.47
+++ MonetDB-SQL.spec.in 26 Jul 2007 14:27:34 -0000 1.48
@@ -87,6 +87,12 @@
# %package devel
# Summary: MonetDB SQL development package
# Group: System
+# %if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
+# Requires: %{name}-server4 = 4.18
+# %else
+# Requires: %{name}-server5 = 5.0
+# %endif
+# Requires: MonetDB-devel = 1.18
%description
MonetDB is a database management system that is developed from a
@@ -96,12 +102,6 @@
# %description devel
# Add the MonetDB devel description here
-# %if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
-# Requires: %{name}-server4 = 4.18
-# %else
-# Requires: %{name}-server5 = 5.0
-# %endif
-# Requires: MonetDB-devel = 1.18
%prep
rm -rf $RPM_BUILD_ROOT
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/sql/rpm.mk.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- rpm.mk.in 25 Jul 2007 13:43:47 -0000 1.15
+++ rpm.mk.in 26 Jul 2007 14:27:34 -0000 1.16
@@ -46,14 +46,14 @@
echo "#%top_builddirroot %{_topdir}/INSTALL/" >> $(rpmtopdir)/rpmmacros
rpm: MonetDB-SQL.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) -ta ${python} ${monetdb4} ${monetdb5} --define="buildsystem
1" --define="comp_cc @CC@" --target `uname -m` --rcfile $(rpmtopdir)/rpmrc
$(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ta --target `uname -m`
${python} ${monetdb4} ${monetdb5} --define="buildsystem 1" --define="comp_cc
@CC@" $(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
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts ${python} ${monetdb4}
${monetdb5} --define="buildsystem 1" $(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: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
