Update of /cvsroot/monetdb/pathfinder
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5047
Modified Files:
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.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- vertoo.config 15 Jul 2007 20:28:54 -0000 1.12
+++ vertoo.config 24 Jul 2007 14:40:26 -0000 1.13
@@ -27,9 +27,9 @@
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",
+ arguments(pattern = "^BuildRequires: MonetDB-devel >= %v",
format = "%major.%minor"),
- arguments(pattern = "^Requires: MonetDB-devel = %v",
+ arguments(pattern = "^Requires: MonetDB-devel >= %v",
format = "%major.%minor"))
clients.setVersionFormat('@normal%[rc?%rc%build:]')
@@ -38,14 +38,14 @@
monetdb4.setVersionFormat('@normal%[rc?%rc%build:]')
monetdb4.addAnchor("configure.ag", "req_monetdb4_ver=%q")
monetdb4.addAnchor("INSTALL", "It depends on a version that is at least %v.")
-#monetdb4.addAnchor("MonetDB-XQuery.pc.in", "Requires: MonetDB >= %v")
+#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",
+ arguments(pattern = "^BuildRequires: MonetDB4-server-devel
>= %v",
format = "%major.%minor"),
- arguments(pattern = "^Requires: MonetDB4-server-devel =
%v",
+ 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.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- MonetDB-XQuery.spec.in 15 Jul 2007 20:47:32 -0000 1.25
+++ MonetDB-XQuery.spec.in 24 Jul 2007 14:40:24 -0000 1.26
@@ -13,15 +13,19 @@
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
+# ^^^^
+# Maintained via vertoo. Please don't modify by hand!
+# Contact [EMAIL PROTECTED] for details and/or assistance.
%{!?buildsystem: %define buildsystem 0}
%if !%{?buildsystem}
-BuildRequires: MonetDB-devel = 1.18
-# ^^^^
+BuildRequires: MonetDB-devel >= 1.18
+# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
-BuildRequires: MonetDB4-server-devel = 4.18
-# ^^^^
+BuildRequires: MonetDB4-server-devel >= 4.18
+# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
%endif
@@ -47,23 +51,19 @@
%package devel
Summary: MonetDB XQuery development package
Group: System
-Requires: MonetDB4-server = 4.18
-# ^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact [EMAIL PROTECTED] for details and/or assistance.
-
-%description devel
-Add the MonetDB devel description here
Requires: %{name} = %{version}-%{release}
-Requires: MonetDB-devel = 1.18
-# ^^^^
+Requires: MonetDB-devel >= 1.18
+# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
-Requires: MonetDB4-server-devel = 4.18
-# ^^^^
+Requires: MonetDB4-server-devel >= 4.18
+# ^^^^
# Maintained via vertoo. Please don't modify by hand!
# Contact [EMAIL PROTECTED] for details and/or assistance.
+%description devel
+Add the MonetDB devel description here
+
%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
