Update of /cvsroot/monetdb/pathfinder
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1847
Modified Files:
Tag: XQuery_0-18
MonetDB-XQuery.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-XQuery.spec.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/MonetDB-XQuery.spec.in,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -u -d -r1.21.2.4 -r1.21.2.5
--- MonetDB-XQuery.spec.in 25 Jul 2007 13:36:07 -0000 1.21.2.4
+++ MonetDB-XQuery.spec.in 26 Jul 2007 14:26:07 -0000 1.21.2.5
@@ -40,7 +40,7 @@
%package devel
Summary: MonetDB XQuery development package
Group: System
-Requires: %{name}-server
+Requires: %{name} = %{version}-%{release}
Requires: MonetDB-devel >= 1.18
Requires: MonetDB4-server-devel >= 4.18
@@ -96,3 +96,8 @@
%files devel
%defattr(-,root,root)
%{prefix}/include/pathfinder/*.h
+
+%changelog
+* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL PROTECTED]
+- Built.
+
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/rpm.mk.in,v
retrieving revision 1.9.4.2
retrieving revision 1.9.4.3
diff -u -d -r1.9.4.2 -r1.9.4.3
--- rpm.mk.in 25 Jul 2007 13:36:07 -0000 1.9.4.2
+++ rpm.mk.in 26 Jul 2007 14:26:07 -0000 1.9.4.3
@@ -43,7 +43,7 @@
echo "#%top_builddirroot %{_topdir}/INSTALL/" >> $(rpmtopdir)/rpmmacros
rpm: MonetDB-XQuery.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --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`
--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
@@ -51,7 +51,7 @@
rm -rf $(rpmtopdir)/BUILD
srpm: MonetDB-XQuery.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) --define="buildsystem 1" --rcfile $(rpmtopdir)/rpmrc -ts
$(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) --rcfile $(rpmtopdir)/rpmrc -ts --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-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
