Re: [kdenlive] Fix build (bundle rttr-0.9.6)

Can you give a little more explanation in the .spec why this is needed? And document where this rttr tarball comes from please. On Sun, Sep 22, 2019, 8:34 AM Sérgio M. Basto <sergiomb(a)rpmfusion.org > wrote: > commit 9375987fe302c5f8a041b7555e2e70f825410f8d > > Author: Sérgio M. Basto <sergio(a)serjux.com&gt; > > Date: Sun Sep 22 03:27:44 2019 +0100 > > > > Fix build (bundle rttr-0.9.6) > > > > .gitignore | 1 + > > kdenlive.spec | 11 +++++++++-- > > rttr.CMakeLists.patch | 11 +++++++++++ > > sources | 1 + > > 4 files changed, 22 insertions(+), 2 deletions(-) > > --- > > diff --git a/.gitignore b/.gitignore > > index 4bc41ad..b75a41b 100644 > > --- a/.gitignore > > +++ b/.gitignore > > @@ -19,3 +19,4 @@ > > /kdenlive-18.12.2.tar.xz > > /kdenlive-18.12.3.tar.xz > > /kdenlive-19.04.3.tar.xz > > +/rttr-0.9.6.tar.gz > > diff --git a/kdenlive.spec b/kdenlive.spec > > index c2f455e..cfecd06 100644 > > --- a/kdenlive.spec > > +++ b/kdenlive.spec > > @@ -13,7 +13,9 @@ URL: http://www.kdenlive.org > > %global stable stable > > %endif > > Source0: > http://download.kde.org/%{stable}/applications/%{version}/src/kdenlive-%{... > > +Source1: > https://github.com/rttrorg/rttr/archive/v0.9.6/rttr-0.9.6.tar.gz > > Source100: kdenlive-find-lang.sh > > +Patch0: rttr.CMakeLists.patch > > > > # Add support for finding html files with find-lang.sh --with-html > on epel > > # > https://github.com/rpm-software-management/rpm/commit/0c42871ff407a3eeb1e... > > @@ -63,6 +65,8 @@ BuildRequires: pkgconfig(Qt5Qml) > > BuildRequires: pkgconfig(Qt5Quick) > > BuildRequires: pkgconfig(Qt5Widgets) > > BuildRequires: pkgconfig(Qt5WebKitWidgets) > > +BuildRequires: cmake(KF5Declarative) > > +BuildRequires: cmake(Qt5Multimedia) > > > > ## workaround for missing dependency in kf5-kio, can remove > > ## once kf5-kio-5.24.0-2 (or newer is available) > > @@ -84,12 +88,14 @@ recent video technologies. > > > > > > %prep > > -%autosetup -p1 > > +%autosetup -p1 -a1 > > > > > > %build > > mkdir %{_target_platform} > > pushd %{_target_platform} > > +mv ../rttr-0.9.6/ rttr/ > > + > > %{cmake_kf5} .. \ > > -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=ON > > popd > > @@ -132,7 +138,7 @@ fi > > %endif > > > > %files -f %{name}.lang > > -%doc AUTHORS README > > +%doc AUTHORS README.md > > %license COPYING > > %{_kf5_bindir}/kdenlive_render > > %{_kf5_bindir}/%{name} > > @@ -146,6 +152,7 @@ fi > > %{_kf5_datadir}/knotifications5/kdenlive.notifyrc > > %{_kf5_datadir}/kservices5/mltpreview.desktop > > %{_kf5_datadir}/kxmlgui5/kdenlive/ > > +%{_kf5_sysconfdir}/xdg/kdenlive_keyboardschemes.knsrc > > %{_kf5_sysconfdir}/xdg/kdenlive_renderprofiles.knsrc > > %{_kf5_sysconfdir}/xdg/kdenlive_titles.knsrc > > %{_kf5_sysconfdir}/xdg/kdenlive_wipes.knsrc > > diff --git a/rttr.CMakeLists.patch b/rttr.CMakeLists.patch > > new file mode 100644 > > index 0000000..849048a > > --- /dev/null > > +++ b/rttr.CMakeLists.patch > > @@ -0,0 +1,11 @@ > > +--- /var/lib/mock/fedora-30- > x86_64/root/builddir/build/BUILD/kdenlive- > 19.04.3/rttr.CMakeLists.txt 2019-07-08 16:41:42.000000000 > +0100 > > ++++ kdenlive-19.04.3/rttr.CMakeLists.txt 2019-09-22 > 03:21:31.065829482 +0100 > > +@@ -1,7 +1,7 @@ > > + include(ExternalProject) > > + ExternalProject_Add(rttr_project > > + PREFIX rttr > > +- URL https://github.com/rttrorg/rttr/archive/v0.9.6.tar.gz > > ++ SOURCE_DIR "rttr/" > > + UPDATE_COMMAND "" > > + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> > -DCMAKE_INSTALL_LIBDIR=lib -DBUILD_EXAMPLES=OFF > -DBUILD_DOCUMENTATION=OFF -DBUILD_UNIT_TESTS=OFF > -DBUILD_PACKAGE=OFF -DBUILD_STATIC=ON > > + ) > > diff --git a/sources b/sources > > index bacc578..760d9e8 100644 > > --- a/sources > > +++ b/sources > > @@ -1 +1,2 @@ > > fdd0cf780bd1e989c62b58ec217c1763 kdenlive-19.04.3.tar.xz > > +611c7062a9da181ee1cee012048a0640 rttr-0.9.6.tar.gz--