commit 2dd781d9e3a12c9d0090f5170ba13893c8743770 Author: Martin Gansser <mgansser(a)online.de&gt; Date: Mon Jan 21 18:09:33 2019 +0100 Update to 1:3.1-1.beta3.gite4c6466 .gitignore | 1 + dvdstyler-make-desktopfile-valid.patch | 18 ------------ dvdstyler.spec | 50 ++++++++++++++++++++++++++-------- sources | 2 +- 4 files changed, 40 insertions(+), 31 deletions(-) --- diff --git a/.gitignore b/.gitignore index a53a3de..f84d078 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ DVDStyler-2.9.6.tar.bz2 /DVDStyler-3.0.2.tar.bz2 /DVDStyler-3.0.3.tar.bz2 /DVDStyler-3.0.4.tar.bz2 +/dvdstyler-e4c6466.tar.bz2 diff --git a/dvdstyler.spec b/dvdstyler.spec index 156cb05..d13899a 100644 --- a/dvdstyler.spec +++ b/dvdstyler.spec @@ -1,17 +1,37 @@ -#global prerel_real .beta3 -#global prerel b2 -%global wxsvg_ver 1.5.15 +#For git snapshots, set to 0 to use release instead: +%global usesnapshot 1 +%if 0%{?usesnapshot} +%global commit0 e4c6466ec3ca26af550082a97d24c001e2780239 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global snapshottag .git%{shortcommit0} +%endif + +%global prerel_real .beta3 +%global prerel b2 +%global wxsvg_ver 1.5.12 Name: dvdstyler Epoch: 1 -Version: 3.0.4 -Release: 6%{?dist} +Version: 3.1 +Release: 1.beta3%{?snapshottag}%{?dist} Summary: Cross-platform DVD authoring application - -Group: Applications/Multimedia License: GPLv2+ URL: http://www.dvdstyler.de/ -Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%{version}%{?prerel}... + +# checkout instructions +# git clone git://git.code.sf.net/p/dvdstyler/DVDStyler dvdstyler +# cd dvdstyler +# git rev-parse --short HEAD +# git archive --format=tar --prefix=dvdshortcommit0/ %%{shortcommit0} \ +# -o dvdstyler-%%{shortcommit0}.tar +# bzip2 dvdstyler-%%{shortcommit0}.tar + +%if 0%{?usesnapshot} +Source0: %{name}-%{shortcommit0}.tar.bz2 +%else +Source0: http://downloads.sourceforge.net/dvdstyler/DVDStyler-%%{version}%{?prerel... +%endif + Patch1: dvdstyler-wxwin.m4.patch Patch2: ffmpeg35_buildfix.patch # build @@ -45,7 +65,6 @@ Requires: dvd+rw-tools Requires: dvdauthor Requires: mjpegtools Requires: genisoimage -Requires: dvdisaster # wxsvg version with wxGTK3 Requires: wxsvg >= %{wxsvg_ver} # note: do not add Require: totem-backend or another DVD player - see @@ -58,11 +77,15 @@ create navigational DVD menus similar to those found on most commercial DVDs. %prep -%setup -q -n DVDStyler-%{version}%{?prerel} -#patch1 -p1 -%patch2 -p1 +#%setup -q -n DVDStyler-%{version}%{?prerel} +%setup -q -n %{name} +%patch1 -p1 +#%patch2 -p1 #{__sed} -i 's|_T("xine \\"dvd:/$DIR\\"");|_T("totem \\"dvd://$DIR\\"");|' src/Config.h +# fixes E: script-without-shebang +chmod a-x src/*.{h,cpp} + %build rm -f install-sh depcomp missing mkinstalldirs compile config.guess config.sub install-sh rm -f aclocal.m4 Makefile.in @@ -107,6 +130,9 @@ desktop-file-install \ %{_mandir}/*/*.gz %changelog +* Sun Jan 20 2019 Martin Gansser <martinkg(a)fedoraproject.org&gt; - 1:3.1-1.beta3.gite4c6466 +- Update to 1:3.1-1.beta3.gite4c6466 + * Tue Dec 25 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 1:3.0.4-6 - Move to wxGTK3 as request in rfbz#5068 diff --git a/sources b/sources index d3642f1..0825193 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5008ea1488809fb0ca877b4e617ae5a7 DVDStyler-3.0.4.tar.bz2 +bf5e9c7132a739d61840263782b0ddc5 dvdstyler-e4c6466.tar.bz2