Accepting request 690385 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/690385
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rttr?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2019-04-02 07:23:05 +00:00 committed by Git OBS Bridge
commit 10f70a6385
3 changed files with 67 additions and 2 deletions

View File

@ -0,0 +1,55 @@
From fbeeca016a8d983ef2dd46a807859481693ad7f8 Mon Sep 17 00:00:00 2001
From: Seyyed Soroosh Hosseinalipour <soorosh_abi@hotmail.com>
Date: Wed, 20 Mar 2019 16:16:45 +0330
Subject: [PATCH] Remove OWNER_READ permission from cmake files. (fixes #147)
---
CMake/config.cmake | 3 +--
CMake/utility.cmake | 2 +-
doc/CMakeLists.txt | 6 ++----
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/CMake/config.cmake b/CMake/config.cmake
index a7181991..a4e2e012 100644
--- a/CMake/config.cmake
+++ b/CMake/config.cmake
@@ -171,6 +171,5 @@ if (BUILD_INSTALLER)
COMPONENT Devel)
install(FILES "${LICENSE_FILE}" "${README_FILE}"
- DESTINATION ${RTTR_ADDITIONAL_FILES_INSTALL_DIR}
- PERMISSIONS OWNER_READ)
+ DESTINATION ${RTTR_ADDITIONAL_FILES_INSTALL_DIR})
endif()
diff --git a/CMake/utility.cmake b/CMake/utility.cmake
index 8dda62eb..8e7a0c63 100644
--- a/CMake/utility.cmake
+++ b/CMake/utility.cmake
@@ -165,7 +165,7 @@ function(loadFolder FOLDER _HEADER_FILES _SOURCE_FILES)
getNameOfDir(CMAKE_CURRENT_SOURCE_DIR DIRNAME)
if (${shouldInstall})
if (NOT ${FULL_HEADER_PATH} MATCHES ".*_p.h$") # we don't want to install header files which are marked as private
- install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}" PERMISSIONS OWNER_READ)
+ install(FILES ${FULL_HEADER_PATH} DESTINATION "include/${DIRNAME}/${REL_PATH}")
endif()
endif()
endforeach()
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index bacb2802..a92d6428 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -132,12 +132,10 @@ set_target_properties(doc PROPERTIES FOLDER "Documentation")
install(DIRECTORY "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_CUSTOM_HTML_DIR}"
DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}"
- PATTERN "*.*"
- PERMISSIONS OWNER_READ)
+ PATTERN "*.*")
install(FILES "${DOXYGEN_OUTPUT_DIRECTORY}/${DOXYGEN_INDEX_FILE}"
- DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}"
- PERMISSIONS OWNER_READ)
+ DESTINATION "${DOXYGEN_DOC_INSTALL_DIR}")
#########################################################################################

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 29 11:27:35 UTC 2019 - Luca Beltrame <lbeltrame@kde.org>
- Add patch to fix wrong permissions of headers (only readable
by root once installed; gh#rttrorg/rttr#147):
* fix-include-permissions.patch
-------------------------------------------------------------------
Fri Mar 15 07:58:36 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
@ -13,7 +20,7 @@ Wed Jan 16 11:22:54 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
-------------------------------------------------------------------
Thu Jun 21 22:43:53 UTC 2018 - dan.weatherill@cantab.net
- fix incorrect permissions in -devel package installed files
- fix incorrect permissions in -devel package installed files
-------------------------------------------------------------------
Tue Jun 19 00:20:24 UTC 2018 - dan.weatherill@cantab.net
@ -26,4 +33,4 @@ Tue Jun 19 00:20:24 UTC 2018 - dan.weatherill@cantab.net
Thu Jul 27 22:30:46 UTC 2017 - dan.weatherill@cantab.net
- initial package from upstream source (0.9.5)
- patch for correcting buildsystem installation locations
- patch for correcting buildsystem installation locations

View File

@ -32,6 +32,8 @@ Patch1: cmake_install_dir.patch
Patch2: doxygen_remove_date_time.patch
#PATCH-FIX-OPENSUSE skip_json_example.patch fix compile error (https://github.com/rttrorg/rttr/issues/224)
Patch3: skip_json_example.patch
# PATCH-FIX-OPENSUSE fix-include-permissions.patch fix wrong permissions of headers (https://github.com/rttrorg/rttr/issues/147)
Patch4: fix-include-permissions.patch
BuildRequires: cmake
BuildRequires: dos2unix
BuildRequires: doxygen
@ -50,6 +52,7 @@ library itself, which is written in C++.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
find . -type f -exec chmod a-x "{}" +