Accepting request 126910 from server:database

- fixed path for messages from previous commit

OBS-URL: https://build.opensuse.org/request/show/126910
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb?expand=0&rev=20
This commit is contained in:
Stephan Kulow 2012-07-02 19:43:13 +00:00 committed by Git OBS Bridge
commit fb149820f6
4 changed files with 36 additions and 35 deletions

View File

@ -102,7 +102,7 @@ BuildMySQL() {
-DWITH_LIBEDIT=0 \
-DINSTALL_LAYOUT=RPM \
-DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock \
-DINSTALL_MYSQLSHAREDIR=/usr/share/%{name} \
-DINSTALL_MYSQLSHAREDIR=share/%{name} \
-DWITH_COMMENT="openSUSE MySQL rpm" \
-DWITH_EXTRA_CHARSET=all \
-DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8de7d12f96916bb2847d171efcc8acfd30678051d7af9c66f96fcbd4d2db8209
oid sha256:cd45a03bc1587ff7cc75c2bb0683068c85ce125b32d65c5648a9aaa5f05ae7ed
size 220

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jul 2 12:28:40 UTC 2012 - mhrusecky@suse.com
- fixed path for messages from previous commit
-------------------------------------------------------------------
Mon Jun 25 14:05:10 CEST 2012 - mhrusecky@suse.cz

View File

@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
# Few definitions which will alter build
%define prefered 0
@ -34,11 +33,11 @@
Name: mariadb
Summary: Server part of MariaDB
Version: 5.5.25
Release: 1
%define srv_vers 5.5.25
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Productivity/Databases/Servers
Version: 5.5.25
Release: 0
%define srv_vers 5.5.25
Url: http://www.mariab.org
Source: mariadb-%{version}.tar.bz2
Source2: baselibs.conf
@ -57,11 +56,20 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: pwdutils
PreReq: %install_info_prereq %insserv_prereq
%endif
BuildRequires: gcc-c++ ncurses-devel openssl-devel procps readline-devel
BuildRequires: autoconf automake cmake libtool zlib-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: procps
BuildRequires: readline-devel
BuildRequires: zlib-devel
%if 0%{?suse_version}
BuildRequires: pwdutils tcpd-devel
BuildRequires: pwdutils
BuildRequires: tcpd-devel
%endif
%if 0%{?suse_version} > 1030 || 0%{?fedora_version} > 8
BuildRequires: fdupes
@ -75,10 +83,11 @@ Recommends: logrotate
Requires: logrotate
%endif
# required by rcmysql
Requires: %{name}-client perl-base
Requires: %{name}-client
Requires: %{name}-errormessages = %version
Provides: mysql-Max = %{srv_vers}
Requires: perl-base
Provides: mysql = %{srv_vers}
Provides: mysql-Max = %{srv_vers}
%if 0%{?use_extra_provides} > 0
Provides: %{extra_provides} = %{version}
Obsoletes: %{extra_provides} < %{version}
@ -102,13 +111,12 @@ This package only contains the server-side programs.
# mysql-devel was last used in openSUSE 10.2
Provides: mysql-devel = %srv_vers-%release
Obsoletes: mysql-devel < %srv_vers
Requires: glibc-devel
Requires: libmysqlclient18 = %version
Requires: libmysqlclient_r18 = %version
Requires: glibc-devel
Requires: openssl-devel
Requires: zlib-devel
Summary: MariaDB development header files and libraries
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/C and C++
%description -n libmysqlclient-devel
@ -116,7 +124,6 @@ This package contains the development header files and libraries
necessary to develop client applications for MariaDB.
%package -n libmysqld18
License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MariaDB embedded server development files
Group: Development/Libraries/C and C++
@ -125,13 +132,12 @@ This package contains the development header files and libraries
for developing applications that embed the MariaDB.
%package -n libmysqld-devel
License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MariaDB embedded server development files
Group: Development/Libraries/C and C++
# the headers files are the shared
Requires: libmysqlclient-devel = %version
Requires: tcpd-devel
Requires: libmysqld18 = %version
Group: Development/Libraries/C and C++
Requires: tcpd-devel
%description -n libmysqld-devel
This package contains the development header files and libraries
@ -140,7 +146,6 @@ for developing applications that embed the MariaDB.
%package -n libmariadbclient18
Summary: Shared Libraries for MariaDB
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/Other
%description -n libmariadbclient18
@ -149,7 +154,6 @@ languages and applications need to dynamically load and use MariaDB.
%package -n libmariadbclient_r18
Summary: Shared Libraries for MariaDB
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/Other
%description -n libmariadbclient_r18
@ -157,7 +161,6 @@ This package contains the shared libraries (.so) which certain
languages and applications need to dynamically load and use MariaDB.
%package client
License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: Client for MariaDB
Group: Productivity/Databases/Clients
Provides: mysql-client = %{srv_vers}
@ -183,8 +186,8 @@ This package provides the translated error messages for the standalone
server daemon as well as the embedded server
%package bench
Requires: %{name}-client perl-DBD-mysql
License: SUSE-GPL-2.0-with-FLOSS-exception
Requires: %{name}-client
Requires: perl-DBD-mysql
Summary: Benchmarks for MariaDB
Group: Productivity/Databases/Tools
Provides: mysql-bench = %{srv_vers}
@ -205,12 +208,11 @@ the directory /usr/share/sql-bench after starting MariaDB.
%package debug-version
License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MariaDB with debug options turned on
Group: Productivity/Databases/Servers
Requires: %{name} = %{version}
Provides: mysql-debug = %{srv_vers}
Provides: %{name}-debug = %{srv_vers}
Provides: mysql-debug = %{srv_vers}
%if 0%{?use_extra_provides} > 0
Provides: %{extra_provides}-debug-verion = %{version}
Obsoletes: %{extra_provides}-debug-version < %{version}
@ -228,14 +230,13 @@ standard server. Read /usr/share/doc/packages/mysql/README.debug for
information on how to use the debug server.
%package test
License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: Testsuite for MariaDB
Group: Productivity/Databases/Servers
Requires: %{name} = %{version}
Requires: %{name}-client = %{version}
Requires: perl-DBD-mysql
Requires: %{name}-tools = %{version}
Requires: %{name}-bench = %{version}
Requires: %{name}-client = %{version}
Requires: %{name}-tools = %{version}
Requires: perl-DBD-mysql
Provides: mysql-test = %{srv_vers}
%if 0%{?use_extra_provides} > 0
Provides: %{extra_provides}-test = %{version}
@ -252,13 +253,13 @@ This package contains the test scripts and data for MariaDB.
To run the testsuite, run /usr/share/mysql-test/suse-test-run.
%package tools
License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MariaDB tools
Group: Productivity/Databases/Servers
Requires: perl-DBD-mysql
# make sure this package is installed when updating from 10.2 and older
Provides: mysql:/usr/bin/mysqlhotcopy mysql-client:/usr/bin/perror
Provides: mysql-client:/usr/bin/perror
Provides: mysql-tools = %{srv_vers}
Provides: mysql:/usr/bin/mysqlhotcopy
%if 0%{?use_extra_provides} > 0
Provides: %{extra_provides}-tools = %{version}
Obsoletes: %{extra_provides}-tools < %{version}
@ -278,7 +279,6 @@ applications with MariaDB.
%package -n libndbclient6
Summary: Shared Libraries for cluster client
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/Other
%description -n libndbclient6
@ -289,7 +289,6 @@ cluster.
%endif
%package ndb-storage
License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MariaDB - ndbcluster storage engine
Group: Productivity/Databases/Servers
Provides: mysql-ndb-storage = %{srv_vers}
@ -303,7 +302,6 @@ computers that should store ndbcluster table data.
%package ndb-management
License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MariaDB - ndbcluster storage engine management
Group: Productivity/Databases/Servers
Provides: mysql-ndb-management = %{srv_vers}
@ -316,7 +314,6 @@ It is necessary to have this package installed on at least
one computer in the cluster.
%package ndb-tools
License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MariaDB - ndbcluster storage engine basic tools
Group: Productivity/Databases/Servers
Provides: mysql-ndb-tools = %{srv_vers}
@ -327,7 +324,6 @@ Conflicts: otherproviders(mysql-ndb-tools)
This package contains ndbcluster storage engine basic tools.
%package ndb-extra
License: SUSE-GPL-2.0-with-FLOSS-exception
Summary: MariaDB - ndbcluster storage engine extra tools
Group: Productivity/Databases/Servers
Provides: mysql-ndb-extra = %{srv_vers}