Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
2107ddff
Commit
2107ddff
authored
Mar 26, 2018
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevent having several spec files in source file tarball so that rpmbuild is happy.
parent
5108be84
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
CMakeLists.txt
build/CMakeLists.txt
+4
-2
qt5.spec
build/rpm/qt5.spec
+0
-0
build_qt_rpm
tools/build_qt_rpm
+1
-1
No files found.
build/CMakeLists.txt
View file @
2107ddff
...
...
@@ -20,7 +20,7 @@
#
############################################################################
if
(
NOT CPACK_PACKAGE_NAME
)
if
(
NOT CPACK_PACKAGE_NAME
)
set
(
CPACK_PACKAGE_NAME
"linphone"
)
endif
()
...
...
@@ -41,10 +41,12 @@ set(CPACK_SOURCE_IGNORE_FILES
"WORK"
"cmake_builder"
"submodules"
"qt5.spec"
"libmng.spec"
)
bc_project_build_version
(
${
PROJECT_VERSION
}
PROJECT_VERSION_BUILD
)
if
(
PROJECT_VERSION_BUILD
)
if
(
PROJECT_VERSION_BUILD
)
set
(
CPACK_PACKAGE_FILE_NAME
"
${
CPACK_PACKAGE_FILE_NAME
}
-
${
PROJECT_VERSION_BUILD
}
"
)
endif
()
...
...
build/rpm/qt5.spec
.in
→
build/rpm/qt5.spec
View file @
2107ddff
File moved
tools/build_qt_rpm
View file @
2107ddff
...
...
@@ -74,5 +74,5 @@ cd ..
mkdir
-p
${
RPM_FOLDER
}
/rpmbuild/
{
BUILD,RPMS,SOURCES,SPECS,SRPMS
}
tar
--transform
"s/^
${
REPO_FOLDER
}
/
${
RPM_NAME
}
/"
-czvf
${
RPM_FOLDER
}
/rpmbuild/SOURCES/
${
RPM_NAME
}
.tar.gz
${
REPO_FOLDER
}
/
rpmbuild
-bb
--define
"_topdir
$PWD
/
${
RPM_FOLDER
}
/rpmbuild"
build/rpm/qt5.spec
.in
rpmbuild
-bb
--define
"_topdir
$PWD
/
${
RPM_FOLDER
}
/rpmbuild"
build/rpm/qt5.spec
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