From fd730b4d9b76a7140669940571d905ad766a1d93 Mon Sep 17 00:00:00 2001 From: Claudio Rodrigo Pereyra Diaz Date: Jul 30 2015 18:05:34 +0000 Subject: Fix licese and remove defines for EPEL --- diff --git a/mysql-connector-net.spec b/mysql-connector-net.spec index ca0f9ae..892999e 100644 --- a/mysql-connector-net.spec +++ b/mysql-connector-net.spec @@ -1,20 +1,13 @@ %global debug_package %{nil} -%if 0%{?el6} -%global mono_arches %ix86 x86_64 ia64 %{arm} sparcv9 alpha s390x ppc ppc64 -%endif -%if 0%{?rhel}%{?el6}%{?el7} -# see https://fedorahosted.org/fpc/ticket/395 -%global _monodir %{_prefix}/lib/mono -%global _monogacdir %{_monodir}/gac -%endif Name: mysql-connector-net Version: 6.9.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Mono ADO.NET driver for MySQL Group: Development/Languages -License: GPLv2 +#MySql.Data use zlib code that are licensed under BSD +License: GPLv2 or BSD URL: http://dev.mysql.com/downloads/connector/net/ Source0: http://cdn.mysql.com/Downloads/Connector-Net/%{name}-%{version}-src.zip Source1: mysql-connector-net.pc @@ -32,7 +25,7 @@ Connector/Net is a fully-managed ADO.NET driver for MySQL. %package devel Summary: Development files for %{name} Group: Development/Languages -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig %description devel @@ -41,6 +34,8 @@ Development files for %{name}. %prep %setup -q -c dos2unix Source/MySql.Data/MySql.Data.csproj +dos2unix CHANGES +dos2unix README %patch0 -p1 %build @@ -60,12 +55,19 @@ gacutil -i %{buildroot}%{_monodir}/mysql-connector-net/MySql.Data.dll -f -packag %doc CHANGES README %license COPYING %{_monogacdir}/* +%dir %{_monodir}/mysql-connector-net %{_monodir}/mysql-connector-net/* + %files devel %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jul 30 2015 Claudio Rodrigo Pereyra Diaz - 6.9.6-4 +- Own directory mysql-connector-net +- Remove define for EPEL +- Fix license + * Mon May 18 2015 Claudio Rodrigo Pereyra Diaz - 6.9.6-3 - Use global insted define