Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1895
Modified Files:
Tag: SQL_2-18
MonetDB-SQL.spec.in rpm.mk.in
Log Message:
It seems order matters for the rpmbuild command.
Also fixed some requirements: the stable version now looks much more like the
development version.
Index: MonetDB-SQL.spec.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.spec.in,v
retrieving revision 1.39.2.4
retrieving revision 1.39.2.5
diff -u -d -r1.39.2.4 -r1.39.2.5
--- MonetDB-SQL.spec.in 25 Jul 2007 13:36:16 -0000 1.39.2.4
+++ MonetDB-SQL.spec.in 26 Jul 2007 14:26:18 -0000 1.39.2.5
@@ -23,9 +23,9 @@
BuildRequires: MonetDB-client-devel >= 1.18
%endif
%if %{?_with_python:1}%{!?_with_python:0}
-Requires: python = @PYTHON_VERSION@
+Requires: python
%if !%{?buildsystem}
-BuildRequires: python, python-devel = @PYTHON_VERSION@, swig
+BuildRequires: python, python-devel, swig
%endif
%endif
@@ -151,3 +151,8 @@
# %files devel
# %defattr(-,root,root)
# %{_libdir}/pkgconfig/MonetDB-SQL.pc
+
+%changelog
+* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL PROTECTED]
+- Built.
+
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/sql/rpm.mk.in,v
retrieving revision 1.12.4.3
retrieving revision 1.12.4.4
diff -u -d -r1.12.4.3 -r1.12.4.4
--- rpm.mk.in 26 Jul 2007 05:21:01 -0000 1.12.4.3
+++ rpm.mk.in 26 Jul 2007 14:26:18 -0000 1.12.4.4
@@ -46,7 +46,7 @@
echo "#%top_builddirroot %{_topdir}/INSTALL/" >> $(rpmtopdir)/rpmmacros
rpm: MonetDB-SQL.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) ${python} ${monetdb4} ${monetdb5} --define="buildsystem 1"
--define="comp_cc @CC@" --target `uname -m` --rcfile $(rpmtopdir)/rpmrc -ta
$(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
@@ -54,7 +54,7 @@
rm -rf $(rpmtopdir)/BUILD
srpm: MonetDB-SQL.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) ${python} ${monetdb4} ${monetdb5} --define="buildsystem 1"
--rcfile $(rpmtopdir)/rpmrc -ts $(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
