diff --git a/mariadb.spec b/mariadb.spec index f8d8348..a459eb1 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -5,8 +5,8 @@ %define userid 65018 Name: mariadb -Version: 10.5.4 -Release: 1mamba +Version: 10.5.5 +Release: 2mamba Summary: A SQL database engine designed as a drop-in replacement of MySQL(R) Group: Applications/Databases Vendor: openmamba @@ -86,16 +86,6 @@ Obsoletes: mysql-client 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 standard MariaDB clients. -%package columnstore -Summary: MariaDB columnstore -Group: Applications/Databases -Requires: %{name}-common = %{?epoch:%epoch:}%{version}-%{release} - -%description columnstore -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 columnstore storage backend. - - %package bench Summary: MySQL benchmarks and test system Group: Applications/Databases @@ -112,6 +102,7 @@ Summary: Common files for the MariaDB database server Group: Applications/Databases Provides: mysql-common Obsoletes: mysql-common +Obsoletes: mariadb-columnstore Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} %description common @@ -207,14 +198,18 @@ This package contains the development header files and libraries necessary to de #-fno-rtti # -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now" -%ifnarch arm -%make -%else -LD_PRELOAD=/usr/lib/libatomic.so make %{_smp_mflags} +%ifarch arm +export LD_PRELOAD=/usr/lib/libatomic.so %endif +%make + %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} +%ifarch arm +export LD_PRELOAD=/usr/lib/libatomic.so +%endif + %makeinstall -C build install -d %{buildroot}/var/lib/mysql%{?MAJversion} @@ -383,10 +378,8 @@ fi %{_bindir}/aria_ftdump %{_bindir}/aria_pack %{_bindir}/aria_read_log -%ifarch arm %{_bindir}/aria_s3_copy %{_bindir}/mariadb-conv -%endif %{_bindir}/mbstream %{_bindir}/msql2mysql %{_bindir}/mariadb @@ -483,133 +476,6 @@ fi #%endif %{_mandir}/man1/wsrep_sst_*.1* -%ifnarch arm -%files columnstore -%defattr(-,root,root) -%dir %{_sysconfdir}/columnstore -%{_sysconfdir}/columnstore/*.xml -%{_sysconfdir}/columnstore/*.txt -%config(noreplace) %{_sysconfdir}/mysql/columnstore.cnf -%config(noreplace) %{_sysconfdir}/columnstore/storagemanager.cnf -%{_sysconfdir}/columnstore/storagemanager.cnf.example -%{_bindir}/DDLProc -%{_bindir}/DMLProc -%{_bindir}/ExeMgr -%{_bindir}/MCS*.sh -%{_bindir}/PrimProc -%{_bindir}/ProcMgr -%{_bindir}/ProcMon -%{_bindir}/ServerMonitor -%{_bindir}/StorageManager -%{_bindir}/WriteEngineServer -%{_bindir}/aria_s3_copy -%{_bindir}/autoConfigure -%{_bindir}/bulklogReport.sh -%{_bindir}/clearShm -%{_bindir}/cleartablelock -%{_bindir}/columnstore* -%{_bindir}/colxml -%{_bindir}/configReport.sh -%{_bindir}/configxml.sh -%{_bindir}/controllernode -%{_bindir}/cpimport -%{_bindir}/cpimport.bin -%{_bindir}/cplogger -%{_bindir}/dbbuilder -%{_bindir}/dbmsReport.sh -%{_bindir}/dbrmctl -%{_bindir}/ddlcleanup -%{_bindir}/disable-rep-columnstore.sh -%{_bindir}/editem -%{_bindir}/getMySQLpw -%{_bindir}/hardwareReport.sh -%{_bindir}/idbmeminfo -%{_bindir}/install_mcs_mysql.sh -%{_bindir}/load_brm -%{_bindir}/logReport.sh -%{_bindir}/mariadb-columnstore-start.sh -%{_bindir}/mariadb-columnstore-stop.sh -%{_bindir}/mariadb-command-line.sh -%{_bindir}/mariadb-conv -%{_bindir}/master-rep-columnstore.sh -%{_bindir}/mcs-loadbrm.py -%{_bindir}/mcs-start-storagemanager.py -%{_bindir}/mcs-stop-controllernode.sh -%{_bindir}/mcsGetConfig -%{_bindir}/mcsSetConfig -%{_bindir}/mcs_module_installer.sh -%{_bindir}/mycnfUpgrade -%{_bindir}/os_detect.sh -%{_bindir}/post-mysql-install -%{_bindir}/post-mysqld-install -%{_bindir}/postConfigure -%{_bindir}/quick_installer_multi_server.sh -%{_bindir}/quick_installer_single_server.sh -%{_bindir}/remote_command.sh -%{_bindir}/remote_command_verify.sh -%{_bindir}/remote_scp_get.sh -%{_bindir}/remote_scp_put.sh -%{_bindir}/remotessh.exp -%{_bindir}/reset_locks -%{_bindir}/resourceReport.sh -%{_bindir}/rollback -%{_bindir}/rsync.sh -%{_bindir}/save_brm -%{_bindir}/slave-rep-columnstore.sh -%{_bindir}/smcat -%{_bindir}/smls -%{_bindir}/smput -%{_bindir}/smrm -%{_bindir}/startupTests.sh -%{_bindir}/testS3Connection -%{_bindir}/viewtablelock -%{_bindir}/workernode -%{_libdir}/libalarmmanager.so -%{_libdir}/libbatchloader.so -%{_libdir}/libbrm.so -%{_libdir}/libcacheutils.so -%{_libdir}/libcloudio.so -%{_libdir}/libcommon.so -%{_libdir}/libcompress.so -%{_libdir}/libconfigcpp.so -%{_libdir}/libdataconvert.so -%{_libdir}/libdbbc.a -%{_libdir}/libddlcleanuputil.so -%{_libdir}/libddlpackage.so -%{_libdir}/libddlpackageproc.so -%{_libdir}/libdmlpackage.so -%{_libdir}/libdmlpackageproc.so -%{_libdir}/libexecplan.so -%{_libdir}/libfuncexp.so -%{_libdir}/libidbboot.a -%{_libdir}/libidbdatafile.so -%{_libdir}/libjoblist.so -%{_libdir}/libjoiner.so -%{_libdir}/liblibmysql_client.so -%{_libdir}/libloggingcpp.so -%{_libdir}/libmarias3.so -%{_libdir}/libmessageqcpp.so -%{_libdir}/liboamcpp.so -%{_libdir}/libprocessor.a -%{_libdir}/libquerystats.so -%{_libdir}/libquerytele.so -%{_libdir}/libregr.so -%{_libdir}/librowgroup.so -%{_libdir}/librwlock.so -%{_libdir}/libstoragemanager.so -%{_libdir}/libthreadpool.so -%{_libdir}/libthrift.so -%{_libdir}/libudfsdk.so -%{_libdir}/libwe_xml.a -%{_libdir}/libwindowfunction.so -%{_libdir}/libwriteengine.so -%{_libdir}/libwriteengineclient.so -%{_libdir}/libwriteengineredistribute.so -%dir %{_datadir}/columnstore -%{_datadir}/columnstore/* -%{_localstatedir}/lib/columnstore/local/module -%endif - %files common %defattr(-,root,root) %config %{_sysconfdir}/my.cnf @@ -775,6 +641,12 @@ fi %{_mandir}/man1/mariadb_config.1* %changelog +* Sun Aug 16 2020 Silvan Calarco 10.5.5-2mamba +- fix obsolete for mariadb-columnstore + +* Sun Aug 16 2020 Automatic Build System 10.5.5-1mamba +- automatic version update by autodist + * Fri Jun 26 2020 Automatic Build System 10.5.4-1mamba - automatic version update by autodist