Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14944
Modified Files:
MonetDB-SQL.spec.in
Log Message:
Added more precise Requires tags.
When building an RPM not using "make rpm", use more precise BuildRequires tags.
Index: MonetDB-SQL.spec.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.spec.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- MonetDB-SQL.spec.in 15 Jun 2007 14:32:41 -0000 1.41
+++ MonetDB-SQL.spec.in 25 Jun 2007 15:37:23 -0000 1.42
@@ -13,14 +13,14 @@
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
%define comp_cc @CC@
@@ -41,7 +41,10 @@
%description server4
Add the MonetDB4 SQL server module description here
-Requires: MonetDB4-server >= 4.18
+Requires: MonetDB4-server = 4.18
+%if !%{?buildsystem}
+BuildRequires: MonetDB4-server-devel = 4.18
+%endif
%endif
%if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
@@ -51,12 +54,15 @@
%description server5
Add the MonetDB5 SQL server module description here
-Requires: MonetDB5-server >= 5.0
+Requires: MonetDB5-server = 5.0
+%if !%{?buildsystem}
+BuildRequires: MonetDB5-server-devel = 5.0
+%endif
%endif
-%package devel
-Summary: MonetDB SQL development package
-Group: System
+# %package devel
+# Summary: MonetDB SQL development package
+# Group: System
%description
MonetDB is a database management system that is developed from a
@@ -64,14 +70,14 @@
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
+# %if %{?_with_monetdb4:1}%{!?_with_monetdb4:0}
+# Requires: %{name}-server4 = 4.18
+# %else
+# Requires: %{name}-server5 = 5.0
+# %endif
+# Requires: MonetDB-devel = 1.18
%prep
rm -rf $RPM_BUILD_ROOT
@@ -103,8 +109,9 @@
#find $RPM_BUILD_ROOT -name .incs.in | xargs rm
rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB4/Tests/*
-rm -rf $RPM_BUILD_ROOT%{_libdir}/python*
+rm -rf $RPM_BUILD_ROOT%{prefix}/@PYTHON_LIBDIR@
rm -rf $RPM_BUILD_ROOT%{prefix}/include/sql
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/MonetDB-SQL.pc
# Fixes monet config script
#perl -p -i -e "s|$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{prefix}/bin/monet_config
@@ -138,6 +145,11 @@
%{_libdir}/MonetDB5/*.mal
%endif
-%files devel
-%defattr(-,root,root)
-%{_libdir}/pkgconfig/MonetDB-SQL.pc
+# %files devel
+# %defattr(-,root,root)
+# %{_libdir}/pkgconfig/MonetDB-SQL.pc
+
+%changelog
+* Mon Jun 25 2007 Sjoerd Mullender <[EMAIL PROTECTED]> - @[EMAIL PROTECTED]
+- Built.
+
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
