[kodi-pvr-dvbviewer] Improve compatibility with new CMake macro
by Leigh Scott
commit d6bc573c94843fc5f4135a6d139caa08c63cf4e7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:38:57 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-dvbviewer.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/kodi-pvr-dvbviewer.spec b/kodi-pvr-dvbviewer.spec
index 1e13f83..dd57067 100644
--- a/kodi-pvr-dvbviewer.spec
+++ b/kodi-pvr-dvbviewer.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-dvblink] Improve compatibility with new CMake macro
by Leigh Scott
commit 593e4ff498ea60529cab928942d96406cf8892c7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:37:24 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-dvblink.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/kodi-pvr-dvblink.spec b/kodi-pvr-dvblink.spec
index 04d8d72..b216e15 100644
--- a/kodi-pvr-dvblink.spec
+++ b/kodi-pvr-dvblink.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/)
@@ -15,7 +17,7 @@ License: GPLv2+ and MIT
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}
@@ -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-demo] Improve compatibility with new CMake macro
by Leigh Scott
commit 8ba35af2b462c1769ae97bd9931070f4cbe41974
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:34:56 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-demo.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/kodi-pvr-demo.spec b/kodi-pvr-demo.spec
index e5af7c3..4d7d193 100644
--- a/kodi-pvr-demo.spec
+++ b/kodi-pvr-demo.spec
@@ -5,6 +5,8 @@
%global kodi_addon pvr.demo
%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}
@@ -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-argustv] Improve compatibility with new CMake macro
by Leigh Scott
commit a5ed25044cfc06294c325393f719dfa89df215d4
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:32:58 2020 +0100
Improve compatibility with new CMake macro
kodi-pvr-argustv.spec | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/kodi-pvr-argustv.spec b/kodi-pvr-argustv.spec
index 2555414..39cf9ef 100644
--- a/kodi-pvr-argustv.spec
+++ b/kodi-pvr-argustv.spec
@@ -1,10 +1,9 @@
-# Use old cmake macro
-%global __cmake_in_source_build 1
-
%global kodi_addon pvr.argustv
%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
[kodi-platform] Improve compatibility with new CMake macro
by Leigh Scott
commit 1be3f5e0fd259b582e55ccdd598154453184dfbf
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:30:43 2020 +0100
Improve compatibility with new CMake macro
kodi-platform.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/kodi-platform.spec b/kodi-platform.spec
index 781c12a..bebadc8 100644
--- a/kodi-platform.spec
+++ b/kodi-platform.spec
@@ -6,6 +6,8 @@
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commitdate 20180302
+%undefine __cmake_in_source_build
+
Name: kodi-platform
Version: 18.0
Release: 0.7.%{commitdate}git%{shortcommit}%{?dist}
@@ -17,7 +19,7 @@ Source0: https://github.com/xbmc/%{name}/archive/%{shortcommit}/%{name}-%
# Fix .cmake files installation path
Patch0: %{name}-15.0-install.patch
-BuildRequires: cmake
+BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{version}
BuildRequires: platform-devel
@@ -46,12 +48,12 @@ developing applications that use %{name}.
%build
-%cmake .
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
%ldconfig_scriptlets
4 years, 3 months
[kodi-peripheral-joystick] Improve compatibility with new CMake macro
by Leigh Scott
commit eb6e36f0eded9f08f3e4c3cd584c8dba345981fd
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:29:04 2020 +0100
Improve compatibility with new CMake macro
kodi-peripheral-joystick.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/kodi-peripheral-joystick.spec b/kodi-peripheral-joystick.spec
index c9f46c9..9ec4912 100644
--- a/kodi-peripheral-joystick.spec
+++ b/kodi-peripheral-joystick.spec
@@ -2,6 +2,8 @@
%global kodi_codename Leia
%global kodi_version 18.0
+%undefine __cmake_in_source_build
+
Name: kodi-peripheral-joystick
Version: 1.4.8
Release: 2%{?dist}
@@ -11,7 +13,7 @@ License: GPLv2+
URL: https://github.com/xbmc/%{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: pkgconfig(libudev)
@@ -28,12 +30,12 @@ Joystick Peripheral Addon for Kodi.
%build
-%cmake
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
%files
4 years, 3 months
[kodi-inputstream-adaptive] Improve compatibility with new CMake macro
by Leigh Scott
commit 835a1e6027d03d84087caa8d60fe366f7d260597
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Aug 17 16:26:48 2020 +0100
Improve compatibility with new CMake macro
kodi-inputstream-adaptive.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/kodi-inputstream-adaptive.spec b/kodi-inputstream-adaptive.spec
index 4862c9b..d2aca41 100644
--- a/kodi-inputstream-adaptive.spec
+++ b/kodi-inputstream-adaptive.spec
@@ -2,6 +2,8 @@
%global kodi_version 18.0
%global kodi_branch Leia
+%undefine __cmake_in_source_build
+
Name: kodi-inputstream-adaptive
Version: 2.4.4
@@ -13,7 +15,7 @@ License: GPLv2+ and BSD
URL: https://github.com/peak3d/%{aname}/
Source0: %{url}/archive/%{version}-%{kodi_branch}/%{aname}-%{version}-%{kodi_branch}.tar.gz
-BuildRequires: cmake
+BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
BuildRequires: expat-devel
@@ -37,12 +39,12 @@ chmod a-x README.md %{aname}/changelog.txt
%build
-%cmake .
-%make_build
+%cmake3
+%cmake3_build
%install
-%make_install
+%cmake3_install
# Fix permissions at installation
find $RPM_BUILD_ROOT%{_datadir}/kodi/addons/ -type f -exec chmod 0644 {} \;
4 years, 3 months
[lpf-flash-plugin] Update to 32.0.0.414
by Leigh Scott
commit 55767d892cd02126b9b86c7f008e2974e3c13005
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 16 18:14:39 2020 +0100
Update to 32.0.0.414
check_new_version.py | 2 +-
flash-plugin.spec.in | 5 ++++-
lpf-flash-plugin.spec | 5 ++++-
3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/check_new_version.py b/check_new_version.py
index 7604e94..7f7bc88 100755
--- a/check_new_version.py
+++ b/check_new_version.py
@@ -45,9 +45,9 @@ if new_version != old_version:
print('rfpkg ci -c && git show')
print('rfpkg push && rfpkg build --nowait')
+ print('git checkout f33 && git merge master && git push && rfpkg build --nowait; git checkout master')
print('git checkout f32 && git merge master && git push && rfpkg build --nowait; git checkout master')
print('git checkout f31 && git merge master && git push && rfpkg build --nowait; git checkout master')
- print('git checkout f30 && git merge master && git push && rfpkg build --nowait; git checkout master')
else:
print("Already updated !")
diff --git a/flash-plugin.spec.in b/flash-plugin.spec.in
index 631d255..a0582e2 100644
--- a/flash-plugin.spec.in
+++ b/flash-plugin.spec.in
@@ -2,7 +2,7 @@
%global __strip /bin/true
Name: flash-plugin
-Version: 32.0.0.403
+Version: 32.0.0.414
Release: 1%{?dist}
Epoch: 1
Summary: Adobe Flash Player
@@ -63,6 +63,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/flash-player-properti
%{_datadir}/icons/hicolor/*/apps/flash-player-properties.png
%changelog
+* Sun Aug 16 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1:32.0.0.414-1
+- Update to 32.0.0.414
+
* Tue Jul 21 08:29:25 GMT 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1:32.0.0.403-1
- Update to 32.0.0.403
diff --git a/lpf-flash-plugin.spec b/lpf-flash-plugin.spec
index e79cdef..a25b35b 100644
--- a/lpf-flash-plugin.spec
+++ b/lpf-flash-plugin.spec
@@ -5,7 +5,7 @@
%define target_pkg %(t=%{name}; echo ${t#lpf-})
Name: lpf-flash-plugin
-Version: 32.0.0.403
+Version: 32.0.0.414
Release: 1%{?dist}
Epoch: 1
Summary: Adobe Flash Player package bootstrap
@@ -67,6 +67,9 @@ fi
%changelog
+* Sun Aug 16 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1:32.0.0.414-1
+- Update to 32.0.0.414
+
* Tue Jul 21 08:29:25 GMT 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1:32.0.0.403-1
- Update to 32.0.0.403
4 years, 3 months