/[packages]/cauldron/mariadb/current/SPECS/mariadb.spec
ViewVC logotype

Diff of /cauldron/mariadb/current/SPECS/mariadb.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 227543 by alien, Thu Mar 29 22:44:51 2012 UTC revision 230190 by alien, Tue Apr 10 23:50:42 2012 UTC
# Line 53  Line 53 
53  %define muser   mysql  %define muser   mysql
54  Summary:        A very fast and reliable SQL database engine  Summary:        A very fast and reliable SQL database engine
55  Name:           mariadb  Name:           mariadb
56  Version:        5.5.22  Version:        5.5.23
57  Release:        %mkrel 0.20120329.rc  Release:        %mkrel 1
58  Group:          Databases  Group:          Databases
59  License:        GPLv2 with exceptions  License:        GPLv2 with exceptions
60  URL:            http://mariadb.org/  URL:            http://mariadb.org/
# Line 72  Patch1:        mariadb-5.5-errno.patch Line 72  Patch1:        mariadb-5.5-errno.patch
72  Patch2:         mariadb-5.5-strmov.patch  Patch2:         mariadb-5.5-strmov.patch
73  Patch3:         mariadb-5.5-install-test.patch  Patch3:         mariadb-5.5-install-test.patch
74  Patch4:         mysql-expired-certs.patch  Patch4:         mysql-expired-certs.patch
 # filed upstream: https://bugs.launchpad.net/maria/+bug/886368  
 Patch5:         mariadb-5.5-stack-guard.patch  
75  Patch7:         mariadb-5.5-versioning.patch  Patch7:         mariadb-5.5-versioning.patch
76  Patch8:         mariadb-5.5-dubious-exports.patch  Patch8:         mariadb-5.5-dubious-exports.patch
 # filed upstream: https://bugs.launchpad.net/maria/+bug/886476  
 Patch9:         mariadb-5.5-disable-test.patch  
 # filed upstream: https://bugs.launchpad.net/maria/+bug/886479  
 Patch10:        mariadb-5.5-plugin-bool.patch  
77  Patch12:        mysql-openssl-test.patch  Patch12:        mysql-openssl-test.patch
 # filed upstream: https://bugs.launchpad.net/maria/+bug/886484  
 Patch13:        mariadb-5.5-mysqld-nowatch.patch  
78    
79  # mandriva patches  # mandriva patches
80  Patch101:       mariadb-5.5-logrotate.patch  Patch101:       mariadb-5.5-logrotate.patch
# Line 91  Patch103:      mariadb-5.5-mysql_upgrade-exit Line 83  Patch103:      mariadb-5.5-mysql_upgrade-exit
83  Patch106:       mariadb-5.5-hotcopy.patch  Patch106:       mariadb-5.5-hotcopy.patch
84  Patch107:       mariadb-5.5-mysql_install_db-quiet.patch  Patch107:       mariadb-5.5-mysql_install_db-quiet.patch
85    
 # mageia patches  
 # (ahmad) add patch to fix some header files location (hint from Mandriva)  
 # filed upstream: https://bugs.launchpad.net/maria/+bug/886550  
 Patch110:       mariadb-5.5-fix-headers-location.patch  
   
86  Requires(post): rpm-helper  Requires(post): rpm-helper
87  Requires(preun): rpm-helper  Requires(preun): rpm-helper
88  Requires(pre): rpm-helper  Requires(pre): rpm-helper
# Line 113  Provides:      mysql = %{version}-%{release} Line 100  Provides:      mysql = %{version}-%{release}
100  Obsoletes:      mysql < 5.5.18  Obsoletes:      mysql < 5.5.18
101  Obsoletes:      %{libmariadbservices} < 5.5.18-0.3194.20111227.1  Obsoletes:      %{libmariadbservices} < 5.5.18-0.3194.20111227.1
102  Obsoletes:      %{libmysqlservices} < 5.5.18  Obsoletes:      %{libmysqlservices} < 5.5.18
103    Conflicts:      %{name}-extra%{_isa} < %{version}-%{release}
104    Conflicts:      %{name}-feedback%{_isa} < %{version}-%{release}
105    Conflicts:      %{name}-obsolete%{_isa} < %{version}-%{release}
106  Suggests:       %{name}-extra%{_isa}  Suggests:       %{name}-extra%{_isa}
107  BuildRequires:  bison  BuildRequires:  bison
108  BuildRequires:  cmake  BuildRequires:  cmake
# Line 184  MariaDB so that people who used to use m Line 174  MariaDB so that people who used to use m
174  Summary:        MariaDB feedback storage engine  Summary:        MariaDB feedback storage engine
175  Group:          System/Servers  Group:          System/Servers
176  Requires:       %{name}-common-core%{_isa} >= %{version}-%{release}  Requires:       %{name}-common-core%{_isa} >= %{version}-%{release}
177    Conflicts:      %{name}-common-core%{_isa} < %{version}-%{release}
178    
179  %description    feedback  %description    feedback
180  MariaDB feedback storage engine submits feedback about your mariadb server.  MariaDB feedback storage engine submits feedback about your mariadb server.
# Line 193  Results can be seen on http://mariadb.or Line 184  Results can be seen on http://mariadb.or
184  Summary:        MariaDB extra storage engines  Summary:        MariaDB extra storage engines
185  Group:          System/Servers  Group:          System/Servers
186  Requires:       %{name}-common-core%{_isa} >= %{version}-%{release}  Requires:       %{name}-common-core%{_isa} >= %{version}-%{release}
187    Conflicts:      %{name}-common-core%{_isa} < %{version}-%{release}
188    
189  %description    extra  %description    extra
190  MariaDB oqgraph and sphinx storage engines.  MariaDB oqgraph and sphinx storage engines.
# Line 201  MariaDB oqgraph and sphinx storage engin Line 193  MariaDB oqgraph and sphinx storage engin
193  Summary:        MariaDB obsolete storage engines  Summary:        MariaDB obsolete storage engines
194  Group:          System/Servers  Group:          System/Servers
195  Requires:       %{name}-common-core%{_isa} >= %{version}-%{release}  Requires:       %{name}-common-core%{_isa} >= %{version}-%{release}
196    Conflicts:      %{name}-common-core%{_isa} < %{version}-%{release}
197  Conflicts:      mysql-core < 5.5.18  Conflicts:      mysql-core < 5.5.18
198    
199  %description    obsolete  %description    obsolete
# Line 502  ln -s %{_bindir}/my_safe_process %{build Line 495  ln -s %{_bindir}/my_safe_process %{build
495  # mysql client statically built against a local embedded library, pretty useless  # mysql client statically built against a local embedded library, pretty useless
496  rm -f %{buildroot}%{_bindir}/mysql_embedded  rm -f %{buildroot}%{_bindir}/mysql_embedded
497    
498  # this command enables plugins, but needs ini file + configuration in my.cnf before executing  # this command enables plugins, but needs ini file + configuration in my.cnf
499  # and oh yeah, mysql must be stopped... => useless  # before executing... and oh yeah, mysql must be stopped... => useless
500  rm -f %{buildroot}%{_bindir}/mysql_plugin  # however, apparently tests seem to want it, even thought they don't use it.
501    #rm -f %{buildroot}%{_bindir}/mysql_plugin
502  rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini  rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
503    
504  # remove more useless plugins  # remove more useless plugins
# Line 753  fi Line 747  fi
747  %{_bindir}/mysql_fix_extensions  %{_bindir}/mysql_fix_extensions
748  %{_bindir}/mysqlhotcopy  %{_bindir}/mysqlhotcopy
749  %{_bindir}/mysql_install_db  %{_bindir}/mysql_install_db
750    %{_bindir}/mysql_plugin
751  %{_bindir}/mysql_secure_installation  %{_bindir}/mysql_secure_installation
752  %{_bindir}/mysql_setpermission  %{_bindir}/mysql_setpermission
753  %{_bindir}/mysqltest  %{_bindir}/mysqltest
Legend:
Removed from v.227543  
changed lines
  Added in v.230190
  ViewVC Help
Powered by ViewVC 1.1.30