commit ee0e00954df97d68d910c27b2cf9cdd020c2d948 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sun Aug 21 04:49:08 2022 +0100 new version aegisub-buildfix_autotools.patch | 11 +++++++++++ aegisub-git-version.patch | 6 ------ aegisub.spec | 14 +++++++++----- sources | 2 +- 4 files changed, 21 insertions(+), 12 deletions(-) --- diff --git a/aegisub-buildfix_autotools.patch b/aegisub-buildfix_autotools.patch new file mode 100644 index 0000000..66ee92d --- /dev/null +++ b/aegisub-buildfix_autotools.patch @@ -0,0 +1,11 @@ +--- Aegisub-3.3.3/build/version.sh.orig 2022-08-21 04:36:22.130688059 +0100 ++++ Aegisub-3.3.3/build/version.sh 2022-08-21 04:36:30.535680238 +0100 +@@ -12,7 +12,7 @@ if ! test -d "${srcdir}/.git"; then + done < "${version_h_path}" + if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != x; then + export VERSION_SOURCE="from cached git_version.h" +- exit 0 ++ return 0 + else + echo "invalid git_version.h" + exit 2 diff --git a/aegisub.spec b/aegisub.spec index 8a72068..f2d0835 100644 --- a/aegisub.spec +++ b/aegisub.spec @@ -6,9 +6,9 @@ %global gitdate 20191006 Name: aegisub -Version: 3.3.2 +Version: 3.3.3 #Release: 25.%%{gitdate}.git%%{shortcommit}%%{?dist} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Tool for creating and modifying subtitles #src/gl/ - MIT license. See src/gl/glext.h @@ -19,8 +19,7 @@ URL: http://www.aegisub.org # https://github.com/Aegisub/Aegisub #Source0: https://github.com/%%{gituser}/%%{gitname}/archive/%%{commit}/%%{name}-%%... Source0: https://github.com/%{gituser}/%{gitname}/archive/v%{version}/%{name}-%{ve... -#PATCH-FIX-OPENSUSE - davejplater(a)gmail.com - aegisub-git-version.patch - Create git_version.h which is missing in git. -Patch5: aegisub-git-version.patch +Patch6: aegisub-buildfix_autotools.patch # luajit isn't available on powerpc # boost m4 detection is failing on i686 and armv7hl @@ -51,7 +50,7 @@ BuildRequires: luajit-devel BuildRequires: portaudio-devel BuildRequires: pulseaudio-libs-devel BuildRequires: uchardet-devel -BuildRequires: wxGTK3-devel +BuildRequires: wxGTK-devel BuildRequires: zlib-devel #needed for the perl script downloading the additional documentation from wiki @@ -78,6 +77,8 @@ including a built-in real-time video preview. %build export CXXFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-deprecated-copy" +export FORCE_GIT_VERSION=%{version} +./build/version.sh . ./autogen.sh %configure \ --disable-update-checker \ @@ -105,6 +106,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/aegisub.appda %changelog +* Sun Aug 21 2022 Sérgio Basto <sergio(a)serjux.com&gt; - 3.3.3-1 +- new version + * Sat Aug 06 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 3.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg 5.1 diff --git a/sources b/sources index 93e3d48..53fc192 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (aegisub-3.3.2.tar.gz) = 7ecd463382e0534cd063e3adb887d14bd797e796f0e7de4b4254cd7f5188308c3bec5b4b1055c74231046069e11034a9e97939a17d66c3d0d6f08b4f24bce4b5 +SHA512 (aegisub-3.3.3.tar.gz) = 19e44667ad8742560559387c15f6c00339194cd26e1140624c63f34c6b4da6bb0b80be0f636a2d1cd0b15f1598e0580218d648e0622635b12eeaad3a40df9abc