Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29619
Modified Files:
Tag: SQL_2-18
MonetDB-SQL.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/sql/vertoo.config,v
retrieving revision 1.13.2.2
retrieving revision 1.13.2.3
diff -u -d -r1.13.2.2 -r1.13.2.3
--- vertoo.config 13 Jun 2007 19:41:33 -0000 1.13.2.2
+++ vertoo.config 24 Jul 2007 17:35:48 -0000 1.13.2.3
@@ -26,18 +26,26 @@
monetdb.setVersionFormat('@normal%[rc?%rc%build:]')
monetdb.addAnchor("configure.ag", "req_monetdb_ver=%q")
+monetdb.addAnchors("MonetDB-SQL.spec.in",
+ arguments(pattern = "^BuildRequires: MonetDB-devel >= %v",
+ format = "%major.%minor"))
clients.setVersionFormat('@normal%[rc?%rc%build:]')
clients.addAnchor("configure.ag", "req_clients_ver=%q")
+clients.addAnchors("MonetDB-SQL.spec.in",
+ arguments(pattern = "^BuildRequires: MonetDB-client-devel
>= %v",
+ format = "%major.%minor"))
monetdb4.setVersionFormat('@normal%[rc?%rc%build:]')
monetdb4.addAnchor("configure.ag", "req_monetdb4_ver=%q")
-monetdb4.addAnchor("MonetDB-SQL.pc.in", "Requires: MonetDB >= %v")
+monetdb4.addAnchor("MonetDB-SQL.pc.in", "^Requires: MonetDB >= %v")
monetdb4.addAnchors("NT/MonetDB4-SQL/MonetDB4-Installer.vdproj",
arguments(pattern = "\"ProductVersion\" = \"8:%v\"",
format = '@normal'))
monetdb4.addAnchors("MonetDB-SQL.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"))
monetdb5.setVersionFormat('@normal%[rc?%rc%build:]')
@@ -46,7 +54,9 @@
arguments(pattern = "\"ProductVersion\" = \"8:%v\"",
format = '@normal'))
monetdb5.addAnchors("MonetDB-SQL.spec.in",
- arguments(pattern = "Requires: MonetDB5-server >= %v",
+ arguments(pattern = "^Requires: MonetDB5-server >= %v",
+ format = "%major.%minor"),
+ arguments(pattern = "^BuildRequires: MonetDB5-server-devel
>= %v",
format = "%major.%minor"))
#jdbc.setVersionFormat('%major.%minor (%suffix)')
Index: MonetDB-SQL.spec.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.spec.in,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -d -r1.39.2.2 -r1.39.2.3
--- MonetDB-SQL.spec.in 13 Jun 2007 19:41:32 -0000 1.39.2.2
+++ MonetDB-SQL.spec.in 24 Jul 2007 17:35:46 -0000 1.39.2.3
@@ -13,14 +13,20 @@
BuildRoot: /var/tmp/%{name}-root
Packager: Niels Nes <[EMAIL PROTECTED]>
License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-Requires: python
%{!?_with_python: %{!?_without_python: %define _with_python --with-python}}
%{!?_with_monetdb4: %{!?_without_monetdb4: %define _with_monetdb4
--with-monetdb4}}
%{!?_with_monetdb5: %{!?_without_monetdb5: %define _with_monetdb5
--with-monetdb5}}
%{!?buildsystem: %define buildsystem 0}
%if !%{?buildsystem}
-BuildRequires: MonetDB-devel, MonetDB-client-devel
+BuildRequires: MonetDB-devel >= 1.18
+BuildRequires: MonetDB-client-devel >= 1.18
+%endif
+%if %{?_with_python:1}%{!?_with_python:0}
+Requires: python = @PYTHON_VERSION@
+%if !%{?buildsystem}
+BuildRequires: python, python-devel = @PYTHON_VERSION@, swig
+%endif
%endif
%define comp_cc @CC@
@@ -38,25 +44,37 @@
%package server4
Summary: MonetDB4 SQL server modules
Group: System
+Requires: MonetDB4-server >= 4.18
+%if !%{?buildsystem}
+BuildRequires: MonetDB4-server-devel >= 4.18
+%endif
%description server4
Add the MonetDB4 SQL server module description here
-Requires: MonetDB4-server >= 4.18
%endif
%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
%package server5
Summary: MonetDB5 SQL server modules
Group: System
+Requires: MonetDB5-server >= 5.0
+%if !%{?buildsystem}
+BuildRequires: MonetDB5-server-devel >= 5.0
+%endif
%description server5
Add the MonetDB5 SQL server module description here
-Requires: MonetDB5-server >= 5.0
%endif
-%package devel
-Summary: MonetDB SQL development package
-Group: System
+# %package devel
+# Summary: MonetDB SQL development package
+# Group: System
+# %if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
+# Requires: %{name}-server4
+# %else
+# Requires: %{name}-server5
+# %endif
+# Requires: MonetDB-devel
%description
MonetDB is a database management system that is developed from a
@@ -64,14 +82,8 @@
automatic index management, extensibility of data types and search
accellerators, SQL- and XML- frontends.
-%description devel
-Add the MonetDB devel description here
-%if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
-Requires: %{name}-server4
-%else
-Requires: %{name}-server5
-%endif
-Requires: MonetDB-devel
+# %description devel
+# Add the MonetDB devel description here
%prep
rm -rf $RPM_BUILD_ROOT
@@ -138,6 +150,6 @@
%{_libdir}/MonetDB5/*.mal
%endif
-%files devel
-%defattr(-,root,root)
-%{_libdir}/pkgconfig/MonetDB-SQL.pc
+# %files devel
+# %defattr(-,root,root)
+# %{_libdir}/pkgconfig/MonetDB-SQL.pc
-------------------------------------------------------------------------
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
