Changeset: 29e53dc6fb6a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29e53dc6fb6a
Modified Files:
MonetDB.spec
Branch: default
Log Message:
Fedora packaging guidelines suggest adding architecture to dependencies.
diffs (171 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -160,8 +160,8 @@ more client packages.
%package devel
Summary: MonetDB development files
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-stream-devel = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-stream-devel%{?_isa} = %{version}-%{release}
Requires: libatomic_ops-devel
%description devel
@@ -201,7 +201,7 @@ various other components.
%package stream-devel
Summary: MonetDB stream library
Group: Applications/Databases
-Requires: %{name}-stream = %{version}-%{release}
+Requires: %{name}-stream%{?_isa} = %{version}-%{release}
Requires: bzip2-devel
Requires: libcurl-devel
Requires: zlib-devel
@@ -249,7 +249,7 @@ MonetDB, you will very likely need this
%package client-tools
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
-Requires: %{name}-client = %{version}-%{release}
+Requires: %{name}-client%{?_isa} = %{version}-%{release}
%description client-tools
MonetDB is a database management system that is developed from a
@@ -269,8 +269,8 @@ tools can be used to monitor the MonetDB
%package client-devel
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
-Requires: %{name}-client = %{version}-%{release}
-Requires: %{name}-stream-devel = %{version}-%{release}
+Requires: %{name}-client%{?_isa} = %{version}-%{release}
+Requires: %{name}-stream-devel%{?_isa} = %{version}-%{release}
Requires: openssl-devel
%description client-devel
@@ -292,7 +292,7 @@ This package contains the files needed t
%package client-odbc
Summary: MonetDB ODBC driver
Group: Applications/Databases
-Requires: %{name}-client = %{version}-%{release}
+Requires: %{name}-client%{?_isa} = %{version}-%{release}
Requires(pre): unixODBC
%description client-odbc
@@ -349,7 +349,6 @@ program.
%package client-perl
Summary: MonetDB perl interface
Group: Applications/Databases
-Requires: %{name}-client = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: perl(DBI)
Requires: perl(Digest::SHA)
@@ -428,12 +427,12 @@ This package contains the activerecord a
%package client-tests
Summary: MonetDB Client tests package
Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
-Requires: %{name}-client = %{version}-%{release}
-Requires: %{name}-client-odbc = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires: %{name}-client%{?_isa} = %{version}-%{release}
+Requires: %{name}-client-odbc%{?_isa} = %{version}-%{release}
Requires: %{name}-client-perl = %{version}-%{release}
Requires: %{name}-client-php = %{version}-%{release}
-Requires: %{name}-SQL-server5 = %{version}-%{release}
+Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
Requires: python-monetdb = %{version}-%{release}
%description client-tests
@@ -466,7 +465,7 @@ developer.
%package geom-MonetDB5
Summary: MonetDB5 SQL GIS support module
Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-geom
Obsoletes: %{name}-geom-devel
@@ -490,7 +489,7 @@ extensions for %{name}-SQL-server5.
%package gsl-MonetDB5
Summary: MonetDB5 SQL interface to the gsl library
Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
%description gsl-MonetDB5
MonetDB is a database management system that is developed from a
@@ -512,7 +511,7 @@ numerical analysis (gsl).
%package bam-MonetDB5
Summary: MonetDB5 SQL interface to the bam library
Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
%description bam-MonetDB5
MonetDB is a database management system that is developed from a
@@ -535,7 +534,7 @@ version of Sequence Alignment/Map) data.
%package R
Summary: Integration of MonetDB and R, allowing use of R from within SQL
Group: Applications/Databases
-Requires: MonetDB-SQL-server5 = %{version}-%{release}
+Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
%description R
MonetDB is a database management system that is developed from a
@@ -561,7 +560,7 @@ install it.
%package cfitsio
Summary: MonetDB: Add on module that provides support for FITS files
Group: Applications/Databases
-Requires: MonetDB-SQL-server5 = %{version}-%{release}
+Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
%description cfitsio
MonetDB is a database management system that is developed from a
@@ -584,7 +583,7 @@ format.
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
Requires(pre): shadow-utils
-Requires: %{name}-client = %{version}-%{release}
+Requires: %{name}-client%{?_isa} = %{version}-%{release}
Obsoletes: MonetDB5-server-rdf
%description -n MonetDB5-server
@@ -669,7 +668,7 @@ fi
%package -n MonetDB5-server-hugeint
Summary: MonetDB - 128-bit integer support for MonetDB5-server
Group: Application/Databases
-Requires: MonetDB5-server
+Requires: MonetDB5-server%{?_isa}
%description -n MonetDB5-server-hugeint
MonetDB is a database management system that is developed from a
@@ -689,8 +688,8 @@ MonetDB5-server component.
%package -n MonetDB5-server-devel
Summary: MonetDB development files
Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
-Requires: %{name}-devel = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description -n MonetDB5-server-devel
MonetDB is a database management system that is developed from a
@@ -711,7 +710,7 @@ used from the MAL level.
%package SQL-server5
Summary: MonetDB5 SQL server modules
Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
# RHEL >= 7, and all current Fedora
Requires: %{_bindir}/systemd-tmpfiles
@@ -777,8 +776,8 @@ systemd-tmpfiles --create %{_sysconfdir}
%package SQL-server5-hugeint
Summary: MonetDB5 128 bit integer (hugeint) support for SQL
Group: Applications/Databases
-Requires: MonetDB5-server-hugeint = %{version}-%{release}
-Requires: MonetDB-SQL-server5 = %{version}-%{release}
+Requires: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
+Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
%description SQL-server5-hugeint
MonetDB is a database management system that is developed from a
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
