Update of /cvsroot/monetdb/pathfinder
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29583
Modified Files:
Tag: XQuery_0-18
MonetDB-XQuery.spec.in vertoo.config
Log Message:
Fix spec files so that they contain the correct Requires and BuildRequires tags
(and in the correct place).
Index: vertoo.config
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/vertoo.config,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- vertoo.config 13 Jun 2007 19:41:45 -0000 1.6.2.2
+++ vertoo.config 24 Jul 2007 17:35:36 -0000 1.6.2.3
@@ -25,6 +25,11 @@
monetdb.setVersionFormat('@normal%[rc?%rc%build:]')
monetdb.addAnchor("configure.ag", "req_monetdb_ver=%q")
+monetdb.addAnchors("MonetDB-XQuery.spec.in",
+ arguments(pattern = "^BuildRequires: MonetDB-devel >= %v",
+ format = "%major.%minor"),
+ arguments(pattern = "^Requires: MonetDB-devel >= %v",
+ format = "%major.%minor"))
clients.setVersionFormat('@normal%[rc?%rc%build:]')
clients.addAnchor("configure.ag", "req_clients_ver=%q")
@@ -35,7 +40,11 @@
#monetdb4.addAnchor("MonetDB-XQuery.pc.in", "Requires: MonetDB >= %v")
monetdb4.addAnchor("runtime/xrpc/admin/title.html", ">MonetDB %v<")
monetdb4.addAnchors("MonetDB-XQuery.spec.in",
- arguments(pattern = "Requires: MonetDB4-server >= %v",
+ arguments(pattern = "^Requires: MonetDB4-server >= %v",
+ format = "%major.%minor"),
+ arguments(pattern = "^BuildRequires: MonetDB4-server-devel
>= %v",
+ format = "%major.%minor"),
+ arguments(pattern = "^Requires: MonetDB4-server-devel >=
%v",
format = "%major.%minor"))
monetdb5.setVersionFormat('@normal%[rc?%rc%build:]')
Index: MonetDB-XQuery.spec.in
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/MonetDB-XQuery.spec.in,v
retrieving revision 1.21.2.2
retrieving revision 1.21.2.3
diff -u -d -r1.21.2.2 -r1.21.2.3
--- MonetDB-XQuery.spec.in 14 Jun 2007 13:15:54 -0000 1.21.2.2
+++ MonetDB-XQuery.spec.in 24 Jul 2007 17:35:35 -0000 1.21.2.3
@@ -13,11 +13,14 @@
BuildRoot: /var/tmp/%{name}-root
Packager: Niels Nes <[EMAIL PROTECTED]>
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+Requires: MonetDB4-server >= 4.18
%{!?buildsystem: %define buildsystem 0}
%if !%{?buildsystem}
-BuildRequires: MonetDB-devel libxml2-devel
+BuildRequires: MonetDB-devel >= 1.18
+BuildRequires: MonetDB4-server-devel >= 4.18
%endif
+BuildRequires: libxml2-devel
%define comp_cc @CC@
@@ -39,12 +42,12 @@
%package devel
Summary: MonetDB XQuery development package
Group: System
-Requires: MonetDB4-server >= 4.18
+Requires: %{name}-server
+Requires: MonetDB-devel >= 1.18
+Requires: MonetDB4-server-devel >= 4.18
%description devel
Add the MonetDB devel description here
-Requires: %{name}-server
-Requires: MonetDB-devel
%prep
rm -rf $RPM_BUILD_ROOT
-------------------------------------------------------------------------
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
