[rpmfusion-free-release] Bump for 33
by Leigh Scott
commit c83bd6d6e2effd9e0050deec8aaabf4960db6a07
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Feb 17 22:15:30 2020 +0000
Bump for 33
rpmfusion-free-release.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index 0f1bccd..023012b 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -4,7 +4,7 @@
Name: rpmfusion-%{repo}-release
Version: 32
-Release: 0.2
+Release: 0.1
Summary: RPM Fusion (%{repo}) Repository Configuration
License: BSD
@@ -106,6 +106,9 @@ ln -s $(basename %{SOURCE33}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Mon Feb 17 2020 Leigh Scott <leigh123linux(a)gmail.com> - 32-0.1
+- Bump for 33
+
* Mon Oct 21 2019 Leigh Scott <leigh123linux(a)gmail.com> - 32-0.2
- Remove f30 key
- Add f33 key
4 years, 9 months
[buildsys-build-rpmfusion] Bump for 33
by Leigh Scott
commit 2b738125d719214766d87725843b6f6b69a3044c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Feb 17 22:02:57 2020 +0000
Bump for 33
buildsys-build-rpmfusion.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index 4abb208..1db0b4a 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -2,7 +2,7 @@
Name: buildsys-build-%{repo}
Epoch: 11
-Version: 32
+Version: 33
Release: 0.1
Summary: Tools and files used by the %{repo} buildsys
@@ -77,6 +77,9 @@ sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \
%changelog
+* Mon Feb 17 2020 Leigh Scott <leigh123linux(a)gmail.com> - 11:33-0.1
+- Bump for 33
+
* Fri Aug 16 2019 Leigh Scott <leigh123linux(a)gmail.com> - 11:32-0.1
- Bump for 32
4 years, 9 months
[openshot] ExcludeArch: ppc64le
by Frank R Dana
commit 988bc62a03b628c46a17e6615d098bc164d2e83c
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Sat Feb 15 23:39:37 2020 -0500
ExcludeArch: ppc64le
openshot.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/openshot.spec b/openshot.spec
index ac2d8ed..ffe8f5d 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -20,6 +20,8 @@ Source100: openshot-find-lang.sh
Patch1: openshot-rpmfusion-contact.patch
BuildArch: noarch
+# libopenshot is unavailable on ppc64le, see rfbz #5528
+ExcludeArch: ppc64le
# For appdata
BuildRequires: libappstream-glib
4 years, 9 months
[libopenshot-audio] ExcludeArch: ppc64le
by Frank R Dana
commit e5f8ade49cc3f4b13b37b2c8acfc25fea3914984
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Sat Feb 15 23:36:18 2020 -0500
ExcludeArch: ppc64le
libopenshot-audio.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/libopenshot-audio.spec b/libopenshot-audio.spec
index c90c778..e89f262 100644
--- a/libopenshot-audio.spec
+++ b/libopenshot-audio.spec
@@ -7,6 +7,9 @@ License: GPLv3+
URL: http://openshot.org/
Source0: https://github.com/OpenShot/%{name}/archive/v%{version}/%{name}-%{version...
+# Disabling libopenshot-audio due to libopenshot exclusion, see rfbz #5528
+ExcludeArch: ppc64le
+
BuildRequires: gcc-c++
BuildRequires: cmake3
BuildRequires: alsa-lib-devel
4 years, 9 months
[libopenshot] ExcludeArch: ppc64le
by Frank R Dana
commit cdd23e9fa1cc4798ab075d02f4b5d2cbdfd217aa
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Sat Feb 15 23:33:45 2020 -0500
ExcludeArch: ppc64le
libopenshot.spec | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
---
diff --git a/libopenshot.spec b/libopenshot.spec
index 647dcff..c8e7df4 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -1,8 +1,3 @@
-# Disable Ruby package on ppcle64, as the build keeps crashing
-%ifnarch ppc64le
-%global with_ruby 1
-%endif
-
Name: libopenshot
Version: 0.2.4
Release: 1%{?dist}
@@ -12,6 +7,9 @@ License: LGPLv3+
URL: http://www.openshot.org/
Source0: https://github.com/OpenShot/%{name}/archive/v%{version}/%{name}-%{version...
+# libopenshot is completely broken on ppc64le, see rfbz #5528
+ExcludeArch: ppc64le
+
BuildRequires: gcc-c++
%{?el7:BuildRequires: epel-rpm-macros}
BuildRequires: cmake3
@@ -58,8 +56,6 @@ The python-%{name} package contains python bindings for
applications that use %{name}.
-%if %{?with_ruby}0
-
%package -n ruby-%{name}
Summary: Ruby bindings for %{name}
BuildRequires: ruby-devel
@@ -69,7 +65,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
The ruby-%{name} package contains ruby bindings for
applications that use %{name}.
-%endif
%prep
%autosetup -p1
@@ -77,10 +72,7 @@ applications that use %{name}.
%build
export CXXFLAGS="%{optflags} -Wl,--as-needed %{__global_ldflags}"
-%cmake3 -Wno-dev \
- -DCMAKE_BUILD_TYPE:STRING=Release \
- %{!?with_ruby:-DENABLE_RUBY=0} \
- .
+%cmake3 -Wno-dev -DCMAKE_BUILD_TYPE:STRING=Release .
%make_build
%check
@@ -105,14 +97,9 @@ make os_test
%files -n python%{python3_pkgversion}-libopenshot
%{python3_sitearch}/*
-
-%if %{?with_ruby}0
-
%files -n ruby-libopenshot
%{ruby_vendorarchdir}/*
-%endif
-
%changelog
* Thu Feb 13 2020 FeRD (Frank Dana) <ferdnyc(a)gmail.com> - 0.2.4-1
- New upstream release
4 years, 9 months
[libopenshot] Re-enable unit tests, ldconfig only RHEL < 8
by Frank R Dana
commit c8a2769c999464f2df324201f33104e5344fa824
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Sat Feb 15 13:12:14 2020 -0500
Re-enable unit tests, ldconfig only RHEL < 8
libopenshot.spec | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/libopenshot.spec b/libopenshot.spec
index ba272c3..647dcff 100644
--- a/libopenshot.spec
+++ b/libopenshot.spec
@@ -76,7 +76,6 @@ applications that use %{name}.
%build
-
export CXXFLAGS="%{optflags} -Wl,--as-needed %{__global_ldflags}"
%cmake3 -Wno-dev \
-DCMAKE_BUILD_TYPE:STRING=Release \
@@ -84,17 +83,15 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed %{__global_ldflags}"
.
%make_build
-# Disabling unit tests, which fail on every arch except i686 / x86_64.
-# Reported upstream: https://github.com/OpenShot/libopenshot/issues/332
-#%%check
-#make os_test
+%check
+make os_test
%install
%make_install
-
-%ldconfig_scriptlets
-
+%if 0%{?rhel} && 0%{?rhel} <= 7
+ %ldconfig_scriptlets
+%endif
%files
%doc AUTHORS README.md
4 years, 9 months
[libopenshot-audio] Only run ldconfig on RHEL < 8
by Frank R Dana
commit b6f569d4dcff8b83063fb97aa3749376b1a2f0ca
Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com>
Date: Sat Feb 15 13:03:29 2020 -0500
Only run ldconfig on RHEL < 8
libopenshot-audio.spec | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/libopenshot-audio.spec b/libopenshot-audio.spec
index e33d9d8..c90c778 100644
--- a/libopenshot-audio.spec
+++ b/libopenshot-audio.spec
@@ -40,11 +40,9 @@ make %{?_smp_mflags}
%install
%make_install
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
+%if 0%{?rhel} && 0%{?rhel} <= 7
+ %ldconfig_scriptlets
+%endif
%files
%doc AUTHORS COPYING README.md
4 years, 9 months
[xorg-x11-drv-nvidia] Ensure that only one Vulkan ICD and layers manifest is present
by Leigh Scott
commit b3021b9d38d88b9c1c69ca01c378f2e0cf33d9c0
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Feb 15 11:41:23 2020 +0000
Ensure that only one Vulkan ICD and layers manifest is present
xorg-x11-drv-nvidia.spec | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 76716e2..071cdd1 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -20,7 +20,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
Version: 440.59
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -243,12 +243,12 @@ ln -sf libvdpau_nvidia.so.%{version} %{buildroot}%{_libdir}/vdpau/libvdpau_nvidi
popd
%endif
+%ifarch x86_64
# Vulkan config
install -m 0755 -d %{buildroot}%{_datadir}/vulkan/{icd.d,implicit_layer.d}/
-install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
-install -p -m 0644 nvidia_layers.json %{buildroot}%{_datadir}/vulkan/implicit_layer.d/nvidia_layers.%{_target_cpu}.json
+install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/
+install -p -m 0644 nvidia_layers.json %{buildroot}%{_datadir}/vulkan/implicit_layer.d/
-%ifarch x86_64
# X DDX driver and GLX extension
install -p -D -m 0755 libglxserver_nvidia.so.%{version} %{buildroot}%{_libdir}/xorg/modules/extensions/libglxserver_nvidia.so
install -D -p -m 0755 nvidia_drv.so %{buildroot}%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -431,8 +431,6 @@ fi ||:
%endif
%files libs
-%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
-%{_datadir}/vulkan/implicit_layer.d/nvidia_layers.%{_target_cpu}.json
%{_libdir}/libEGL_nvidia.so.0
%{_libdir}/libEGL_nvidia.so.%{version}
%{_libdir}/libGLESv1_CM_nvidia.so.1
@@ -444,6 +442,8 @@ fi ||:
%{_libdir}/libnvidia-allocator.so.1
%{_libdir}/libnvidia-allocator.so.%{version}
%ifarch x86_64
+%{_datadir}/vulkan/implicit_layer.d/nvidia_layers.json
+%{_datadir}/vulkan/icd.d/nvidia_icd.json
%{_libdir}/libnvidia-cbl.so.%{version}
%{_libdir}/libnvidia-cfg.so.1
%{_libdir}/libnvidia-cfg.so.%{version}
@@ -503,6 +503,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Sat Feb 15 2020 Leigh Scott <leigh123linux(a)googlemail.com> - 3:440.59-2
+- Ensure that only one Vulkan ICD manifest is present
+
* Mon Feb 03 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3:440.59-1
- Update to 440.59 release
4 years, 9 months
[openshot/el8] Fix el8 build
by Leigh Scott
Summary of changes:
bfc64d4... Fix el8 build (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 9 months
[openshot] Fix el8 build
by Leigh Scott
commit bfc64d42741c0a075dcb4a1e1cefde4ffcddb13c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Feb 14 21:07:22 2020 +0000
Fix el8 build
openshot.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/openshot.spec b/openshot.spec
index bde8c40..ac2d8ed 100644
--- a/openshot.spec
+++ b/openshot.spec
@@ -99,7 +99,7 @@ done
# Validate desktop file
desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} <= 7
# Move appdata file to default location
mkdir -p %{buildroot}%{_metainfodir}
mv %{buildroot}%{_datadir}/metainfo/*.appdata.xml %{buildroot}%{_metainfodir}/
@@ -116,7 +116,7 @@ rmdir -p --ignore-fail-on-non-empty %{buildroot}%{_prefix}/lib/mime/packages
%find_lang OpenShot --with-qt
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} <= 7
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
4 years, 9 months