[packages/Eyescale-CMake] - fix install libdir - fix files - rel 2

[baggins]

commit aed56f0831d4e50c15deff812dc84812bdcce53e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Apr 14 16:03:23 2017 +0200

    - fix install libdir
    - fix files
    - rel 2

 Eyescale-CMake.spec |  8 ++++----
 libdir.patch        | 23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/Eyescale-CMake.spec b/Eyescale-CMake.spec
index ae5b58a..29db735 100644
--- a/Eyescale-CMake.spec
+++ b/Eyescale-CMake.spec
@@ -2,7 +2,7 @@ Summary:	CMake common macros for Eyescale projects
 Summary(pl.UTF-8):	Wspólne makra CMake dla projektów Eyescale
 Name:		Eyescale-CMake
 Version:	2016.12
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Tools
 Source0:	https://github.com/Eyescale/CMake/archive/%{version}/%{name}-%{version}.tar.gz
@@ -27,10 +27,10 @@ Collage czy Equalizer).
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/Eyescale-CMake/common
+install -d $RPM_BUILD_ROOT%{_datadir}/Eyescale-CMake
 
-cp -a * $RPM_BUILD_ROOT%{_datadir}/Eyescale-CMake/common
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/Eyescale-CMake/common/{CHANGES.md,LICENSE.txt,README.md}
+cp -a * $RPM_BUILD_ROOT%{_datadir}/Eyescale-CMake
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/Eyescale-CMake/{CHANGES.md,LICENSE.txt,README.md}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/libdir.patch b/libdir.patch
index 2b93c2b..6ef5f7d 100644
--- a/libdir.patch
+++ b/libdir.patch
@@ -20,3 +20,26 @@
    endif()
    if(CMAKE_OSX_DEPLOYMENT_TARGET)
      set(COMMON_OSX_TARGET_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
+--- CMake-2016.12/CommonLibrary.cmake~	2016-12-05 15:54:16.000000000 +0100
++++ CMake-2016.12/CommonLibrary.cmake	2017-04-14 16:00:11.264391317 +0200
+@@ -158,16 +158,16 @@
+       # CommonPackageConfig.cmake
+       if(${NAME}_OMIT_EXPORT)
+         install(TARGETS ${LibName}
+-          ARCHIVE DESTINATION lib COMPONENT dev
++          ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT dev
+           RUNTIME DESTINATION bin COMPONENT lib
+-          LIBRARY DESTINATION lib COMPONENT lib
++          LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib
+           INCLUDES DESTINATION include)
+       else()
+         install(TARGETS ${LibName}
+           EXPORT ${PROJECT_NAME}Targets
+-          ARCHIVE DESTINATION lib COMPONENT dev
++          ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT dev
+           RUNTIME DESTINATION bin COMPONENT lib
+-          LIBRARY DESTINATION lib COMPONENT lib
++          LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib
+           INCLUDES DESTINATION include)
+       endif()
+     endif()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Eyescale-CMake.git/commitdiff/aed56f0831d4e50c15deff812dc84812bdcce53e