commit 724a90b19069c0ecf884460c00535f4b873bc1bd Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Thu Mar 8 08:26:26 2018 +0100 Rebase version .gitignore | 3 +-- sources | 2 +- vlmc.spec | 74 ++++++++++++++++++++++++++++++++------------------------------ 3 files changed, 40 insertions(+), 39 deletions(-) --- diff --git a/.gitignore b/.gitignore index 44f74d0..2b00337 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -vlmc-20120408.tar.bz2 -/vlmc-20170812.tar.bz2 +/vlmc-*.tar.gz diff --git a/sources b/sources index 4b5d894..a46d308 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -beab64f2b97fa97c8c0f9c48ed61f21b vlmc-20170812.tar.bz2 +94683a904dc28ca91d6dda651377c576 vlmc-34dab07.tar.gz diff --git a/vlmc.spec b/vlmc.spec index 0b221f0..f75bee7 100644 --- a/vlmc.spec +++ b/vlmc.spec @@ -1,64 +1,64 @@ -%global date 20170812 +%global commit 34dab072f6ff5d13755b81aa79e71706b4b4d358 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: vlmc Version: 0.2.0 -Release: 0.11.git%{date}%{?dist} +Release: 0.12.git%{shortcommit}%{?dist} Summary: VideoLAN Movie Creator -Group: Applications/Multimedia License: GPLv2+ -URL: http://trac.videolan.org/vlmc -Source0: vlmc-%{date}.tar.bz2 -Source9: vlmc-snapshot.sh +URL: https://www.videolan.org/vlmc/ +Source0: https://code.videolan.org/videolan/vlmc/repository/archive.tar.gz?ref=%{c... Patch1: vlmc-gcc47.patch -BuildRequires: autoconf automake libtool -BuildRequires: vlc-devel >= 3.0 -BuildRequires: libvlcpp-devel -BuildRequires: medialibrary-devel -BuildRequires: mlt-devel -BuildRequires: frei0r-devel -BuildRequires: qt5-devel >= 4.5.1 -BuildRequires: cmake >= 2.6.0 BuildRequires: desktop-file-utils -BuildRequires: /usr/bin/hostname +BuildRequires: gcc-c++ +BuildRequires: hostname +BuildRequires: libtool + +BuildRequires: pkgconfig(frei0r) +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5Quick) +BuildRequires: pkgconfig(libvlc) +BuildRequires: pkgconfig(libvlcpp) +BuildRequires: pkgconfig(medialibrary) +BuildRequires: pkgconfig(mlt-framework) + + Requires: frei0r-plugins +Requires: mlt-freeworld >= 6.3 + %description VideoLAN Movie Creator is a non-linear editing software for video creation based on libVLC %prep -%setup -q -n vlmc-%{date} -%patch1 -p1 -b .gcc47 +%autosetup -p1 -n vlmc-%{commit}-%{commit} +./bootstrap %build -./bootstrap -./configure --help %configure -%make_build VERBOSE=1 + +%make_build V=1 %install %make_install -#rm -rf $RPM_BUILD_ROOT%{_datadir}/doc - -# below is the desktop file and icon stuff. -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - share/vlmc.desktop - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m 644 share/vlmc.png \ - $RPM_BUILD_ROOT%{_datadir}/pixmaps +mkdir -p %{buildroot}%{_datadir}/pixmaps +install -pm 0644 share/vlmc.png \ + %{buildroot}%{_datadir}/pixmaps -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -p -m 644 doc/vlmc.1 \ - $RPM_BUILD_ROOT%{_mandir}/man1 +mkdir -p %{buildroot}%{_mandir}/man1 +install -pm 0644 doc/vlmc.1 \ + %{buildroot}%{_mandir}/man1 -desktop-file-validate \ - $RPM_BUILD_ROOT%{_datadir}/applications/vlmc.desktop +desktop-file-install share/vlmc.desktop \ + %{buildroot}%{_datadir}/applications/vlmc.desktop %files @@ -71,6 +71,9 @@ desktop-file-validate \ %changelog +* Thu Mar 08 2018 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.2.0-0.12.git34dab07 +- Rebase to gitlab source URL + * Thu Mar 08 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 0.2.0-0.11.git20170812 - Update to git20170812 - Move to autotools @@ -79,7 +82,6 @@ desktop-file-validate \ * Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com&gt; - 0.2.0-0.10.git20120408 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - * Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org&gt; - 0.2.0-0.9.git20120408 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild