From adb2660fef172a672e3b80edb88faf31d4e2e286 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 28 May 2016 16:07:24 +0000 Subject: [PATCH] - updated to 2016.04 (version from git log) --- Eyescale-CMake.spec | 11 ++++----- Eyescale-cmake.patch | 54 -------------------------------------------- 2 files changed, 4 insertions(+), 61 deletions(-) delete mode 100644 Eyescale-cmake.patch diff --git a/Eyescale-CMake.spec b/Eyescale-CMake.spec index b0d1356..87745ea 100644 --- a/Eyescale-CMake.spec +++ b/Eyescale-CMake.spec @@ -1,15 +1,13 @@ Summary: CMake common macros for Eyescale projects Summary(pl.UTF-8): Wspólne makra CMake dla projektów Eyescale Name: Eyescale-CMake -Version: 0 -%define snap 20141214 -%define gitref 217fc77e74fa316bcaea12dc0df2919c08ce2231 -Release: 0.%{snap}.1 +Version: 2016.04 +%define gitref 0e519bfbbf74bb30a17c75d5c4c4d0266f5d272b +Release: 1 License: BSD Group: Development/Tools Source0: https://github.com/Eyescale/CMake/archive/%{gitref}/Eyescale-CMake-%{gitref}.tar.gz -# Source0-md5: 6a8afcf8f1f96dad07ae9e163a1b6786 -Patch0: Eyescale-cmake.patch +# Source0-md5: b121851bcee76d6e99abdacf54a4512c URL: https://github.com/Eyescale/CMake/ Requires: cmake >= 2.8 BuildArch: noarch @@ -26,7 +24,6 @@ Collage czy Equalizer). %prep %setup -q -c %{__mv} CMake-* common -%patch0 -p1 %{__rm} common/.gitignore %{__mv} common/{CHANGES.md,LICENSE.txt,README.md} . diff --git a/Eyescale-cmake.patch b/Eyescale-cmake.patch deleted file mode 100644 index 7de42d2..0000000 --- a/Eyescale-cmake.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- CMake/common/CppcheckTargets.cmake.orig 2014-10-03 15:04:16.000000000 +0200 -+++ CMake/common/CppcheckTargets.cmake 2014-12-20 18:25:39.845494349 +0100 -@@ -83,6 +83,7 @@ - - get_target_property(_cppcheck_sources "${_name}" SOURCES) - set(_files) -+ if(_cppcheck_sources) - foreach(_source ${_cppcheck_sources}) - get_source_file_property(_cppcheck_lang "${_source}" LANGUAGE) - get_source_file_property(_cppcheck_loc "${_source}" LOCATION) -@@ -90,6 +91,7 @@ - list(APPEND _files "${_cppcheck_loc}") - endif() - endforeach() -+ endif() - - if(NOT _files) # nothing to check - return() ---- CMake/common/CpplintTargets.cmake.orig 2014-10-03 15:04:16.000000000 +0200 -+++ CMake/common/CpplintTargets.cmake 2014-12-20 17:39:11.122277997 +0100 -@@ -82,6 +82,7 @@ - get_target_property(_cpplint_sources "${_name}" SOURCES) - set(_files) - #set(_exclude_pattern ".*moc_.*\\.cxx|Buildyard/Build") -+ if(_cpplint_sources) - foreach(_source ${_cpplint_sources}) - get_source_file_property(_cpplint_lang "${_source}" LANGUAGE) - get_source_file_property(_cpplint_loc "${_source}" LOCATION) -@@ -89,6 +90,7 @@ - list(APPEND _files "${_cpplint_loc}") - endif("${_cpplint_lang}" MATCHES "CXX" AND NOT ${_cpplint_loc} MATCHES ${add_cpplint_EXCLUDE_PATTERN}) - endforeach(_source ${_cpplint_sources}) -+ endif() - - if(NOT _files) # nothing to check - return() ---- CMake/common/clangcheckTargets.cmake.orig 2014-10-03 15:04:16.000000000 +0200 -+++ CMake/common/clangcheckTargets.cmake 2014-12-20 13:41:11.706210588 +0100 -@@ -40,6 +40,7 @@ - set(_exclude_pattern ".*moc_.*\\.cxx$") # Qt moc files - - get_target_property(_clangcheck_sources "${_name}" SOURCES) -+ if(_clangcheck_sources) - set(_files) - foreach(_source ${_clangcheck_sources}) - get_source_file_property(_clangcheck_lang "${_source}" LANGUAGE) -@@ -50,6 +51,7 @@ - list(APPEND _files "${_clangcheck_loc}") - endif() - endforeach() -+ endif() - - if(NOT _files) # nothing to check - return() -- 2.44.0