[kodi-pvr-vbox] Improve compatibility with new CMake macro
by Leigh Scott
commit 1912a7cf03ccab15a885d466853d8ab116258872
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:56:13 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-vbox.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/kodi-pvr-vbox.spec b/kodi-pvr-vbox.spec
index 3010a7c..b7b61c5 100644
--- a/kodi-pvr-vbox.spec
+++ b/kodi-pvr-vbox.spec
@@ -2,6 +2,8 @@
%global kodi_version 18.0
%global kodi_codename Leia
+%undefine __cmake_in_source_build
+
Name: kodi-%(tr "." "-" <<<%{kodi_addon})
Version: 4.7.0
Release: 2%{?dist}
@@ -15,7 +17,7 @@ Patch0: %{name}-4.7.0-use_external_tinyxml2.patch
# Fix build with tinyxml2 >= 6.0.0
Patch1: %{name}-4.3.1-tinyxml2_6.patch
-BuildRequires: cmake
+BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
BuildRequires: kodi-platform-devel >= %{kodi_version}
@@ -36,12 +38,12 @@ rm -r lib/tinyxml2/
%build
-%cmake .
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
%files
4 years, 3 months
[kodi-pvr-stalker] Improve compatibility with new CMake macro
by Leigh Scott
commit 3b9bc819eaaae2c0ef3ff2ae8fa94174c8d3e0a8
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:54:34 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-stalker.spec | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/kodi-pvr-stalker.spec b/kodi-pvr-stalker.spec
index ab3eaff..1716cc9 100644
--- a/kodi-pvr-stalker.spec
+++ b/kodi-pvr-stalker.spec
@@ -1,10 +1,9 @@
-# Use old cmake macro
-%global __cmake_in_source_build 1
-
%global kodi_addon pvr.stalker
%global kodi_version 18.0
%global kodi_codename Matrix
+%undefine __cmake_in_source_build
+
Name: kodi-%(tr "." "-" <<<%{kodi_addon})
Version: 6.0.0
Release: 1%{?dist}
@@ -41,12 +40,12 @@ ExcludeArch: %{power64} ppc64le
%build
# https://gitlab.kitware.com/cmake/cmake/issues/17555#note_355574
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-%cmake3 .
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
%files
4 years, 3 months
[kodi-pvr-pctv] Improve compatibility with new CMake macro
by Leigh Scott
commit 33a5a4b38971b575dc1ff2e5d9dbc76b5a201273
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:52:59 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-pctv.spec | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/kodi-pvr-pctv.spec b/kodi-pvr-pctv.spec
index 04451b5..9985182 100644
--- a/kodi-pvr-pctv.spec
+++ b/kodi-pvr-pctv.spec
@@ -1,10 +1,9 @@
-# Use old cmake macro
-%global __cmake_in_source_build 1
-
%global kodi_addon pvr.pctv
%global kodi_version 18.0
%global kodi_codename Matrix
+%undefine __cmake_in_source_build
+
Name: kodi-%(tr "." "-" <<<%{kodi_addon})
Version: 5.0.0
Release: 1%{?dist}
@@ -34,12 +33,12 @@ ExcludeArch: %{power64} ppc64le
%build
# https://gitlab.kitware.com/cmake/cmake/issues/17555#note_355574
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-%cmake3 .
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
%files
4 years, 3 months
[kodi-pvr-njoy] Improve compatibility with new CMake macro
by Leigh Scott
commit 2bc90333728e5a16191badf9b2b1131f4b9c8f87
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:51:29 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-njoy.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/kodi-pvr-njoy.spec b/kodi-pvr-njoy.spec
index b8ef6f5..8109245 100644
--- a/kodi-pvr-njoy.spec
+++ b/kodi-pvr-njoy.spec
@@ -5,6 +5,8 @@
%global kodi_addon pvr.njoy
%global kodi_version 18.0
+%undefine __cmake_in_source_build
+
Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
@@ -17,7 +19,7 @@ License: GPLv2+
URL: https://github.com/kodi-pvr/%{kodi_addon}/
Source0: https://github.com/kodi-pvr/%{kodi_addon}/archive/%{shortcommit}/%{kodi_a...
-BuildRequires: cmake
+BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
BuildRequires: kodi-platform-devel >= %{kodi_version}
@@ -35,12 +37,12 @@ ExcludeArch: %{power64} ppc64le
%build
-%cmake .
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
%files
4 years, 3 months
[kodi-pvr-nextpvr] Improve compatibility with new CMake macro
by Leigh Scott
commit 578dc9fe20acc994b24dbd1185631d3e78020ffb
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:49:18 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-nextpvr.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/kodi-pvr-nextpvr.spec b/kodi-pvr-nextpvr.spec
index f25f428..3becad4 100644
--- a/kodi-pvr-nextpvr.spec
+++ b/kodi-pvr-nextpvr.spec
@@ -2,6 +2,8 @@
%global kodi_version 18.0
%global kodi_codename Leia
+%undefine __cmake_in_source_build
+
Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
@@ -14,7 +16,7 @@ License: GPLv2+
URL: https://github.com/kodi-pvr/%{kodi_addon}/
Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz
-BuildRequires: cmake
+BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
BuildRequires: kodi-platform-devel >= %{kodi_version}
@@ -32,12 +34,12 @@ ExcludeArch: %{power64} ppc64le
%build
-%cmake .
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
%files
4 years, 3 months
[kodi-pvr-mythtv] Improve compatibility with new CMake macro
by Leigh Scott
commit 88eed6eb7dd0fbdb570636bc461a762b4f4063e5
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:47:43 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-mythtv.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/kodi-pvr-mythtv.spec b/kodi-pvr-mythtv.spec
index f3b8705..5dc0ebd 100644
--- a/kodi-pvr-mythtv.spec
+++ b/kodi-pvr-mythtv.spec
@@ -2,6 +2,8 @@
%global kodi_version 18.0
%global kodi_codename Leia
+%undefine __cmake_in_source_build
+
Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
@@ -39,12 +41,12 @@ find lib/cppmyth/ -type f -not -path "lib/cppmyth/src/private/*" -delete
%build
-%cmake3 .
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
%files
4 years, 3 months
[kodi-pvr-mediaportal-tvserver] Improve compatibility with new CMake macro
by Leigh Scott
commit a01ae0e34daf654e1a2b788e8cea12ff8d2e440f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:46:06 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-mediaportal-tvserver.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/kodi-pvr-mediaportal-tvserver.spec b/kodi-pvr-mediaportal-tvserver.spec
index a12d5a0..f040ef7 100644
--- a/kodi-pvr-mediaportal-tvserver.spec
+++ b/kodi-pvr-mediaportal-tvserver.spec
@@ -2,6 +2,8 @@
%global kodi_version 18.0
%global kodi_codename Leia
+%undefine __cmake_in_source_build
+
Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
@@ -17,7 +19,7 @@ License: GPLv2+ and LGPLv2+
URL: https://github.com/kodi-pvr/%{kodi_addon}/
Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz
-BuildRequires: cmake
+BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
BuildRequires: kodi-platform-devel >= %{kodi_version}
@@ -36,12 +38,12 @@ ExcludeArch: %{power64} ppc64le
%build
-%cmake .
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
%files
4 years, 3 months
[kodi-pvr-iptvsimple] Improve compatibility with new CMake macro
by Leigh Scott
commit 6fa15714c4a6d6e418e70762f03d64f662017377
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:44:09 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-iptvsimple.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/kodi-pvr-iptvsimple.spec b/kodi-pvr-iptvsimple.spec
index d08d213..91bb7ab 100644
--- a/kodi-pvr-iptvsimple.spec
+++ b/kodi-pvr-iptvsimple.spec
@@ -2,6 +2,8 @@
%global kodi_version 18.0
%global kodi_codename Leia
+%undefine __cmake_in_source_build
+
Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
@@ -16,7 +18,7 @@ Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{versi
# Fix rapidxml detection
Patch0: %{name}-3.8.8-rapidxml.patch
-BuildRequires: cmake
+BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
BuildRequires: kodi-platform-devel >= %{kodi_version}
@@ -35,12 +37,12 @@ ExcludeArch: %{power64} ppc64le
%build
-%cmake .
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
%files
4 years, 3 months
[kodi-pvr-hts] Improve compatibility with new CMake macro
by Leigh Scott
commit 1fa32cdd53191415eaf936083382d3127fc22d0b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:42:17 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-hts.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/kodi-pvr-hts.spec b/kodi-pvr-hts.spec
index 4b125cf..ca3ef0d 100644
--- a/kodi-pvr-hts.spec
+++ b/kodi-pvr-hts.spec
@@ -2,6 +2,8 @@
%global kodi_version 18.0
%global kodi_codename Leia
+%undefine __cmake_in_source_build
+
Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
@@ -16,7 +18,7 @@ License: GPLv2+ and LGPLv2+
URL: https://github.com/kodi-pvr/%{kodi_addon}/
Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz
-BuildRequires: cmake
+BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-platform-devel >= %{kodi_version}
BuildRequires: kodi-devel >= %{kodi_version}
@@ -34,12 +36,12 @@ ExcludeArch: %{power64} ppc64le
%build
-%cmake .
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
%files
4 years, 3 months
[kodi-pvr-filmon] Improve compatibility with new CMake macro
by Leigh Scott
commit 3e6b7666dec31a2150117154ce2c4398b9f6f57e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:40:40 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-filmon.spec | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/kodi-pvr-filmon.spec b/kodi-pvr-filmon.spec
index 6c9975b..f748007 100644
--- a/kodi-pvr-filmon.spec
+++ b/kodi-pvr-filmon.spec
@@ -1,10 +1,9 @@
-# Use old cmake macro
-%global __cmake_in_source_build 1
-
%global kodi_addon pvr.filmon
%global kodi_version 18.0
%global kodi_codename Matrix
+%undefine __cmake_in_source_build
+
Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
@@ -37,12 +36,12 @@ ExcludeArch: %{power64} ppc64le
%build
# https://gitlab.kitware.com/cmake/cmake/issues/17555#note_355574
export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-%cmake3 .
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
%files
4 years, 3 months