Commit graph

417 commits

Author SHA1 Message Date
Jonathan Perkin
99b5ca1f20 Add SELinux checks from distribution-specific spec file, missed in
previous.

Convert some shell bits to standard 2-space indent, 80 columns, etc.
2010-06-01 10:24:38 +01:00
Jonathan Perkin
ba36de4f2e Differentiate between Oracle Enterprise Linux and Red Hat Enterprise Linux. 2010-05-28 13:56:57 +01:00
Jonathan Perkin
f9101d98b7 Revert back to new CMake names for audit_null/daemon_example plugins. 2010-05-12 16:32:31 +01:00
Jonathan Perkin
240176bfa3 Large number of changes to support building RPMs using CMake, along
with other merges from the old distribution-specific spec file.

 - update copyright notices

 - remove __os_install_post override, it was only necessary as a
   hack to build debuginfo packages - now that we no longer make
   them we can revert to the distribution macro which likely has
   other useful bits we might want

 - remove _unpackaged_files_terminate_build override, we want to
   know of any orphaned files

 - include native distribution support

 - no longer build separate debuginfo RPMs, instead just include
   debug/symbols in all binaries, which is more useful for support

 - include support for building commercial RPMs, requires a
   commercial source tree

 - remove cluster RPM support, we don't build them from this
   source tree

 - use CMake for building, and update package lists to match the
   new install layout/files.  Remove any options which were only
   useful for automake builds (e.g. yassl/zlib).

 - other minor cleanups
2010-05-12 12:46:23 +01:00
Joerg Bruehe
4b68b2d289 Merge the changes of the 5.5.3-m3 release build
back into the development branches.
2010-04-18 15:32:05 +02:00
Joerg Bruehe
8b79e6209c Add "--with-perfschema" to the configure options for RPMs. 2010-03-24 20:30:33 +01:00
Joerg Bruehe
81cbce56bb Some fixes developed during the build of 5.5.3-m3
about handling the debug plugin files,
also "ha_example.*" are dropped.
2010-03-24 20:01:01 +01:00
Magnus Blåudd
df1ed40b30 Merge in fix for bug#42589 2010-03-15 14:57:20 +01:00
Joerg Bruehe
3139b90494 Part of the fixes for bug#49022
Plugins included into bin release cannot be
    installed on debug version of server

Ensure that the plugin files of the debug build
get into the optimized tree, so that they find
their way into the final RPMs.


support-files/mysql.spec.sh:
  Use "make install" in the debug build tree to get the debug
  plugin files to a temporary location,
  then move them to "plugin/debug/" in the optimized build tree
  so that the install hook in "plugin/Makefile.am" forwards them
  into the final installation.
  
  This fixes bug#49022 for the generic RPMs.
  
  Unrelated:
  The plugin objects were listed twice in the file list,
  do a cleanup.
2010-03-10 14:36:27 +01:00
Alexander Nozdrin
c575b15a12 Manual merge from mysql-5.1.
Conflicts:
  - support-files/mysql.spec.sh
  - configure.in
2010-03-01 21:49:06 +03:00
Joerg Bruehe
a8c21d271f Spec file for RPMs:
Now that Oracle has legally acquired Sun, change the copyright owner
and the vendor.

support-files/mysql.spec.sh:
  Introduce a new macro "vendor 2" and set it to Sun,
  so that we can have a whole series of vendors if such events continue.
2010-03-01 11:42:44 +01:00
Alexander Nozdrin
e7e1a36755 Manual merge from mysql-trunk. 2010-02-23 17:06:06 +03:00
Alexey Kopytov
0afa209018 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
Joerg Bruehe
688811b913 Fix a bug in the RPM spec file:
A "%define" is no shell command, so it must not be the
only line in the "then" or "else" branch of an "if".

Add a ':' line to make the branch non-empty.
2010-02-17 11:13:15 +01:00
Joerg Bruehe
c25ea41c5a Upmerge the RPM spec file correction: "release" was missing. 2010-02-12 17:26:22 +01:00
Joerg Bruehe
b7302312fe Correction: The "release" setting had got lost in the RPM spec file. 2010-02-12 17:23:22 +01:00
Joerg Bruehe
1c15c2b74a Upmerge the spec file alignment from 5.1 to 5.5,
no other functional changes.
2010-02-12 13:20:42 +01:00
Joerg Bruehe
2813cd5899 Upmerge changes done to the generic spec file in 5.0 to 5.1,
this includes a major whitespace (formatting) alignment
and sequence changes to better agree with other spec files.

Further changes:
- All features are controlled by "%define" set from call
  options or builtin.
- "bundled zlib" is on by default.
- "with libgcc" is controlled by runtime detection of gcc.
- Handling of "CFLAGS" and "CXXFLAGS" is more concentrated.
- Several missing man pages were added.
2010-02-11 21:33:48 +01:00
Joerg Bruehe
a835c80dec Cleanup in the RPM spec file:
Get rid of trailing blanks.
2010-02-02 17:53:52 +01:00
Joerg Bruehe
219422f346 Spec file for "generic" RPMs:
Cleanup, formatting improvements,
vendor is Sun (since MySQL AB was bought).

Backport the change so that RPM doesn't magically
create a dependency on "Perl-DBI".
2010-02-02 16:28:59 +01:00
Alexander Nozdrin
0835775b7c Manual merge from mysql-trunk.
Conflicts:
  - support-files/mysql.spec.sh
2010-01-18 23:15:17 +03:00
Alexey Kopytov
0a5b406fc5 Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:

Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/sql_acl.cc
Text conflict in sql/sql_servers.cc
Text conflict in sql/sql_update.cc
Text conflict in support-files/mysql.spec.sh
2010-01-15 14:26:53 +03:00
Georgi Kodinov
90274e3709 merge 2010-01-13 12:47:42 +02:00
Georgi Kodinov
6e72f4171f merge 5.1-main to 5.1-bugteam 2010-01-13 12:28:42 +02:00
Joerg Bruehe
c591ee5923 Upmerge the changes for RPM versioning/naming from 5.0 to 5.1.
This includes "MYSQL_U_SCORE_VERSION" in "configure.in".
2010-01-12 12:57:51 +01:00
Joerg Bruehe
71465af9d4 Implement the change of RPM versioning and file naming:
- "release" starts from 1
- "level" ("m2", "rc", ...) is included in the RPM version.
2010-01-12 12:41:18 +01:00
Joerg Bruehe
3c9322e73f Implement the change of RPM versioning and file naming:
- "release" starts from 1
- "level" ("m2", "rc", ...) is included in the RPM version.
2010-01-11 19:23:36 +01:00
Kent Boortz
71061de025 Removed unwanted Perl DBI dependency 2009-12-30 23:06:14 +01:00
Joerg Bruehe
3be15fa67c Remove the "fix_privilege_tables" manual from the RPM spec file,
there is none in 5.5.
2009-12-23 22:42:44 +01:00
Joerg Bruehe
f7c24a2e20 The "semisync" plugin file name has lost its introductory "lib",
adapt the file lists for the subpackages.

This is a part missing from the fix for bug#48351.
2009-12-23 13:06:41 +01:00
Joerg Bruehe
7a84896d71 Change RPM file naming:
- Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
- Release counts from 1, not 0.

This is done for both the "generic" RPMs and the "shared-compat" ones.
It includes introducing a new version variable "MYSQL_U_SCORE_VERSION"
in "configure.in", where the dash is replaced by an underscore:
  5.5.1-m2   ->  5.5.1_m2
2009-12-22 23:22:42 +01:00
MySQL Build Team
4746239b37 Handle the "semisync" plugin in
- binary distributions for Windows,
- "generic" RPM packages.
2009-11-26 19:55:33 +01:00
MySQL Build Team
63a044f31f Remove erroneous traces of the InnoDB plugin (that is 5.1 only)
from the "spec" file for generic RPMs.
2009-11-18 11:42:20 +01:00
MySQL Build Team
1da38990cb Change the control structures which the RPM spec file uses to govern
the inclusion of a separate malloc library (used for Google's "tcmalloc")
to follow the pattern used for other optional parts.

This is still experimental, there are some "rpmbuild" issues around this.
2009-11-17 17:19:00 +01:00
Alexander Nozdrin
2c3d501189 Automerge from mysql-trunk-merge. 2009-10-19 22:41:18 +04:00
Timothy Smith
df129b749d Merge from mysql-5.4.3-beta-release 2009-10-16 20:19:36 +02:00
Timothy Smith
d87592ec52 Update _libdir/plugin to _libdir/mysql/plugin in a few places 2009-10-16 19:59:23 +02:00
Magnus Blåudd
53653dcef0 Bug#42589 mysql_fix_privilege_tables.sh to be deprecated
- Remove remnants of "mysql_fix_privilege_tables.sh"(again)
2009-10-07 15:42:16 +02:00
Alexander Nozdrin
0191eb8d3e Backport WL#4085: Merge revno:2476.1338.9 from 6.0. 2009-10-06 14:53:47 +04:00
unknown
4188fcbd55 make_binary_distribution and mysql.spec: add options to copy a shared library, for use by mysqld_safe, into pkglibdir during package creation 2009-09-29 08:58:32 +02:00
Alexander Nozdrin
ede2edd19b Merge from mysql-5.1. 2009-09-19 13:07:51 +04:00
Joerg Bruehe
55eb4962c2 Merge the changes done for 5.4.2-beta into "trunk". 2009-09-09 15:21:27 +02:00
Joerg Bruehe
eb26de2356 The former "Instance Manager" (program "mysqlmanager")
is not being built in 5.4.2-beta,
so it cannot be included in a RPM:
Remove both the program and the man page from the spec file.

This patch was applied during the build of 5.4.2-beta.
2009-09-08 15:48:55 +02:00
Jonathan Perkin
0644b0acfa Merge from mysql-5.1.38-release 2009-09-03 01:48:06 +02:00
Joerg Bruehe
905d715f10 Merge 5.1 up into 5.4-build ("trunk"). 2009-08-29 21:26:00 +02:00
Jonathan Perkin
74092a8e5b Disable ftexample to match other packages, ride previous changelog entry. 2009-08-25 13:00:23 +02:00
Jonathan Perkin
c2bd07ca9c Tidy previous, put example storage engine back as it's used by tests. 2009-08-24 14:06:01 +02:00
Jonathan Perkin
8a2454f8e9 Apply changes from mysql-5.1.38-release clone:
- Add conditionals for bundled zlib and innodb plugin.
 - Apply patch from bug#46834 to install the test suite in RPMs.
 - Add plugins to RPMs.  Disable example plugins.
2009-08-24 10:13:34 +01:00
Jonathan Perkin
df91ff571b Add conditionals for bundled zlib and innodb plugin 2009-08-24 10:50:04 +02:00
Jonathan Perkin
769d9f3803 Apply patch from bug#46834 to install the test suite in RPMs. 2009-08-21 13:58:33 +02:00