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
017195c3
Commit
017195c3
authored
Sep 04, 2016
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix RPM builds
to specify correct VENDOR and LICENSE for C/C
parent
85828b8f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
0 deletions
+30
-0
cmake/CPackRPM.cmake
cmake/CPackRPM.cmake
+16
-0
cmake/cpack_rpm.cmake
cmake/cpack_rpm.cmake
+14
-0
No files found.
cmake/CPackRPM.cmake
View file @
017195c3
...
...
@@ -2,12 +2,28 @@
# Wrapper for CPackRPM.cmake
#
macro
(
set_from_component WHAT
)
set
(
orig_CPACK_RPM_PACKAGE_
${
WHAT
}
${
CPACK_RPM_PACKAGE_
${
WHAT
}}
)
if
(
CPACK_RPM_
${
CPACK_RPM_PACKAGE_COMPONENT
}
_PACKAGE_
${
WHAT
}
)
set
(
CPACK_RPM_PACKAGE_
${
WHAT
}
${
CPACK_RPM_
${
CPACK_RPM_PACKAGE_COMPONENT
}
_PACKAGE_
${
WHAT
}}
)
endif
()
endmacro
()
macro
(
restore WHAT
)
set
(
CPACK_RPM_PACKAGE_
${
WHAT
}
${
orig_CPACK_RPM_PACKAGE_
${
WHAT
}}
)
endmacro
()
set_from_component
(
LICENSE
)
set_from_component
(
VENDOR
)
# load the original CPackRPM.cmake
set
(
orig_CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
)
unset
(
CMAKE_MODULE_PATH
)
include
(
CPackRPM
)
set
(
CMAKE_MODULE_PATH
${
orig_CMAKE_MODULE_PATH
}
)
restore
(
LICENSE
)
restore
(
VENDOR
)
# per-component cleanup
foreach
(
_RPM_SPEC_HEADER URL REQUIRES SUGGESTS PROVIDES OBSOLETES PREFIX CONFLICTS AUTOPROV AUTOREQ AUTOREQPROV
)
unset
(
TMP_RPM_
${
_RPM_SPEC_HEADER
}
)
...
...
cmake/cpack_rpm.cmake
View file @
017195c3
...
...
@@ -48,6 +48,20 @@ MariaDB bug reports should be submitted through https://jira.mariadb.org
"
)
SET
(
CPACK_RPM_shared_PACKAGE_VENDOR
"MariaDB Corporation Ab"
)
SET
(
CPACK_RPM_shared_PACKAGE_LICENSE
"LGPLv2.1"
)
SET
(
CPACK_RPM_shared_PACKAGE_SUMMARY
"LGPL MariaDB client library"
)
SET
(
CPACK_RPM_shared_PACKAGE_DESCRIPTION
"
This is LGPL MariaDB client library that can be used to connect to MySQL
or MariaDB.
This code is based on the LGPL libmysql client library from MySQL 3.23
and PHP's mysqlnd extension.
This product includes PHP software, freely available from
<http://www.php.net/software/>
"
)
SET
(
CPACK_RPM_SPEC_MORE_DEFINE
"
%define mysql_vendor
${
CPACK_PACKAGE_VENDOR
}
%define mysqlversion
${
MYSQL_NO_DASH_VERSION
}
...
...
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