rpms/mariadb-connector-c
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to 3.0.3 version

Browse Source
This commit is contained in:
Michal Schorm 2018-01-19 01:27:30 +01:00
parent df07f0bca8
commit 3877fa3711
4 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@
/mariadb-connector-c-2.3.2-src.tar.gz
/mariadb-connector-c-2.3.3-src.tar.gz
/mariadb-connector-c-3.0.2-src.tar.gz
/mariadb-connector-c-3.0.3-src.tar.gz

20
cmake.patch
View File

@ -1,23 +1,3 @@
--- mariadb-connector-c-3.0.2-src/cmake/install.cmake 2017-07-19 11:31:02.000000000 +0200
+++ mariadb-connector-c-3.0.2-src/cmake/install.cmake.patched 2017-07-24 18:04:45.791679206 +0200
@@ -76,11 +76,11 @@ SET(INSTALL_PLUGINDIR_DEFAULT "lib/maria
# RPM layout
#
SET(INSTALL_BINDIR_RPM "bin")
-IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") AND CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(INSTALL_LIBDIR_RPM "lib64/mariadb")
SET(INSTALL_PLUGINDIR_RPM "lib64/mariadb/plugin")
ELSE()
- SET(INSTALL_LIBDIR_RPM "lib")
+ SET(INSTALL_LIBDIR_RPM "lib/mariadb")
SET(INSTALL_PLUGINDIR_RPM "lib/mariadb/plugin")
ENDIF()
SET(INSTALL_INCLUDEDIR_RPM "include")
--- mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in 2017-07-19 11:31:02.000000000 +0200
+++ mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in_patched 2017-10-25 12:32:42.075324299 +0200
@@ -5,8 +5,8 @@

15
mariadb-connector-c.spec
View File

@ -1,8 +1,7 @@
Name: mariadb-connector-c
Version: 3.0.2
Release: 21%{?dist}
Version: 3.0.3
Release: 1%{?dist}
Summary: The MariaDB Native Client library (C driver)
Group: Applications/Databases
License: LGPLv2+
Source: https://downloads.mariadb.org/interstitial/connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz
Url: http://mariadb.org/
@ -21,7 +20,7 @@ BuildRequires: zlib-devel cmake openssl-devel
# Remote-IO plugin
BuildRequires: libcurl-devel
# Patch for "-DINSTALL_LAYOUT=RPM" and mariadb_config
# Patch for mariadb_config
Patch1: cmake.patch
%description
@ -69,6 +68,7 @@ rm -r win zlib win-iconv examples
-DINSTALL_INCLUDEDIR=%{_includedir}/mysql \
-DPLUGIN_INSTALL_DIR="%{_libdir}/mariadb/plugin"
# Causes build errors:
# -DAUTH_NATIVE=DYNAMIC
# -DCMAKE_INSTALL_PREFIX="/usr"
@ -149,12 +149,13 @@ end
# https://jira.mariadb.org/browse/CONC-232
# https://jira.mariadb.org/browse/CONC-234
# RPMLint issues from 3.0.2 release tracked on the upstream JIRA:
# https://jira.mariadb.org/browse/CONC-271
# https://jira.mariadb.org/browse/CONC-287
# https://jira.mariadb.org/browse/CONC-290
# https://jira.mariadb.org/browse/MDEV-13836
# https://jira.mariadb.org/browse/CONC-291
%changelog
* Fri Jan 19 2018 Michal Schorm <mschorm@redhat.com> - 3.0.3-1
- Rebase to 3.0.3
* Mon Nov 27 2017 Honza Horak <hhorak@redhat.com> - 3.0.2-21
- Remove unneeded dependency on xmlto

2
sources
View File

@ -1 +1 @@
SHA512 (mariadb-connector-c-3.0.2-src.tar.gz) = 215881164aae749f93b75d370815875a9b30179d14773a4be641fdb0d38b3a7eff112a0b322279b6980afe354d2f24da122d5c48caa5427d2be7761b4fa2277d
SHA512 (mariadb-connector-c-3.0.3-src.tar.gz) = 6da66a32165cb74b106bf94e13a35d4bb38f05e5d2b3ff3740862dfc0892a7705977c1394b4f84b8e1f1e50a59a3fadbc62e7733b1feb532c6368a9fc262db04