hhorak pushed to mariadb-galera (f22). "Fix path to files shared with mariadb"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Apr 1 05:54:05 UTC 2015 

>From 081f0ed0a26ff011b2348a88058bb231971a31a1 Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak at redhat.com>
Date: Wed, 1 Apr 2015 07:52:53 +0200
Subject: Fix path to files shared with mariadb


diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index c94cb7f..d5e507e 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -1,5 +1,6 @@
 # Name of the package without any prefixes
 %global pkg_name %{name}
+%global pkg_name_shared mariadb
 %global pkgnamepatch mariadb
 
 # Regression tests may take a long time (many cores recommended), skip them by
@@ -59,7 +60,7 @@
 %bcond_without init_systemd
 %bcond_with init_sysv
 %global daemon_name mariadb
-%global daemon_no_prefix %{pkg_name}
+%global daemon_no_prefix %{pkg_name_shared}
 %global mysqld_pid_dir mysqld
 %global daemondir %{_unitdir}
 %else
@@ -108,7 +109,7 @@
 
 Name:             mariadb-galera
 Version:          %{compatver}.%{bugfixver}
-Release:          2%{?with_debug:.debug}%{?dist}
+Release:          3%{?with_debug:.debug}%{?dist}
 Epoch:            1
 
 Summary:          A community developed branch of MySQL
@@ -617,13 +618,13 @@ export LDFLAGS
          -DINSTALL_INFODIR=share/info \
          -DINSTALL_LIBDIR="%{_lib}/mysql" \
          -DINSTALL_MANDIR=share/man \
-         -DINSTALL_MYSQLSHAREDIR=share/%{pkg_name} \
+         -DINSTALL_MYSQLSHAREDIR=share/%{pkg_name_shared} \
          -DINSTALL_MYSQLTESTDIR=share/mysql-test \
          -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
          -DINSTALL_SBINDIR=libexec \
          -DINSTALL_SCRIPTDIR=bin \
          -DINSTALL_SQLBENCHDIR=share \
-         -DINSTALL_SUPPORTFILESDIR=share/%{pkg_name} \
+         -DINSTALL_SUPPORTFILESDIR=share/%{pkg_name_shared} \
          -DMYSQL_DATADIR="%{dbdatadir}" \
          -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
          -DENABLED_LOCAL_INFILE=ON \
@@ -743,18 +744,18 @@ ln -s ../../../../../bin/my_safe_process %{buildroot}%{_datadir}/mysql-test/lib/
 # should move this to /etc/ ?
 rm -f %{buildroot}%{_bindir}/mysql_embedded
 rm -f %{buildroot}%{_libdir}/mysql/*.a
-rm -f %{buildroot}%{_datadir}/%{pkg_name}/binary-configure
-rm -f %{buildroot}%{_datadir}/%{pkg_name}/magic
-rm -f %{buildroot}%{_datadir}/%{pkg_name}/ndb-config-2-node.ini
-rm -f %{buildroot}%{_datadir}/%{pkg_name}/mysql.server
-rm -f %{buildroot}%{_datadir}/%{pkg_name}/mysqld_multi.server
+rm -f %{buildroot}%{_datadir}/%{pkg_name_shared}/binary-configure
+rm -f %{buildroot}%{_datadir}/%{pkg_name_shared}/magic
+rm -f %{buildroot}%{_datadir}/%{pkg_name_shared}/ndb-config-2-node.ini
+rm -f %{buildroot}%{_datadir}/%{pkg_name_shared}/mysql.server
+rm -f %{buildroot}%{_datadir}/%{pkg_name_shared}/mysqld_multi.server
 rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1*
 rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1*
 rm -f %{buildroot}%{_bindir}/mytop
 
 # put logrotate script where it needs to be
 mkdir -p %{buildroot}%{logrotateddir}
-mv %{buildroot}%{_datadir}/%{pkg_name}/mysql-log-rotate %{buildroot}%{logrotateddir}/%{daemon_name}
+mv %{buildroot}%{_datadir}/%{pkg_name_shared}/mysql-log-rotate %{buildroot}%{logrotateddir}/%{daemon_name}
 chmod 644 %{buildroot}%{logrotateddir}/%{daemon_name}
 
 mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
@@ -779,7 +780,7 @@ install -p -m 0755 scripts/clustercheck %{buildroot}%{_bindir}/clustercheck
 install -p -m 0644 mysql-test/rh-skipped-tests.list %{buildroot}%{_datadir}/mysql-test
 
 # remove unneeded RHEL-4 SELinux stuff
-rm -rf %{buildroot}%{_datadir}/%{pkg_name}/SELinux/
+rm -rf %{buildroot}%{_datadir}/%{pkg_name_shared}/SELinux/
 
 # remove SysV init script
 rm -f %{buildroot}%{_sysconfdir}/init.d/mysql
@@ -788,7 +789,7 @@ rm -f %{buildroot}%{_sysconfdir}/init.d/mysql
 rm -f %{buildroot}%{_sysconfdir}/logrotate.d/mysql
 
 # remove solaris files
-rm -rf %{buildroot}%{_datadir}/%{pkg_name}/solaris/
+rm -rf %{buildroot}%{_datadir}/%{pkg_name_shared}/solaris/
 
 # rename the wsrep README so it corresponds with the other README names
 mv Docs/README-wsrep Docs/README.wsrep
@@ -834,12 +835,12 @@ rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/mysql-clients.cnf
 %endif
 
 %if %{without common}
-rm -rf %{buildroot}%{_datadir}/%{pkg_name}/charsets
+rm -rf %{buildroot}%{_datadir}/%{pkg_name_shared}/charsets
 %endif
 
 %if %{without errmsg}
-rm -f %{buildroot}%{_datadir}/%{pkg_name}/errmsg-utf8.txt
-rm -rf %{buildroot}%{_datadir}/%{pkg_name}/{english,czech,danish,dutch,estonian,\
+rm -f %{buildroot}%{_datadir}/%{pkg_name_shared}/errmsg-utf8.txt
+rm -rf %{buildroot}%{_datadir}/%{pkg_name_shared}/{english,czech,danish,dutch,estonian,\
 french,german,greek,hungarian,italian,japanese,korean,norwegian,norwegian-ny,\
 polish,portuguese,romanian,russian,serbian,slovak,spanish,swedish,ukrainian}
 %endif
@@ -995,36 +996,36 @@ fi
 %doc README COPYING COPYING.LESSER README.mysql-license
 %doc storage/innobase/COPYING.Percona storage/innobase/COPYING.Google
 %dir %{_libdir}/mysql
-%dir %{_datadir}/%{pkg_name}
-%{_datadir}/%{pkg_name}/charsets
+%dir %{_datadir}/%{pkg_name_shared}
+%{_datadir}/%{pkg_name_shared}/charsets
 %endif
 
 %if %{with errmsg}
 %files errmsg
-%{_datadir}/%{pkg_name}/errmsg-utf8.txt
-%{_datadir}/%{pkg_name}/english
-%lang(cs) %{_datadir}/%{pkg_name}/czech
-%lang(da) %{_datadir}/%{pkg_name}/danish
-%lang(nl) %{_datadir}/%{pkg_name}/dutch
-%lang(et) %{_datadir}/%{pkg_name}/estonian
-%lang(fr) %{_datadir}/%{pkg_name}/french
-%lang(de) %{_datadir}/%{pkg_name}/german
-%lang(el) %{_datadir}/%{pkg_name}/greek
-%lang(hu) %{_datadir}/%{pkg_name}/hungarian
-%lang(it) %{_datadir}/%{pkg_name}/italian
-%lang(ja) %{_datadir}/%{pkg_name}/japanese
-%lang(ko) %{_datadir}/%{pkg_name}/korean
-%lang(no) %{_datadir}/%{pkg_name}/norwegian
-%lang(no) %{_datadir}/%{pkg_name}/norwegian-ny
-%lang(pl) %{_datadir}/%{pkg_name}/polish
-%lang(pt) %{_datadir}/%{pkg_name}/portuguese
-%lang(ro) %{_datadir}/%{pkg_name}/romanian
-%lang(ru) %{_datadir}/%{pkg_name}/russian
-%lang(sr) %{_datadir}/%{pkg_name}/serbian
-%lang(sk) %{_datadir}/%{pkg_name}/slovak
-%lang(es) %{_datadir}/%{pkg_name}/spanish
-%lang(sv) %{_datadir}/%{pkg_name}/swedish
-%lang(uk) %{_datadir}/%{pkg_name}/ukrainian
+%{_datadir}/%{pkg_name_shared}/errmsg-utf8.txt
+%{_datadir}/%{pkg_name_shared}/english
+%lang(cs) %{_datadir}/%{pkg_name_shared}/czech
+%lang(da) %{_datadir}/%{pkg_name_shared}/danish
+%lang(nl) %{_datadir}/%{pkg_name_shared}/dutch
+%lang(et) %{_datadir}/%{pkg_name_shared}/estonian
+%lang(fr) %{_datadir}/%{pkg_name_shared}/french
+%lang(de) %{_datadir}/%{pkg_name_shared}/german
+%lang(el) %{_datadir}/%{pkg_name_shared}/greek
+%lang(hu) %{_datadir}/%{pkg_name_shared}/hungarian
+%lang(it) %{_datadir}/%{pkg_name_shared}/italian
+%lang(ja) %{_datadir}/%{pkg_name_shared}/japanese
+%lang(ko) %{_datadir}/%{pkg_name_shared}/korean
+%lang(no) %{_datadir}/%{pkg_name_shared}/norwegian
+%lang(no) %{_datadir}/%{pkg_name_shared}/norwegian-ny
+%lang(pl) %{_datadir}/%{pkg_name_shared}/polish
+%lang(pt) %{_datadir}/%{pkg_name_shared}/portuguese
+%lang(ro) %{_datadir}/%{pkg_name_shared}/romanian
+%lang(ru) %{_datadir}/%{pkg_name_shared}/russian
+%lang(sr) %{_datadir}/%{pkg_name_shared}/serbian
+%lang(sk) %{_datadir}/%{pkg_name_shared}/slovak
+%lang(es) %{_datadir}/%{pkg_name_shared}/spanish
+%lang(sv) %{_datadir}/%{pkg_name_shared}/swedish
+%lang(uk) %{_datadir}/%{pkg_name_shared}/ukrainian
 %endif
 
 %files server
@@ -1078,7 +1079,7 @@ fi
 %{_libdir}/mysql/INFO_SRC
 %{_libdir}/mysql/INFO_BIN
 %if %{without common}
-%dir %{_datadir}/%{pkg_name}
+%dir %{_datadir}/%{pkg_name_shared}
 %endif
 
 %{_libdir}/mysql/plugin
@@ -1118,17 +1119,17 @@ fi
 %{_mandir}/man1/mysql_tzinfo_to_sql.1*
 %{_mandir}/man8/mysqld.8*
 
-%{_datadir}/%{pkg_name}/fill_help_tables.sql
-%{_datadir}/%{pkg_name}/install_spider.sql
-%{_datadir}/%{pkg_name}/mysql_system_tables.sql
-%{_datadir}/%{pkg_name}/mysql_system_tables_data.sql
-%{_datadir}/%{pkg_name}/mysql_test_data_timezone.sql
-%{_datadir}/%{pkg_name}/mysql_performance_tables.sql
-%{?with_mroonga:%{_datadir}/%{pkg_name}/mroonga/install.sql}
-%{?with_mroonga:%{_datadir}/%{pkg_name}/mroonga/uninstall.sql}
-%{_datadir}/%{pkg_name}/my-*.cnf
-%{_datadir}/%{pkg_name}/wsrep.cnf
-%{_datadir}/%{pkg_name}/wsrep_notify
+%{_datadir}/%{pkg_name_shared}/fill_help_tables.sql
+%{_datadir}/%{pkg_name_shared}/install_spider.sql
+%{_datadir}/%{pkg_name_shared}/mysql_system_tables.sql
+%{_datadir}/%{pkg_name_shared}/mysql_system_tables_data.sql
+%{_datadir}/%{pkg_name_shared}/mysql_test_data_timezone.sql
+%{_datadir}/%{pkg_name_shared}/mysql_performance_tables.sql
+%{?with_mroonga:%{_datadir}/%{pkg_name_shared}/mroonga/install.sql}
+%{?with_mroonga:%{_datadir}/%{pkg_name_shared}/mroonga/uninstall.sql}
+%{_datadir}/%{pkg_name_shared}/my-*.cnf
+%{_datadir}/%{pkg_name_shared}/wsrep.cnf
+%{_datadir}/%{pkg_name_shared}/wsrep_notify
 
 %{daemondir}/%{daemon_name}*
 %{_libexecdir}/mysql-prepare-db-dir
@@ -1197,6 +1198,9 @@ fi
 %endif
 
 %changelog
+* Wed Apr 01 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.17-3
+- Fix path to files shared with mariadb
+
 * Wed Mar 11 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.17-1
 - Rebase to version 10.0.17
 - Rework disabled tests handling
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mariadb-galera.git/commit/?h=f22&id=081f0ed0a26ff011b2348a88058bb231971a31a1

More information about the scm-commits mailing list