commit b73623c656c23fe92c007863965e6b322dbc595f Author: FeRD (Frank Dana) <ferdnyc(a)gmail.com&gt; Date: Thu Feb 13 14:41:20 2020 -0500 New upstream release 0.2.4 .gitignore | 1 + libopenshot-py-install-path.patch | 60 --------------------------------------- libopenshot.spec | 38 +++++++------------------ sources | 2 +- 4 files changed, 12 insertions(+), 89 deletions(-) --- diff --git a/.gitignore b/.gitignore index 16305b6..0c45e15 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ libopenshot-0.0.6.tar.gz /libopenshot-0.2.3.tar.gz /libopenshot-101f25a.tar.gz /libopenshot-c685571.tar.gz +/libopenshot-0.2.4.tar.gz diff --git a/libopenshot.spec b/libopenshot.spec index 0d8aa74..b617ec0 100644 --- a/libopenshot.spec +++ b/libopenshot.spec @@ -1,19 +1,11 @@ -%global gitrev c685571e6388ad5cc6c40661fd51bd15b436ccac -%global shortrev %(c=%{gitrev}; echo ${c:0:7}) -%global gitdate 20190912 - Name: libopenshot -Version: 0.2.3 -Release: 5.%{gitdate}git%{shortrev}%{?dist} +Version: 0.2.4 +Release: 1%{?dist} Summary: Library for creating and editing videos License: LGPLv3+ URL: http://www.openshot.org/ -Source0: https://github.com/OpenShot/%{name}/archive/%{gitrev}.tar.gz#/%{name}-%{s... - -# A fix has already been proposed upstream, but not yet accepted -# https://github.com/OpenShot/libopenshot/pull/290 -Patch1: %{name}-py-install-path.patch +Source0: https://github.com/OpenShot/%{name}/archive/v%{version}/%{name}-%{version... BuildRequires: gcc-c++ %{?el7:BuildRequires: epel-rpm-macros} @@ -26,14 +18,7 @@ BuildRequires: unittest-cpp-devel BuildRequires: cppzmq-devel BuildRequires: zeromq-devel BuildRequires: jsoncpp-devel - -# Dependency on libopenshot-audio 0.1.8 is insufficient, this libopenshot -# code can only be built and run with a libopenshot-audio release containing -# the new JUCE 5 APIs, which were introduced in the specific package releases -# indicated. This restriction will be eliminated with the next official -# releases of libopenshot and libopenshot-audio. -BuildRequires: libopenshot-audio-devel >= 0:0.1.8-2 -Requires: libopenshot-audio%{?isa} >= 0:0.1.8-2 +BuildRequires: libopenshot-audio-devel >= 0:0.1.9 # EL7 has other packages providing libzmq.so.5 %{?el7:Requires: zeromq%{?isa} >= 0:4.1.4} @@ -79,19 +64,12 @@ applications that use %{name}. %prep -%autosetup -p1 -n %{name}-%{gitrev} - -sed -e 's|-g -ggdb|-g|g' -i src/CMakeLists.txt tests/CMakeLists.txt +%autosetup -p1 %build -# Package includes an outdated FindPythonLibs.cmake module -# Reported upstream: https://github.com/OpenShot/libopenshot/pull/331 -rm cmake/Modules/FindPythonLibs.cmake - export CXXFLAGS="%{optflags} -Wl,--as-needed %{__global_ldflags}" -%cmake3 -Wno-dev -DCMAKE_BUILD_TYPE:STRING=Release \ - -DUSE_SYSTEM_JSONCPP:BOOL=ON . +%cmake3 -Wno-dev -DCMAKE_BUILD_TYPE:STRING=Release . %make_build # Disabling unit tests, which fail on every arch except i686 / x86_64. @@ -123,6 +101,10 @@ export CXXFLAGS="%{optflags} -Wl,--as-needed %{__global_ldflags}" %changelog +* Thu Feb 13 2020 FeRD (Frank Dana) <ferdnyc(a)gmail.com&gt; - 0.2.4-1 +- New upstream release +- Drop upstreamed patches / fixes, relax libopenshot-audio dependency + * Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 0.2.3-5.20190912gitc685571 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index b91f788..67ba65e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -21b97efdab0832c017bd924ce1461f46 libopenshot-c685571.tar.gz +SHA512 (libopenshot-0.2.4.tar.gz) = 6824ad22e81814b6427a4cb6489e5b893be264b5afa6e54287cd649f244f86b938c1b1d56280c1f49af65fa118d056d204bd39bc5b2ccdc10376d2df2f33a352