Attachment 676314 Details for Bug 875150 – Changes made in spec file

[patch] Changes made in spec file

mariadb.spec.2.diff (text/plain), 8.24 KB, created by Honza Horak on 2013-01-10 13:52:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Honza Horak

Created: 2013-01-10 13:52:02 UTC

Size: 8.24 KB

patch

obsolete

>--- mariadb.spec.3	2013-01-04 11:50:07.000000000 +0100
>+++ mariadb.spec	2013-01-10 14:30:18.900113704 +0100
>@@ -1,16 +1,18 @@
> Name: mariadb
> Version: 5.5.28a
>-Release: 4%{?dist}
>+Release: 5%{?dist}
> 
> Summary: A community developed branch of MySQL
> Group: Applications/Databases
> URL: http://mariadb.org
>-# exceptions allow client libraries to be linked with most open source SW,
>+# Exceptions allow client libraries to be linked with most open source SW,
> # not only GPL code.  See README.mysql-license
>-License: GPLv2 with exceptions
>+# Some innobase code from Percona and Google is under BSD license
>+# Some code related to test-suite is under LGPLv2
>+License: GPLv2 with exceptions and LGPLv2 and BSD
> 
> # The last known mysql release
>-%global last_mysql_evr %{epoch}:%{version}-%{release}
>+%global last_mysql_evr %{version}-%{release}
> 
> # Regression tests take a long time, you can skip 'em with this
> %{!?runselftest:%global runselftest 1}
>@@ -30,8 +32,6 @@ Source14: rh-skipped-tests-base.list
> Source15: rh-skipped-tests-arm.list
> # mysql_plugin is missing in mariadb tar ball
> Source16: mysql_plugin.1
>-# Working around perl dependency checking bug in rpm FTTB. Remove later.
>-Source999: filter-requires-mysql.sh
> 
> # Comments for these patches are in the patch files.
> Patch1: mariadb-errno.patch
>@@ -60,20 +60,16 @@ BuildRequires: perl(Data::Dumper), perl(
> Requires: %{name}-libs%{?_isa} = %{version}-%{release}
> Requires: grep, fileutils, bash
> 
>-%systemd_requires
>+%{?systemd_requires: %systemd_requires}
> 
> # MySQL (with caps) is upstream's spelling of their own RPMs for mysql
> Conflicts: MySQL
> # MariaDB replaces mysql packages
>-Provides: mysql = %{epoch}:%{version}-%{release}
>-Obsoletes: mysql < %{last_mysql_evr}
>+Provides: mysql%{?_isa} = %{version}-%{release}
>+Obsoletes: mysql%{?_isa} < %{last_mysql_evr}
> # mysql-cluster used to be built from this SRPM, but no more
> Obsoletes: mysql-cluster < 5.1.44
> 
>-# When rpm 4.9 is universal, this could be cleaned up:
>-%global __perl_requires %{SOURCE999}
>-%global __perllib_requires %{SOURCE999}
>-
> # patch utility does automatically back-up of chunks that didn't apply
> # smoothly, but we don't want to create that files because they could be
> # included in RPM incorrectly
>@@ -91,8 +87,8 @@ contains the standard MariaDB/MySQL clie
> Summary: The shared libraries required for MariaDB/MySQL clients
> Group: Applications/Databases
> Requires: /sbin/ldconfig
>-Provides: mysql-libs = %{epoch}:%{version}-%{release}
>-Obsoletes: mysql-libs < %{last_mysql_evr}
>+Provides: mysql-libs%{?_isa} = %{version}-%{release}
>+Obsoletes: mysql-libs%{?_isa} < %{last_mysql_evr}
> 
> %description libs
> The mariadb-libs package provides the essential shared libraries for any 
>@@ -121,8 +117,8 @@ Requires(post): systemd-sysv
> # mysqlhotcopy needs DBI/DBD support
> Requires: perl-DBI, perl-DBD-MySQL
> Conflicts: MySQL-server
>-Provides: mysql-server = %{epoch}:%{version}-%{release}
>-Obsoletes: mysql-server < %{last_mysql_evr}
>+Provides: mysql-server%{?_isa} = %{version}-%{release}
>+Obsoletes: mysql-server%{?_isa} < %{last_mysql_evr}
> 
> %description server
> MariaDB is a multi-user, multi-threaded SQL database server. It is a
>@@ -139,8 +135,8 @@ Requires: %{name}%{?_isa} = %{version}-%
> Requires: %{name}-libs%{?_isa} = %{version}-%{release}
> Requires: openssl-devel%{?_isa}
> Conflicts: MySQL-devel
>-Provides: mysql-devel = %{epoch}:%{version}-%{release}
>-Obsoletes: mysql-devel < %{last_mysql_evr}
>+Provides: mysql-devel%{?_isa} = %{version}-%{release}
>+Obsoletes: mysql-devel%{?_isa} < %{last_mysql_evr}
> 
> %description devel
> MariaDB is a multi-user, multi-threaded SQL database server. This
>@@ -152,8 +148,9 @@ MariaDB is a community developed branch
> 
> Summary: MariaDB as an embeddable library
> Group: Applications/Databases
>-Provides: mysql-embedded = %{epoch}:%{version}-%{release}
>-Obsoletes: mysql-embedded < %{last_mysql_evr}
>+Requires: /sbin/ldconfig
>+Provides: mysql-embedded%{?_isa} = %{version}-%{release}
>+Obsoletes: mysql-embedded%{?_isa} < %{last_mysql_evr}
> 
> %description embedded
> MariaDB is a multi-user, multi-threaded SQL database server. This
>@@ -167,8 +164,8 @@ Summary: Development files for MariaDB a
> Group: Applications/Databases
> Requires: %{name}-embedded%{?_isa} = %{version}-%{release}
> Requires: %{name}-devel%{?_isa} = %{version}-%{release}
>-Provides: mysql-embedded-devel = %{epoch}:%{version}-%{release}
>-Obsoletes: mysql-embedded-devel < %{last_mysql_evr}
>+Provides: mysql-embedded-devel%{?_isa} = %{version}-%{release}
>+Obsoletes: mysql-embedded-devel%{?_isa} < %{last_mysql_evr}
> 
> %description embedded-devel
> MariaDB is a multi-user, multi-threaded SQL database server. This
>@@ -182,8 +179,8 @@ Summary: MariaDB benchmark scripts and d
> Group: Applications/Databases
> Requires: %{name}%{?_isa} = %{version}-%{release}
> Conflicts: MySQL-bench
>-Provides: mysql-bench = %{epoch}:%{version}-%{release}
>-Obsoletes: mysql-bench < %{last_mysql_evr}
>+Provides: mysql-bench%{?_isa} = %{version}-%{release}
>+Obsoletes: mysql-bench%{?_isa} < %{last_mysql_evr}
> 
> %description bench
> MariaDB is a multi-user, multi-threaded SQL database server. This
>@@ -199,8 +196,8 @@ Requires: %{name}%{?_isa} = %{version}-%
> Requires: %{name}-libs%{?_isa} = %{version}-%{release}
> Requires: %{name}-server%{?_isa} = %{version}-%{release}
> Conflicts: MySQL-test
>-Provides: mysql-test = %{epoch}:%{version}-%{release}
>-Obsoletes: mysql-test < %{last_mysql_evr}
>+Provides: mysql-test%{?_isa} = %{version}-%{release}
>+Obsoletes: mysql-test%{?_isa} < %{last_mysql_evr}
> 
> %description test
> MariaDB is a multi-user, multi-threaded SQL database server. This
>@@ -306,6 +303,7 @@ for e in innobase xtradb ; do
>   done
> done
> 
>+%check
> %if %runselftest
>   # hack to let 32- and 64-bit tests run concurrently on same build machine
>   case `uname -m` in
>@@ -453,10 +451,14 @@ rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/lo
> /usr/sbin/useradd -M -N -g mysql -o -r -d /var/lib/mysql -s /bin/bash \
> 	-c "MariaDB Server" -u 27 mysql >/dev/null 2>&1 || :
> 
>-%post libs
>-/sbin/ldconfig
>+%post libs -p /sbin/ldconfig
> 
> %post server
>+# As soon as Fedora 17, which doesn't know %%systemd_post macro,
>+# is retired, we can remove the check for availability of the macro
>+# and the alternative code.
>+# Let's keep it there now for anyone trying to build the package
>+# for F17 on his own.
> %if 0%{?systemd_post:1}
> %systemd_post mysqld.service
> %else
>@@ -483,6 +485,8 @@ if [ -f /etc/rc.d/init.d/mysqld ]; then
>     /bin/systemctl try-restart mysqld.service >/dev/null 2>&1 || :
> fi
> 
>+%post embedded -p /sbin/ldconfig
>+
> %preun server
> %if 0%{?systemd_preun:1}
> %systemd_preun mysqld.service
>@@ -494,10 +498,7 @@ if [ $1 = 0 ]; then
> fi
> %endif
> 
>-%postun libs
>-if [ $1 = 0 ] ; then
>-    /sbin/ldconfig
>-fi
>+%postun libs -p /sbin/ldconfig
> 
> %postun server
> %if 0%{?systemd_postun_with_restart:1}
>@@ -510,9 +511,11 @@ if [ $1 -ge 1 ]; then
> fi
> %endif
> 
>+%postun embedded -p /sbin/ldconfig
> 
> %files
>-%doc README COPYING README.mysql-license
>+%doc README COPYING COPYING.LESSER README.mysql-license
>+%doc storage/innobase/COPYING.Percona storage/innobase/COPYING.Google
> %doc README.mysql-docs
> 
> %{_bindir}/msql2mysql
>@@ -553,7 +556,8 @@ fi
> %config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf
> 
> %files libs
>-%doc README COPYING README.mysql-license
>+%doc README COPYING COPYING.LESSER README.mysql-license
>+%doc storage/innobase/COPYING.Percona storage/innobase/COPYING.Google
> # although the default my.cnf contains only server settings, we put it in the
> # libs package because it can be used for client settings too.
> %config(noreplace) %{_sysconfdir}/my.cnf
>@@ -684,7 +688,8 @@ fi
> %{_libdir}/mysql/libmysqlclient_r.so
> 
> %files embedded
>-%doc README COPYING README.mysql-license
>+%doc README COPYING COPYING.LESSER README.mysql-license
>+%doc storage/innobase/COPYING.Percona storage/innobase/COPYING.Google
> %{_libdir}/mysql/libmysqld.so.*
> 
> %files embedded-devel
>@@ -705,6 +710,13 @@ fi
> %{_mandir}/man1/mysql_client_test.1*
> 
> %changelog
>-* Tue Dec 18 2012 Honza Horak <hhorak@redhat.com> 5.5.28-4
>+* Thu Jan 10 2013 Honza Horak <hhorak@redhat.com> 5.5.28a-5
>+- Added licenses LGPLv2 and BSD
>+- Removed wrong usage of %%{epoch}
>+- Test-suite is run in %%check
>+- Removed perl dependency checking adjustment, rpm seems to be smart enough
>+- Other minor spec file fixes
>+
>+* Tue Dec 18 2012 Honza Horak <hhorak@redhat.com> 5.5.28a-4
> - Packaging of MariaDB based on MySQL package
>

Actions: View | Diff

Attachments on bug 875150: 674968 | 676314