Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
b0f6cae1
Commit
b0f6cae1
authored
Oct 19, 2011
by
Joerg Bruehe
Browse files
Options
Browse Files
Download
Plain Diff
Merge the changes of 5.5.17 back into main 5.5
parents
c2e40985
24e6ba6d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
man/CMakeLists.txt
man/CMakeLists.txt
+9
-1
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+5
-2
No files found.
man/CMakeLists.txt
View file @
b0f6cae1
# Copyright (c) 2006, 201
0
, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2006, 201
1
, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
...
...
@@ -16,15 +16,23 @@
# Copy man pages
FILE
(
GLOB MAN1_FILES *.1
)
FILE
(
GLOB MAN1_EXCLUDE make_win_bin_dist.1
)
FILE
(
GLOB MAN1_NDB ndb*.1
)
FILE
(
GLOB MAN8_FILES *.8
)
FILE
(
GLOB MAN8_NDB ndb*.8
)
IF
(
MAN1_FILES
)
IF
(
MAN1_EXCLUDE
)
LIST
(
REMOVE_ITEM MAN1_FILES
${
MAN1_EXCLUDE
}
)
ENDIF
()
IF
(
MAN1_NDB
)
LIST
(
REMOVE_ITEM MAN1_FILES
${
MAN1_NDB
}
)
ENDIF
()
INSTALL
(
FILES
${
MAN1_FILES
}
DESTINATION
${
INSTALL_MANDIR
}
/man1
COMPONENT ManPages
)
ENDIF
()
IF
(
MAN8_FILES
)
IF
(
MAN8_NDB
)
LIST
(
REMOVE_ITEM MAN8_FILES
${
MAN8_NDB
}
)
ENDIF
()
INSTALL
(
FILES
${
MAN8_FILES
}
DESTINATION
${
INSTALL_MANDIR
}
/man8
COMPONENT ManPages
)
ENDIF
()
support-files/mysql.spec.sh
View file @
b0f6cae1
...
...
@@ -1019,7 +1019,6 @@ echo "=====" >> $STATUS_HISTORY
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/replace.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/resolve_stack_dump.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/resolveip.1
*
%doc %attr
(
644, root, man
)
%
{
_mandir
}
/man1/mysql_plugin.1
*
%ghost %config
(
noreplace,missingok
)
%
{
_sysconfdir
}
/my.cnf
...
...
@@ -1037,7 +1036,6 @@ echo "=====" >> $STATUS_HISTORY
%attr
(
755, root, root
)
%
{
_bindir
}
/mysql_setpermission
%attr
(
755, root, root
)
%
{
_bindir
}
/mysql_tzinfo_to_sql
%attr
(
755, root, root
)
%
{
_bindir
}
/mysql_upgrade
%attr
(
755, root, root
)
%
{
_bindir
}
/mysql_plugin
%attr
(
755, root, root
)
%
{
_bindir
}
/mysql_zap
%attr
(
755, root, root
)
%
{
_bindir
}
/mysqlbug
%attr
(
755, root, root
)
%
{
_bindir
}
/mysqld_multi
...
...
@@ -1148,6 +1146,11 @@ echo "=====" >> $STATUS_HISTORY
# merging BK trees)
##############################################################################
%changelog
*
Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
- Fix duplicate mentioning of
"mysql_plugin"
and its manual page,
it is better to keep alphabetic order
in
the files list
(
merging!
)
.
*
Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
- Let the RPM capabilities
(
"obsoletes"
etc
)
ensure that an upgrade may replace
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment