diff --git a/.abf.yml b/.abf.yml index aa155f8..96104ba 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - mariadb-10.5.23.tar.gz: 10abdd7453eca557df81c4b929a1715dff6ece6a + mariadb-10.5.27.tar.gz: cf396ec664e1a5a7c47ee2c472a5628a1ebb3093 diff --git a/mariadb.spec b/mariadb.spec index f97fe0a..857389d 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -40,13 +40,14 @@ %global __requires_exclude_from ^%{_datadir}/mysql-test Name: mariadb -Version: 10.5.23 +Version: 10.5.27 Release: 1 Summary: Server part of MariaDB License: SUSE-GPL-2.0-with-FLOSS-exception Group: Databases URL: https://www.mariadb.org -Source: https://downloads.mariadb.org/f/mariadb-%{version}/source/mariadb-%{version}.tar.gz +#Source: https://downloads.mariadb.org/f/mariadb-%{version}/source/mariadb-%{version}.tar.gz +Source0: https://archive.mariadb.org/%{name}-%{version}/source/%{name}-%{version}.tar.gz Source4: README.debug Source5: suse-test-run Source7: README.install @@ -68,43 +69,43 @@ Patch8: mariadb-10.5.10-e2k.patch # needed for bison SQL parser and wsrep API BuildRequires: bison -BuildRequires: git +BuildRequires: git-core BuildRequires: cmake BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: gcc-c++ # GSSAPI -BuildRequires: krb5-devel +BuildRequires: pkgconfig(krb5) # embedded server libmariadbd -BuildRequires: libaio-devel +BuildRequires: %{_lib}aio-devel # mariabackup tool -BuildRequires: libarchive-devel +BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(zlib) # commands history feature -BuildRequires: libedit-devel -BuildRequires: libevent-devel +BuildRequires: pkgconfig(libedit) +BuildRequires: pkgconfig(libevent) BuildRequires: libtool -BuildRequires: libxml2-devel +BuildRequires: pkgconfig(libxml-2.0) # CLI graphic and wsrep API -BuildRequires: ncurses-devel -BuildRequires: openssl-devel +BuildRequires: pkgconfig(ncursesw) +BuildRequires: pkgconfig(openssl3.3) # auth_pam.so plugin -BuildRequires: pam-devel +BuildRequires: pkgconfig(dspam) # MariaDB requires a specific version of pcre. Provide MariaDB with # "BuildRequires: pcre-devel" and it automatically decides if the version is # ok or not. If not, it uses bundled pcre. -BuildRequires: pcre2-devel +BuildRequires: pkgconfig(libpcre2-posix) BuildRequires: pkgconfig BuildRequires: procps # Some tests and myrocks_hotbackup script need python3 BuildRequires: python3 +BuildRequires: python38-devel #BuildRequires: sqlite #BuildRequires: tcpd-devel # Tests requires time and ps and some perl modules # Keep in sync with Requires of mysql-testsuite BuildRequires: time BuildRequires: unixODBC-devel -BuildRequires: zlib-devel BuildRequires: pkgconfig(libcurl) BuildRequires: perl(Data::Dumper) BuildRequires: perl(Env) @@ -310,7 +311,8 @@ PAM module. %endif %prep -%autosetup -p1 +%setup -q +%apply_patches # Remove JAR files from the tarball (used for testing from the source) find . -name "*.jar" -type f -exec rm --verbose -f {} \; @@ -349,6 +351,9 @@ rm -r storage/tokudb/mysql-test/tokudb/t/*.py rm -rf storage/tokudb/PerconaFT %build +/usr/libexec/python3.8 -m venv . +. bin/activate + %global _lto_cflags %{_lto_cflags} -ffat-lto-objects EXTRA_FLAGS="-Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter" # Mariadb devs seems to fall in love with -Werror option