From 01c465421f0988603ef4cdcee7733dca796c4777 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 06:57:48 +0100 Subject: [PATCH] remove %lang() to language directories to support all languages from e.g. phpmyadmin [release 10.4.13-3mamba;Sat May 30 2020] --- mariadb.spec | 262 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 176 insertions(+), 86 deletions(-) diff --git a/mariadb.spec b/mariadb.spec index e2dc821..40dab66 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -5,8 +5,8 @@ %define userid 65018 Name: mariadb -Version: 10.1.28 -Release: 1mamba +Version: 10.4.13 +Release: 3mamba Summary: A SQL database engine designed as a drop-in replacement of MySQL(R) Group: Applications/Databases Vendor: openmamba @@ -24,20 +24,22 @@ Source3: mariadb-logrotate License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: ldconfig BuildRequires: libaio-devel BuildRequires: libbzip2-devel BuildRequires: libcrack-devel BuildRequires: libe2fs-devel BuildRequires: libjemalloc-devel BuildRequires: libkrb5-devel +BuildRequires: liblz4-devel BuildRequires: liblzma-devel BuildRequires: liblzo-devel BuildRequires: libncurses-devel BuildRequires: libodbc-devel BuildRequires: libopenssl-devel BuildRequires: libpam-devel -BuildRequires: libpcre-devel BuildRequires: libperl +BuildRequires: libsnappy-devel BuildRequires: libstdc++6-devel BuildRequires: libsystemd-devel BuildRequires: libxml2-devel @@ -45,14 +47,13 @@ BuildRequires: libz-devel BuildRequires: perl-DBI BuildRequires: perl-devel ## AUTOBUILDREQ-END -#BuildRequires: libdb47-devel >= 4.2.52 BuildRequires: perl >= 5.8.0 BuildRequires: bison BuildRequires: doxygen BuildRequires: tetex BuildRequires: tetex-latex #Requires(post):%{__install_info} -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-common = %{?epoch:%epoch:}%{version}-%{release} #Requires: lsb BuildRoot: %{_tmppath}/%{name}-%{version}-root Provides: mysql @@ -65,8 +66,8 @@ MariaDB is designed as a drop-in replacement of MySQL(R) with more features, new %package server Summary: MariaDB server Group: Applications/Databases -Requires: %{name} = %{version}-%{release} -Requires: %{name}-client = %{version}-%{release} +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +Requires: %{name}-client = %{?epoch:%epoch:}%{version}-%{release} Provides: mysql-server Obsoletes: mysql-server @@ -77,7 +78,7 @@ This package contains the initscript for executing MariaDB as a service. %package client Summary: MariaDB client Group: Applications/Databases -Requires: %{name}-common = %{version}-%{release} +Requires: %{name}-common = %{?epoch:%epoch:}%{version}-%{release} Provides: mysql-client Obsoletes: mysql-client @@ -88,7 +89,7 @@ This package contains the standard MariaDB clients. %package bench Summary: MySQL benchmarks and test system Group: Applications/Databases -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} Provides: mysql-bench Obsoletes: mysql-bench @@ -101,47 +102,57 @@ Summary: Common files for the MariaDB database server Group: Applications/Databases Provides: mysql-common Obsoletes: mysql-common +Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} %description common MariaDB is designed as a drop-in replacement of MySQL(R) with more features, new storage engines, fewer bugs, and better performance. This package contains common files for the MariaDB database server. -%package -n libmysqlclient +%package -n lib%{name} Summary: Shared libraries need to dynamically load and use MariaDB Group: System/Libraries Provides: libmysql Obsoletes: libmysql +Provides: libmysqlclient +Obsoletes: libmysqlclient +%ifarch x86_64 +Provides: libmysqlclient.so.18()(64bit) +Provides: libmysqlclient.so.18(libmariadbclient_18)(64bit) +Provides: libmysqlclient.so.18(libmysqlclient_16)(64bit) +Provides: libmysqlclient.so.18(libmysqlclient_18)(64bit) +%else +Provides: libmysqlclient.so.18 +Provides: libmysqlclient.so.18(libmariadbclient_18) +Provides: libmysqlclient.so.18(libmysqlclient_16) +Provides: libmysqlclient.so.18(libmysqlclient_18) +%endif -%description -n libmysqlclient + +%description -n lib%{name} MariaDB is designed as a drop-in replacement of MySQL(R) with more features, new storage engines, fewer bugs, and better performance. This package contains the shared libraries (*.so*) which certain languages and applications need to dynamically load and use MySQL. -%package -n libmysqlclient-devel +%package -n lib%{name}-devel Summary: Development header files and static libraries for MariaDB Group: Development/Libraries -Requires: libmysqlclient = %{version}-%{release} +Requires: libmysqlclient = %{?epoch:%epoch:}%{version}-%{release} Provides: libmysql-devel Obsoletes: libmysql-devel Provides: libmysql5-devel Obsoletes: libmysql5-devel +Provides: libmysqlclient-devel +Obsoletes: libmysqlclient-devel -%description -n libmysqlclient-devel +%description -n lib%{name}-devel MariaDB is designed as a drop-in replacement of MySQL(R) with more features, new storage engines, fewer bugs, and better performance. This package contains the development header files and libraries necessary to develop MariaDB client applications. +%debug_package + %prep %setup -q -#-D -T -#:<< _EOF - -# ld.gold has problems with boot loaders -ld -v | grep "gold" && { - echo "Error: ld GOLD detected, which is incompatible with this package. Aborting." - exit 1 -} %build -#:<< _EOF %cmake -d build \ -DBUILD_CONFIG=mysql_release \ -DSYSCONFDIR=%{_sysconfdir}/mysql \ @@ -161,10 +172,12 @@ ld -v | grep "gold" && { -DINSTALL_MYSQLSHAREDIR=share/mysql \ -DINSTALL_DOCDIR=share/mysql/docs \ -DINSTALL_SHAREDIR=share/mysql \ + -DINSTALL_PAMDIR=/%{_lib}/security \ + -DINSTALL_PAMDATADIR=%{_sysconfdir}/security \ -DWITH_READLINE=ON \ -DWITH_ZLIB=system \ -DWITH_SSL=system \ - -DWITH_PCRE=system \ + -DWITH_PCRE=bundled \ -DWITH_LIBWRAP=OFF \ -DWITH_JEMALLOC=ON \ -DCMAKE_EXE_LINKER_FLAGS='-ljemalloc' \ @@ -179,11 +192,16 @@ ld -v | grep "gold" && { -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \ -DWITHOUT_PBXT_STORAGE_ENGINE=1 \ -DCMAKE_C_FLAGS="-fPIC %{optflags} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \ - -DCMAKE_CXX_FLAGS="-fPIC %{optflags} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" + -DCMAKE_CXX_FLAGS="-fPIC %{optflags} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-delete-null-pointer-checks" +#-fno-rtti # -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now" +%ifnarch arm %make +%else +LD_PRELOAD=/usr/lib/libatomic.so make %{_smp_mflags} +%endif %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} @@ -196,7 +214,7 @@ install -d %{buildroot}/var/lib/mysql%{?MAJversion} install -D -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/mariadb.service install -D -m0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/mariadb.conf -install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/mariadb +#install -D -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/mariadb #install -D -m755 %{SOURCE3} \ # %{buildroot}%{_datadir}/mysql/%{name}_convert_db_format_to_mysql41 # copy default configuration file @@ -207,8 +225,11 @@ install -D -m644 support-files/rpm/mysql-clients.cnf %{buildroot}%{_sysconfdir}/ #mv %{buildroot}%{_prefix}/sql-bench %{buildroot}%{_datadir}/sql-bench +ln -s libmariadb.so.3 %{buildroot}%{_libdir}/libmysqlclient.so.18 + %ifarch x86_64 mv %{buildroot}%{_prefix}/lib/lib* %{buildroot}%{_libdir}/ +mv %{buildroot}%{_prefix}/lib/pkgconfig %{buildroot}%{_libdir} %endif install -d -m0755 %{buildroot}%{_sysconfdir}/php/php.d @@ -307,19 +328,25 @@ if [ $1 -ge 1 ]; then fi : -%post -n libmysqlclient -p /sbin/ldconfig -%postun -n libmysqlclient -p /sbin/ldconfig +%post -n lib%{name} -p /sbin/ldconfig +%postun -n lib%{name} -p /sbin/ldconfig %files %defattr(-,root,root) +%{_bindir}/mariadbd +%{_bindir}/mariadbd-multi +%{_bindir}/mariadbd-safe +%{_bindir}/mariadbd-safe-helper %{_bindir}/mysqld %{_bindir}/mysql_embedded %{_bindir}/mysql_upgrade %{_bindir}/mysqld_safe_helper #%{_bindir}/maria_add_gis_sp.sql +%{_mandir}/man1/mariadbd-*.1* %{_mandir}/man1/mysql_upgrade.1* +%{_mandir}/man8/mariadbd.8* %{_mandir}/man8/mysqld.8* -%doc COPYING README +%doc COPYING #%doc ChangeLog Docs/manual.html %files server @@ -342,10 +369,46 @@ fi %{_bindir}/aria_read_log %{_bindir}/mbstream %{_bindir}/msql2mysql +%{_bindir}/mariadb +%{_bindir}/mariadb-access +%{_bindir}/mariadb-admin +%{_bindir}/mariadb-backup +%{_bindir}/mariadb-binlog +%{_bindir}/mariadb-check +%{_bindir}/mariadb-client-test +%{_bindir}/mariadb-client-test-embedded +%{_bindir}/mariadb-convert-table-format +%{_bindir}/mariadb-dump +%{_bindir}/mariadb-dumpslow +%{_bindir}/mariadb-embedded +%{_bindir}/mariadb-find-rows +%{_bindir}/mariadb-fix-extensions +%{_bindir}/mariadb-hotcopy +%{_bindir}/mariadb-import +%{_bindir}/mariadb-install-db +%ifnarch %{ix86} +%{_bindir}/mariadb-ldb +%endif +%{_bindir}/mariadb-plugin +%{_bindir}/mariadb-secure-installation +%{_bindir}/mariadb-setpermission +%{_bindir}/mariadb-show +%{_bindir}/mariadb-slap +%{_bindir}/mariadb-test +%{_bindir}/mariadb-test-embedded +%{_bindir}/mariadb-tzinfo-to-sql +%{_bindir}/mariadb-upgrade +%{_bindir}/mariadb-waitpid %{_bindir}/mysql %{_bindir}/mysqlaccess #%{_bindir}/mysqlaccess.conf %{_bindir}/mysqladmin +%ifarch x86_64 arm +%{_bindir}/myrocks_hotbackup +%{_bindir}/mysql_ldb +%{_bindir}/sst_dump +%endif +%{_bindir}/test-connect-t %{_bindir}/mariabackup %{_bindir}/mysqlbinlog %{_bindir}/mysqlcheck @@ -364,6 +427,8 @@ fi %ifarch x86_64 %{_bindir}/tokuftdump %endif +%{_mandir}/man1/mariadb-*.1* +%{_mandir}/man1/mariadb.1* %{_mandir}/man1/msql2mysql.1* %{_mandir}/man1/mysql.1* %{_mandir}/man1/mysqlaccess.1* @@ -384,17 +449,22 @@ fi %{_mandir}/man1/aria_*.1* %{_mandir}/man1/galera_new_cluster.1* %{_mandir}/man1/galera_recovery.1* -%{_mandir}/man1/mariadb-service-convert.1* %{_mandir}/man1/my_safe_process.1* %{_mandir}/man1/mysqld_safe_helper.1* -%{_mandir}/man1/tokuft_logdump.1* +%{_mandir}/man1/mariabackup.1* +%{_mandir}/man1/mbstream.1* +%{_mandir}/man1/mysql_embedded.1* +%{_mandir}/man1/mysql_ldb.1* +%ifarch x86_64 +%{_mandir}/man1/tokuft_logprint.1* %{_mandir}/man1/tokuftdump.1* +%endif %{_mandir}/man1/wsrep_sst_*.1* %files common %defattr(-,root,root) %config %{_sysconfdir}/my.cnf -%config(noreplace) %{_sysconfdir}/logrotate.d/mariadb +#%config(noreplace) %{_sysconfdir}/logrotate.d/mariadb %{_bindir}/galera_new_cluster %{_bindir}/galera_recovery %{_bindir}/innochecksum @@ -415,8 +485,8 @@ fi #%{_bindir}/mysql_tableinfo %{_bindir}/mysql_tzinfo_to_sql %{_bindir}/mysql_waitpid -%{_bindir}/mysql_zap -%{_bindir}/mysqlbug +#%{_bindir}/mysql_zap +#%{_bindir}/mysqlbug %{_bindir}/mysqld_multi %{_bindir}/mysqld_safe %{_bindir}/mysqlhotcopy @@ -435,53 +505,52 @@ fi %dir %{_datadir}/mysql%{?MAJversion} #%{_datadir}/mysql/%{name}_convert_db_format_to_mysql41 %{_datadir}/mysql%{?MAJversion}/english -%lang(cs) %{_datadir}/mysql%{?MAJversion}/czech -%lang(da) %{_datadir}/mysql%{?MAJversion}/danish -%lang(nl) %{_datadir}/mysql%{?MAJversion}/dutch -%lang(et) %{_datadir}/mysql%{?MAJversion}/estonian -%lang(fr) %{_datadir}/mysql%{?MAJversion}/french -%lang(de) %{_datadir}/mysql%{?MAJversion}/german -%lang(el) %{_datadir}/mysql%{?MAJversion}/greek -%lang(hu) %{_datadir}/mysql%{?MAJversion}/hungarian -%lang(it) %{_datadir}/mysql%{?MAJversion}/italian -%lang(ja) %{_datadir}/mysql%{?MAJversion}/japanese -%lang(ko) %{_datadir}/mysql%{?MAJversion}/korean -%lang(no) %{_datadir}/mysql%{?MAJversion}/norwegian -%lang(no) %{_datadir}/mysql%{?MAJversion}/norwegian-ny -%lang(pl) %{_datadir}/mysql%{?MAJversion}/polish -%lang(pt) %{_datadir}/mysql%{?MAJversion}/portuguese -%lang(ro) %{_datadir}/mysql%{?MAJversion}/romanian -%lang(ru) %{_datadir}/mysql%{?MAJversion}/russian -%lang(sr) %{_datadir}/mysql%{?MAJversion}/serbian -%lang(sk) %{_datadir}/mysql%{?MAJversion}/slovak -%lang(es) %{_datadir}/mysql%{?MAJversion}/spanish -%lang(sv) %{_datadir}/mysql%{?MAJversion}/swedish -%lang(uk) %{_datadir}/mysql%{?MAJversion}/ukrainian +%{_datadir}/mysql%{?MAJversion}/czech +%{_datadir}/mysql%{?MAJversion}/danish +%{_datadir}/mysql%{?MAJversion}/dutch +%{_datadir}/mysql%{?MAJversion}/estonian +%{_datadir}/mysql%{?MAJversion}/french +%{_datadir}/mysql%{?MAJversion}/german +%{_datadir}/mysql%{?MAJversion}/greek +%{_datadir}/mysql%{?MAJversion}/hungarian +%{_datadir}/mysql%{?MAJversion}/italian +%{_datadir}/mysql%{?MAJversion}/japanese +%{_datadir}/mysql%{?MAJversion}/korean +%{_datadir}/mysql%{?MAJversion}/norwegian +%{_datadir}/mysql%{?MAJversion}/norwegian-ny +%{_datadir}/mysql%{?MAJversion}/polish +%{_datadir}/mysql%{?MAJversion}/portuguese +%{_datadir}/mysql%{?MAJversion}/romanian +%{_datadir}/mysql%{?MAJversion}/russian +%{_datadir}/mysql%{?MAJversion}/serbian +%{_datadir}/mysql%{?MAJversion}/slovak +%{_datadir}/mysql%{?MAJversion}/spanish +%{_datadir}/mysql%{?MAJversion}/swedish +%{_datadir}/mysql%{?MAJversion}/ukrainian %{_datadir}/mysql%{?MAJversion}/charsets %{_datadir}/mysql%{?MAJversion}/errmsg-utf8.txt %{_datadir}/mysql%{?MAJversion}/*.sql %{_datadir}/mysql%{?MAJversion}/mysql.server %{_datadir}/mysql%{?MAJversion}/mysqld_multi.server %{_datadir}/mysql%{?MAJversion}/magic -%{_datadir}/mysql/*.sql %{_datadir}/mysql/README-wsrep %{_datadir}/mysql/CREDITS %{_datadir}/mysql/COPYING -#%{_datadir}/mysql/COPYING.LESSER -%{_datadir}/mysql/COPYING.thirdparty +%{_datadir}/mysql/THIRDPARTY %{_datadir}/mysql/EXCEPTIONS-CLIENT %{_datadir}/mysql/INSTALL-BINARY -%{_datadir}/mysql/README -#%{_datadir}/mysql/SELinux/RHEL4/mysql.fc -#%{_datadir}/mysql/SELinux/RHEL4/mysql.te +%{_datadir}/mysql/README.md +%{_datadir}/mysql/hindi +%dir %{_datadir}/groonga +%{_datadir}/groonga/* +%dir %{_datadir}/groonga-normalizer-mysql +%{_datadir}/groonga-normalizer-mysql/* +%dir %{_datadir}/mysql/mroonga +%{_datadir}/mysql/mroonga/* %dir %{_datadir}/mysql/aclocal %{_datadir}/mysql/aclocal/mysql.m4 -%dir %{_datadir}/mysql/mroonga -%{_datadir}/mysql/mroonga/*.sql %dir %{_datadir}/mysql/policy %{_datadir}/mysql/policy/* -%dir %{_datadir}/mysql/pkgconfig -%{_datadir}/mysql/pkgconfig/mariadb.pc %dir %{_datadir}/mysql/systemd %{_datadir}/mysql/systemd/* %{_datadir}/mysql/wsrep_notify @@ -490,15 +559,6 @@ fi %{_datadir}/mysql/docs/* %endif %{_datadir}/mysql/mysql_performance_tables.sql - -#%dir %{_datadir}/mysql-test -#%{_datadir}/mysql-test/* -#%{_datadir}/mysql/bulgarian/errmsg.sys -#%{_datadir}/mysql/dictionary.txt -#%{_datadir}/mysql/innodb_memcached_config.sql -#%{_datadir}/mysql/mysql_security_commands.sql -#%{_datadir}/mysql/solaris/postinstall-solaris -#%{_infodir}/mysql.info.* %{_mandir}/man1/innochecksum.1* %{_mandir}/man1/my_print_defaults.1* %{_mandir}/man1/myisamchk.1* @@ -514,12 +574,9 @@ fi %{_mandir}/man1/mysql_setpermission.1* %{_mandir}/man1/mysql_tzinfo_to_sql.1* %{_mandir}/man1/mysql_waitpid.1* -%{_mandir}/man1/mysql_zap.1* -%{_mandir}/man1/mysqlbug.1* %{_mandir}/man1/mysqld_multi.1* %{_mandir}/man1/mysqld_safe.1* %{_mandir}/man1/mysqlhotcopy.1* -#%{_mandir}/man1/mysqlman.1* %{_mandir}/man1/perror.1* %{_mandir}/man1/replace.1* %{_mandir}/man1/resolve_stack_dump.1* @@ -530,24 +587,33 @@ fi #%dir %{_datadir}/sql-bench #%{_datadir}/sql-bench/* -%files -n libmysqlclient +%files -n lib%{name} %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf -%{_libdir}/libmysqld.so.* -%{_libdir}/libmysqlclient.so.* -%{_libdir}/libmysqlclient_r.so.* +%{_sysconfdir}/security/user_map.conf +%{_libdir}/libmariadb.so.* +%{_libdir}/libmariadbd.so.* +%{_libdir}/libmysqlclient.so.18 +/%{_lib}/security/pam_user_map.so +%{_libdir}/mysql/plugin/auth_pam_tool_dir/auth_pam_tool +%ifnarch arm %{_libdir}/mysql/plugin/JdbcInterface.jar %{_libdir}/mysql/plugin/JavaWrappers.jar -#%{_libdir}/libmysqlservices.so +%endif %{_libdir}/mysql%{?MAJversion}/plugin/*.so %{_libdir}/mysql/plugin/daemon_example.ini -%files -n libmysqlclient-devel +%files -n lib%{name}-devel %defattr(-,root,root) %{_bindir}/mysql_config +%{_bindir}/mariadb_config %{_bindir}/myisam_ftdump %dir %{_includedir}/mysql %{_includedir}/mysql/* +%{_libdir}/libmariadb.so +%{_libdir}/libmariadbclient.a +%{_libdir}/libmariadbd.a +%{_libdir}/libmariadbd.so %{_libdir}/libmysqld.a %{_libdir}/libmysqld.so %{_libdir}/libmysqlclient.a @@ -555,12 +621,36 @@ fi %{_libdir}/libmysqlclient_r.a %{_libdir}/libmysqlclient_r.so %{_libdir}/libmysqlservices.a -#%{_datadir}/aclocal/mysql.m4 -#%{_mandir}/man1/comp_err.1* +%{_libdir}/pkgconfig/libmariadb.pc +%{_libdir}/pkgconfig/mariadb.pc %{_mandir}/man1/myisam_ftdump.1* %{_mandir}/man1/mysql_config.1* %changelog +* Sat May 30 2020 Silvan Calarco 10.4.13-3mamba +- remove %lang() to language directories to support all languages from e.g. phpmyadmin + +* Thu May 28 2020 Silvan Calarco 10.4.13-2mamba +- provide compatibility symlink and provides for libmysqlclient.so.18 + +* Wed May 13 2020 Automatic Build System 10.4.13-1mamba +- automatic version update by autodist + +* Mon Apr 27 2020 Automatic Build System 10.4.12-1mamba +- automatic version update by autodist + +* Wed Jun 19 2019 Automatic Build System 10.3.16-1mamba +- automatic version update by autodist + +* Sun May 26 2019 Automatic Build System 10.3.15-1mamba +- automatic version update by autodist + +* Tue Apr 09 2019 Automatic Build System 10.3.14-1mamba +- automatic version update by autodist + +* Mon Mar 18 2019 Silvan Calarco 10.3.13-1mamba +- update to 10.3.13 + * Fri Sep 29 2017 Automatic Build System 10.1.28-1mamba - automatic version update by autodist