summaryrefslogtreecommitdiff
path: root/cmake/cpack_rpm.cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge 10.0-galera into 10.1Sergei Golubchik2015-02-061-2/+2
|\
| * maria-10.0.16 mergeNirbhay Choubey2015-01-261-0/+1
| |\ | | | | | | | | | | | | bzr merge -r4588 maria/10.0
| * | MDEV-7470: MariaDB-Galera-server uses 'tar', but 'tar' isNirbhay Choubey2015-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | not in the dependency list Added tar to the dependency list.
| * | MDEV-7204: mariadb-galera-server el7 rpms packagingNirbhay Choubey2014-12-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issue, no mariadb-server in provides MDEV-7233: Fix issue with missing dependency socat when installing MariaDB-galera-server on RedhatEL/OracleEL/(Others?) RPM based * Added mariadb-server to "provides" for MariaDB Galera server package. (rpm) * Removed "socat" from MariaDB Galera server's mandatory dependency list. (rpm) * Moved "socat" from mandatory to optional dependency. (deb)
| * | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-1/+1
| |\ \
| * | | Added rsync to galera server's rpm dependency list.Nirbhay Choubey2014-05-291-2/+2
| | | |
| * | | MDEV#6211: MariaDB-Galera-server uses 'socat', but 'socat' isNirbhay Choubey2014-05-251-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not in the dependency list Added socat, grep, gawk, iproute, coreutils, findutils to the dependency list.
| * | | Merging changes from maria-5.5-galera andNirbhay Choubey2014-05-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | some test fixes. bzr merge -r3479..3493 maria-5.5-galera
| * | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-3/+7
| |\ \ \
| * | | | Merging deb/rpm script changes from maria-5.5-galera.Nirbhay Choubey2014-03-241-27/+128
| | | | |
| * | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-4/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and a number of fixes to make this buildable. Run also few short multi-master high conflict rate tests, with no issues
| * \ \ \ \ Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-6/+24
| |\ \ \ \ \
| * | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-30/+2
| | | | | | |
* | | | | | | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-311-0/+1
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | MDEV-6347 Build RHEL7 packagesSergei Golubchik2015-01-161-0/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | add "mysql-compat-server" alias to MariaDB-server package
* | | | | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .bzrignore VERSION cmake/plugin.cmake debian/dist/Debian/control debian/dist/Ubuntu/control mysql-test/r/join_outer.result mysql-test/r/join_outer_jcl6.result mysql-test/r/null.result mysql-test/r/old-mode.result mysql-test/r/union.result mysql-test/t/join_outer.test mysql-test/t/null.test mysql-test/t/old-mode.test mysql-test/t/union.test packaging/rpm-oel/mysql.spec.in scripts/mysql_config.sh sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_cond.cc sql/item_cmpfunc.h sql/lock.cc sql/sql_select.cc sql/sql_show.cc sql/sql_update.cc sql/sql_yacc.yy storage/innobase/buf/buf0flu.cc storage/innobase/fil/fil0fil.cc storage/innobase/include/srv0srv.h storage/innobase/lock/lock0lock.cc storage/tokudb/CMakeLists.txt storage/xtradb/buf/buf0flu.cc storage/xtradb/fil/fil0fil.cc storage/xtradb/include/srv0srv.h storage/xtradb/lock/lock0lock.cc support-files/mysql.spec.sh
| * | | | | MDEV-6886 - Add RHEL7 RPM layoutSergey Vojtovich2014-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Set proper alternative names on RHEL7: they should match Fedora names.
| * | | | | remove mariadb.pc file again, it cannot be added in a GA versionmariadb-5.5.40Sergei Golubchik2014-10-081-3/+3
| | | | | |
| * | | | | MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-configSergei Golubchik2014-10-021-3/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. move cflags/libs cleanup from mysql_config.sh (runtime) to for_client.cmake (build time). Include/library paths are still calculated at runtime (they depend on the location of mysql_config) 2. Use cleaned-up cflags/libs to generate mariadb.pc 3. remove obsolete @expansions@ from mysql_config (for variables that are never set in cmake files)
* | | | | MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-configSergei Golubchik2014-10-111-3/+3
| | | | |
* | | | | cleanup: galera merge, simple changesSergei Golubchik2014-10-011-1/+6
| | | | |
* | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-3/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged lp:maria/maria-10.0-galera up to revision 3879. Added a new functions to handler API to forcefully abort_transaction, producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These were added for future possiblity to add more storage engines that could use galera replication.
* | | | MDEV-6004 MariaDB init script fails to start (missing dependency on ↵Sergei Golubchik2014-04-081-3/+7
| | | | | | | | | | | | | | | | MariaDB-client in server RPM)
* | | | MDEV-5390 doesn't install on fedora if mysql is installed, part 2Sergei Golubchik2014-02-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On fedora: 1. provide/obsoleve mariadb-* packages 2. MariaDB-common conflicts with mariadb-libs (on filesystem level), but does not provide or obsolete it.
* | | | RPM:Sergei Golubchik2014-02-191-32/+93
| | | | | | | | | | | | | | | | | | | | | | | | * readability fixes * CPackRPM wrapper to fix property leakage between components (cmake bug 13248)
* | | | RPM: fix alternative provides/obsoletes - put the correct architecture and ↵Sergei Golubchik2014-02-171-6/+11
| |_|/ |/| | | | | | | | version
* | | MDEV-5250 doesn't install on fedora if mysql is installedSergei Golubchik2013-11-071-0/+2
| | | | | | | | | | | | when our package is to replace "mysql", it has both provide and obsolete it
* | | introduce sysconf2dir, install tokudb.conf there, both in rpm and debSergei Golubchik2013-09-101-4/+4
| |/ |/|
* | MDEV-4199 Installing postfix on CentOS 5.9 requires MariaDB-serverSergei Golubchik2013-05-131-6/+24
|/ | | | | | | | | to match distribution packages better: remove "mysql" from server.rpm Provides, add it to the shared.rpm Provides. fake provides that "mysql" and "mysql-libs" packages would've had. cleanup: remove auto-generated provides from the manual provides list.
* hack in dependencies to imitate mysql-*.rpm even betterSergei Golubchik2013-03-061-1/+1
|
* MDEV-4068 rpm scriptlet chown command dangerousSergei Golubchik2013-03-061-0/+1
| | | | | add --mysqld option to my_print_defaults change server-postin script to use that
* make rpm packages to respect CMAKE_INSTALL_PREFIXSergei Golubchik2013-02-081-14/+17
|
* more changes for fedora18Sergei Golubchik2013-01-291-0/+1
|
* fix 'compat' rpm for fedora18Sergei Golubchik2013-01-291-0/+1
|
* MDEV-3971 : problems installing MariaDB packages (conflicts with ↵Vladislav Vaintroub2013-01-251-2/+2
| | | | | | mysql-libs-5.5) FIx : make "shared" RPM obsolete/provide mysql-libs
* MDEV-3832 MariaDB conflicts with packages filesystem-3.1-2.fc18.i686 and ↵Sergei Golubchik2013-01-191-5/+24
| | | | | | | | jre-1.7.0_09-fcs.i586 on Fedora 18 fix the rpm packaging to work on Fedora18. Two problems: * conflicts on common directories with other packages. * more auto-generated requirements for mariadb-test.rpm
* RPM fixes:Sergei Golubchik2012-10-171-1/+1
| | | | | shared should provide libmysqlclient.so.18(libmysqlclient_16) too don't "use DBD::mysql" explicitly in mytop
* MDEV-3796 various RPM problemsSergei Golubchik2012-10-051-1/+4
| | | | | | | | | | | | | cmake/cpack_rpm.cmake: * mark all cnf files with %config(noreplace) * add the forgotten postun script sql/sys_vars.cc: 0 for a string variable means "no default. But datadir has the default value. support-files/rpm/server-postin.sh: * use mysqld --help to determine the correct datadir in the presence of my.cnf files (better than my_print_defaults, because it considers the correct group set). * Only create users, and chown/chmod if it's a fresh install, not an upgrade. * only run mysql_install_db if datadir does not exist
* MDEV-409 : /etc/my.cnf config file overwritten during RPM installation Vladislav Vaintroub2012-07-231-0/+1
| | | | Fix : use attribute %config(noreplace) for /etc/my.cnf , instead of (automatically generated) %config
* RPM packages should not obsolete themselves.Sergei Golubchik2012-05-291-5/+5
| | | | | Otherwise yum on fedora will not install them (rpm will, yum on centos and rhel will).
* MDEV-293 5.5 RPMs for RHEL6/CentOS6Sergei Golubchik2012-05-291-0/+31
| | | | | Build MariaDB-compat rpm by repackaging files from MariaDB-shared-5.3.*.rpm Or RHEL6/CentOS6 make all other MariaDB rpms depend on MariaDB-compat.
* create a new MariaDB-common.rpm that contains files needed both by the ↵Sergei Golubchik2012-05-251-9/+19
| | | | | | | | client and the server. use my.cnf includes to split one big my.cnf file in server and client parts. remove "Provides: mysql-libs" (doesn't help on CentOS 6)
* Building RPMs with CPackSergei Golubchik2012-05-221-0/+88
configure with cmake -DRPM=distro
View Lorry Controller Status