10:20 a.m.
commit 88b7129cd67ee7e732d7a578b5a265e3e7e78da5
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Mar 10 11:20:34 2024 +0100
Update to latest snapshot
.gitignore | 1 +
sources | 2 +-
swftools-0.9.2-gcc11.patch | 15 ---------
swftools-0.9.2-giflib5.patch | 70 ---------------------------------------
swftools-0.9.2-install.patch | 78 --------------------------------------------
swftools.spec | 57 +++++++++++++++++++-------------
6 files changed, 37 insertions(+), 186 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index be83b36..b267d4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
swftools-0.9.2.tar.gz
+/swftools-772e55a.tar.gz
diff --git a/sources b/sources
index d281133..96354f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (swftools-0.9.2.tar.gz) =
91bbd48914f9a8a1cdf85532b371721b01982c5f88648b908fbe99fbf4e17e9893ce575e4fd699927e9bc1c79d846f6bcd4f1d868578fb17403467cc1e28259b
+SHA512 (swftools-772e55a.tar.gz) =
427c2e83c77c053ad0ac0f5d51c58ee983b4fe3d25819bcf366e4c78769f568d902c6eeb8dca71519a35ae26edfe4ad1657304189eb61769c45fcde41da45637
diff --git a/swftools.spec b/swftools.spec
index f4313ff..fda099e 100644
--- a/swftools.spec
+++ b/swftools.spec
@@ -1,26 +1,29 @@
+%global commit 772e55a271f66818b06c6e8c9b839befa51248f4
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20211216
+
+# Disable parallel build to avoid compilation issues
+%global _smp_mflags %{nil}
+
Name: swftools
-Version: 0.9.2
-Release: 21%{?dist}
+Version: 0.9.2^%{commitdate}git%{shortcommit}
+Release: 1%{?dist}
Summary: SWF manipulation and generation utilities
-# swftools is GPLv2+ licensed, lib/MD5.c is BSD licensed,
-# lib/action/actioncompiler.c is LGPLv2+ licensed
-License: GPLv3+ and LGPLv2+ and BSD
+# swftools is GPL-2.0-or-later licensed, some libraries are
LGPL-2.0-or-later/GPL-3.0-or-later
+License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-or-later
URL: http://www.swftools.org/
-Source0: %{url}/%{name}-%{version}.tar.gz
-# Fix installation
-Patch0: swftools-0.9.2-install.patch
-# Fix build with giflib >= 5
-Patch1: swftools-0.9.2-giflib5.patch
-# Fix build with GCC 11
-Patch2: swftools-0.9.2-gcc11.patch
+Source0:
https://github.com/matthiaskramm/%{name}/archive/%{commit}/%{name}-%{shor...
-BuildRequires: gcc-c++
BuildRequires: fftw-devel
BuildRequires: fontconfig-devel
+BuildRequires: gcc-c++
+BuildRequires: freetype-devel
BuildRequires: giflib-devel
BuildRequires: lame-devel
BuildRequires: libjpeg-turbo-devel
+BuildRequires: perl-interpreter
+BuildRequires: zlib-devel
BuildRequires: zziplib-devel
%description
@@ -31,13 +34,14 @@ source code).
%prep
-%autosetup -p0
+%autosetup -n %{name}-%{commit}
-# Fix permissions
-chmod -x lib/*.[ch] lib/action/*.[ch]
+# Remove the bundled LAME library to ensure the build tools search for and use
+# the system's LAME library instead.
+rm -r lib/lame/
# Fix encoding
-for file in AUTHORS src/{jpeg2swf.1,swfstrings.1}; do
+for file in AUTHORS COPYING src/{jpeg2swf.1,swfstrings.1}; do
iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
touch -r $file $file.new && \
mv $file.new $file
@@ -45,18 +49,24 @@ done
%build
-export CFLAGS="$RPM_OPT_FLAGS -fcommon"
-export CXXFLAGS="$CFLAGS"
%configure
-make %{?_smp_mflags}
+%make_build \
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install \
+ bindir=$RPM_BUILD_ROOT%{_bindir} \
+ datadir=$RPM_BUILD_ROOT%{_datadir} \
+ libdir=$RPM_BUILD_ROOT%{_libdir} \
+ mandir=$RPM_BUILD_ROOT%{_mandir}
+
+# Fix absolute symlinks
+ln -sf tessel_loader.swf $RPM_BUILD_ROOT%{_datadir}/%{name}/swfs/default_loader.swf
+ln -sf simple_viewer.swf $RPM_BUILD_ROOT%{_datadir}/%{name}/swfs/default_viewer.swf
%files
-%doc AUTHORS ChangeLog doc/fileformat.sc
+%doc AUTHORS ChangeLog README.md
%license COPYING
%{_bindir}/*
%{_mandir}/man1/*.1.*
@@ -64,6 +74,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
%changelog
+* Sun Mar 10 2024 Mohamed El Morabity <melmorabity(a)fedoraproject.org> -
0.9.2^20211216git772e55a-1
+- Update to latest snapshot
+
* Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> -
0.9.2-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild