diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 87a1bd4ee..cb19d1260 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -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 () diff --git a/build/rpm/qt5.spec.in b/build/rpm/qt5.spec similarity index 100% rename from build/rpm/qt5.spec.in rename to build/rpm/qt5.spec diff --git a/tools/build_qt_rpm b/tools/build_qt_rpm index dfaf06f57..56fd29bde 100755 --- a/tools/build_qt_rpm +++ b/tools/build_qt_rpm @@ -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