[swftools/f40] Update to latest snapshot
by Mohamed ElMorabity
commit 26660293c63db220cb04f0a980f7e4e3c04295b0
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
8 months, 2 weeks
[swftools] Update to latest snapshot
by Mohamed ElMorabity
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
8 months, 2 weeks
[desmume/f40] Re-define CFLAGS
by sagitter
Summary of changes:
f08263c... Re-define CFLAGS (*)
(*) This commit already existed in another branch; no separate mail sent
8 months, 2 weeks
[desmume] Re-define CFLAGS
by sagitter
commit f08263c4ec845ef88fa0aeb9a0c13122502b86a1
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Sat Mar 9 16:21:40 2024 +0100
Re-define CFLAGS
desmume.spec | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/desmume.spec b/desmume.spec
index 8f69a72..17e2f56 100644
--- a/desmume.spec
+++ b/desmume.spec
@@ -1,11 +1,11 @@
%define pkgversion %(echo %version|sed "s/\\\\\./_/g")
+%global _vpath_srcdir desmume/src/frontend/posix
Name: desmume
Version: 0.9.13
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A Nintendo DS emulator
-
-License: GPLv2+
+License: GPL-2.0-or-later
URL: http://desmume.org/
Source0: https://github.com/TASEmulators/desmume/archive/release_%{pkgversion}/%{n...
# Fix format strings
@@ -81,15 +81,12 @@ popd
%build
-pushd desmume/src/frontend/posix
+export CFLAGS="%{optflags} -std=gnu11"
%meson
%meson_build
-popd
%install
-pushd desmume/src/frontend/posix
%meson_install
-popd
# Validate desktop file
desktop-file-validate \
@@ -118,6 +115,9 @@ appstream-util validate-relax --nonet \
%changelog
+* Sat Mar 09 2024 Antonio Trande <sagitter(a)fedoraproject.org> - 0.9.13-6
+- Re-define CFLAGS
+
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.9.13-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
8 months, 2 weeks
[vdr-softhddevice] Update to 2.1.1
by Martin Gansser
commit da73bd446ef6b9de1390227f688c75d338263e1d
Author: Martin Gansser <mgansser(a)online.de>
Date: Sat Mar 9 15:49:38 2024 +0100
Update to 2.1.1
.gitignore | 1 +
sources | 2 +-
vdr-softhddevice.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 220a50f..f901eed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
/vdr-softhddevice-2.0.8.tar.gz
/vdr-softhddevice-2.0.9.tar.gz
/vdr-softhddevice-2.1.0.tar.gz
+/vdr-softhddevice-2.1.1.tar.gz
diff --git a/sources b/sources
index 0aa51b9..0d0203d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-softhddevice-2.1.0.tar.gz) = 0d3f489a4f8016ac73ce447e3e7045e36cf964c1ae36b283ddd1611a80b1066063773315cd068c6b5c4b717abaa6d3fde6a7e347a74f6cd51707b7bf2c0bd1d3
+SHA512 (vdr-softhddevice-2.1.1.tar.gz) = 4ae50a0a77991f2da653e2759cb61d34782ba80de1e755bce73cf5e7c8ad18aecb385e142afc4981eaa5a116b0f80d57bfe8a7523c441fe4c3c7c8f4adc1f45a
diff --git a/vdr-softhddevice.spec b/vdr-softhddevice.spec
index 4ab7fc3..c6bd79e 100644
--- a/vdr-softhddevice.spec
+++ b/vdr-softhddevice.spec
@@ -5,7 +5,7 @@
%endif
Name: vdr-softhddevice
-Version: 2.1.0
+Version: 2.1.1
Release: 1%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
@@ -86,6 +86,9 @@ install -Dpm 644 %{SOURCE1} \
%license AGPL-3.0.txt
%changelog
+* Sat Mar 09 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 2.1.1-1
+- Update to 2.1.1
+
* Tue Feb 06 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 2.1.0-1
- Update to 2.1.0
8 months, 2 weeks
[xbill] Patched for GCC14| Use %%defattr macros
by sagitter
commit 11ba54b8ba94414c93466ebb5663b6c81d412ff0
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Sat Mar 9 15:47:20 2024 +0100
Patched for GCC14| Use %%defattr macros
sources | 2 +-
xbill-gcc14.patch | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
xbill.spec | 35 ++++++++++++++++++++++-------------
3 files changed, 75 insertions(+), 14 deletions(-)
---
diff --git a/sources b/sources
index 1e422ae..b237b39 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-585e4866b15255a24203db9959407b2f xbill-2.1.tar.gz
+SHA512 (xbill-2.1.tar.gz) = 127604d88258db0ec47084209c656f8817146d70b0fe16f5a1d79883415cf38200594834b39080d78c627104ae6d204f3c12caf127fa094108c4edfbfa98d966
diff --git a/xbill-gcc14.patch b/xbill-gcc14.patch
new file mode 100644
index 0000000..f501c41
--- /dev/null
+++ b/xbill-gcc14.patch
@@ -0,0 +1,52 @@
+--- a/Game.orig.c 2024-03-09 14:30:16.087727650 +0100
++++ b/Game.c 2024-03-09 14:33:06.880520169 +0100
+@@ -1,3 +1,10 @@
++#if defined __GNUC__ && __GNUC__ >= 14
++#pragma GCC diagnostic warning "-Wimplicit-function-declaration"
++#pragma GCC diagnostic warning "-Wincompatible-pointer-types"
++#pragma GCC diagnostic warning "-Wint-conversion"
++#pragma GCC diagnostic warning "-Wreturn-mismatch"
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+--- a/Scorelist.orig.c 2024-03-09 14:34:56.730100377 +0100
++++ b/Scorelist.c 2024-03-09 15:04:51.231663266 +0100
+@@ -1,3 +1,10 @@
++#if defined __GNUC__ && __GNUC__ >= 14
++#pragma GCC diagnostic warning "-Wimplicit-function-declaration"
++#pragma GCC diagnostic warning "-Wincompatible-pointer-types"
++#pragma GCC diagnostic warning "-Wint-conversion"
++#pragma GCC diagnostic warning "-Wreturn-mismatch"
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/UI.orig.c 2001-10-17 05:16:48.000000000 +0200
++++ b/UI.c 2024-03-09 15:07:27.784359915 +0100
+@@ -1,3 +1,10 @@
++#if defined __GNUC__ && __GNUC__ >= 14
++#pragma GCC diagnostic warning "-Wimplicit-function-declaration"
++#pragma GCC diagnostic warning "-Wincompatible-pointer-types"
++#pragma GCC diagnostic warning "-Wint-conversion"
++#pragma GCC diagnostic warning "-Wreturn-mismatch"
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/gtk.orig.c 2001-10-30 19:28:27.000000000 +0100
++++ b/gtk.c 2024-03-09 15:17:01.180923586 +0100
+@@ -1,3 +1,10 @@
++#if defined __GNUC__ && __GNUC__ >= 14
++#pragma GCC diagnostic warning "-Wimplicit-function-declaration"
++#pragma GCC diagnostic warning "-Wincompatible-pointer-types"
++#pragma GCC diagnostic warning "-Wint-conversion"
++#pragma GCC diagnostic warning "-Wreturn-mismatch"
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/xbill.spec b/xbill.spec
index f962cdf..1420757 100644
--- a/xbill.spec
+++ b/xbill.spec
@@ -1,9 +1,8 @@
Name: xbill
Version: 2.1
-Release: 22%{?dist}
+Release: 23%{?dist}
Summary: Stop Bill from loading his OS into all the computers
-
-License: GPL+
+License: GPL-1.0-or-later
URL: http://www.xbill.org/
Source0: http://www.xbill.org/download/%{name}-%{version}.tar.gz
Source1: %{name}.desktop
@@ -16,6 +15,11 @@ Patch1: %{name}-2.1-hurd_logos.patch
Patch2: %{name}-2.1-score.patch
Patch3: %{name}-2.1-dropsgid.patch
+# These aren't real fixes (waiting upstream for this)
+# Just a way to accommodate C code generators.
+# See https://gcc.gnu.org/gcc-14/porting_to.html
+Patch4: %{name}-gcc14.patch
+
BuildRequires: gcc
BuildRequires: libtool
BuildRequires: gtk2-devel
@@ -35,16 +39,16 @@ and it is very popular at Red Hat.
%prep
%setup -q
-%patch0 -p0
-%patch1 -p1
+%patch -P 0 -p0 -b .backup
+%patch -P 1 -p1 -b .backup
# Patch2 must be applied before patch3
-%patch2 -p1
-%patch3 -p1
-
+%patch -P 2 -p1 -b .backup
+%patch -P 3 -p1 -b .backup
+%patch -P 4 -p1 -b .backup
%build
-autoreconf
+autoreconf -ivf
%configure \
--disable-motif \
--localstatedir=%{_localstatedir}/games
@@ -76,18 +80,23 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata
%files
-%attr(2755,root,games) %{_bindir}/%{name}
-%{_localstatedir}/games/%{name}
-%attr(0664,root,games) %config(noreplace) %{_localstatedir}/games/%{name}/scores
-%{_datadir}/%{name}
+%{_datadir}/%{name}/
%{_mandir}/man6/%{name}.6*
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%{_datadir}/metainfo/%{name}.appdata.xml
%doc ChangeLog README
+%defattr(2755,root,games)
+%{_bindir}/%{name}
+%defattr(0664,root,games)
+%config(noreplace) %{_localstatedir}/games/%{name}/scores
%changelog
+* Sat Mar 09 2024 Antonio Trande <sagitter(a)fedoraproject.org> - 2.1-23
+- Patched for GCC14
+- Use %%defattr macros
+
* Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.1-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
8 months, 2 weeks