Merge pull request #40 from libyui/huha-cmake

Adapted to New Libyui CMake Build Environment

CMakeLists.txt

@@ -74,13 +74,14 @@ SET (CPACK_SOURCE_IGNORE_FILES
 
 INCLUDE(CPack)
 
-#FIND_PACKAGE(SWIG REQUIRED)
 MESSAGE(STATUS "Looking modules in ${CMAKE_MODULE_PATH}")
 
 FIND_PACKAGE(SWIG REQUIRED)
-FIND_PACKAGE(Libyui REQUIRED)
+
+FIND_LIBRARY( LIBYUI NAMES yui REQUIRED )
 
 SET( LIBYUI_LIBRARY yui )
+SET( LIBYUI_INCLUDE_DIR /usr/include )
 
 IF(WITH_MGA)
 FIND_PACKAGE(Libyui-mga REQUIRED)

VERSION.cmake

@@ -1,3 +1,3 @@
-SET(VERSION_MAJOR "2")
-SET(VERSION_MINOR "1")
-SET(VERSION_PATCH "1")
+SET(VERSION_MAJOR "4")
+SET(VERSION_MINOR "0")
+SET(VERSION_PATCH "0")

package/libyui-bindings.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Feb 15 16:52:13 UTC 2021 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Adapted to new libyui cmake build environment (bsc#1181653)
+- Renamed Makefile.cvs to Makefile.repo
+- 4.0.0
+
 -------------------------------------------------------------------
 Wed Nov 25 13:45:23 UTC 2020 - Stefan Hundhammer <shundhammer@suse.com>
 

package/libyui-bindings.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libyui-bindings
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2020-21 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 
 Name:           libyui-bindings
-Version:        2.1.1
+Version:        4.0.0
 Release:        0
 Summary:        Bindings for libyui
 License:        LGPL-2.1-only OR LGPL-3.0-only
@@ -27,8 +27,8 @@ URL:            https://github.com/libyui/libyui-bindings
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
-# YMenuBar / libyui14
-BuildRequires:  libyui-devel >= 3.12.0
+# New cmake build environment
+BuildRequires:  libyui-devel >= 4.0.0
 BuildRequires:  perl
 BuildRequires:  python3-devel
 BuildRequires:  ruby-devel