Attachment 2012128 Details for Bug 2183981 – The .spec file difference from Copr build 5738500 to 6971818

[patch] The .spec file difference from Copr build 5738500 to 6971818

spec-from-5738500-to-6971818.diff (text/plain), 4.25 KB, created by Fedora Review Service on 2024-01-29 19:59:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fedora Review Service

Created: 2024-01-29 19:59:57 UTC

Size: 4.25 KB

patch

obsolete

>--- https://copr.fedorainfracloud.org/coprs/build/5738500
>+++ https://copr.fedorainfracloud.org/coprs/build/6971818
>@@ -6,10 +6,10 @@
> #   - prboom2/src/gl_sky.c
> #   - prboom2/src/scanner.cpp
> #   - prboom2/src/scanner.h
>-# * LGPL v2.0:
>+# * LGPL v2.0 or later:
> #   - prboom2/src/umapinfo.cpp
> #   - prboom2/src/umapinfo.h
>-# * LGPL v2.1:
>+# * LGPL v2.1 or later:
> #   - prboom2/src/gl_vertex.c
> # * Public domain:
> #   - prboom2/src/SDL/SDL_windows_main.c
>@@ -19,9 +19,12 @@
> #   - prboom2/src/win_opendir.h
> # * zlib:
> #   - prboom2/src/SDL/SDL_windows.h
>-License: GPL-2.0-or-later AND BSD-3-Clause AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND Public Domain AND Zlib
>+#
>+# Note regarding gl_vertex.c: the file has a conditional licensing clause.
>+# Check the discussion at: https://gitlab.com/fedora/legal/fedora-license-data/-/issues/310
>+License: GPL-2.0-or-later AND BSD-3-Clause AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND Zlib
> 
>-Version: 0.25.6
>+Version: 0.27.5
> Release: 1%{?dist}
> 
> URL: https://github.com/kraflab/dsda-doom
>@@ -29,8 +32,11 @@
> 
> BuildRequires: cmake
> BuildRequires: desktop-file-utils
>+BuildRequires: fluidsynth
> BuildRequires: gcc-c++
>+BuildRequires: libzip-tools
> BuildRequires: make
>+BuildRequires: rubygem-rspec
> 
> BuildRequires: dumb-devel
> BuildRequires: portmidi-devel
>@@ -40,11 +46,14 @@
> BuildRequires: pkgconfig(glu)
> BuildRequires: pkgconfig(libpcre2-32)
> BuildRequires: pkgconfig(libpng)
>+BuildRequires: pkgconfig(libzip)
> BuildRequires: pkgconfig(mad)
> BuildRequires: pkgconfig(SDL2_image)
> BuildRequires: pkgconfig(SDL2_mixer)
> BuildRequires: pkgconfig(SDL2_net)
>-BuildRequires: pkgconfig(vorbis)
>+BuildRequires: pkgconfig(vorbisfile)
>+
>+Requires: %{name}-data = %{version}-%{release}
> 
> 
> %description
>@@ -60,35 +69,86 @@
> - Rewind feature
> 
> 
>+%package data
>+Summary: Data files for DSDA-Doom
>+BuildArch: noarch
>+
>+%description data
>+This package contains data files needed to run DSDA-Doom.
>+
>+
> %prep
> %autosetup
>+
>+# The FindLibMad CMake script is subtly broken and causes the generated
>+# Makefile to include a "target A depends on B but there's no definition of B"
>+# type of shenanigans.
>+# 
>+# Don't ask me why this "fix" works. I know nothing about writing CMake scripts
>+# and just tried whatever came into mind until something sticked.
>+sed \
>+	-e '/PATH_SUFFIXES/d' \
>+	-i prboom2/cmake/FindLibMad.cmake
> 
> 
> %build
> pushd prboom2/
>-%cmake -DDOOMWADDIR=%{_datadir}/doom -DDSDAPWADDIR=%{_datadir}/%{name}
>+%cmake \
>+	-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
>+	-DDOOMWADDIR=%{_datadir}/doom \
>+	-DDSDAPWADDIR=%{_datadir}/%{name} \
>+
> %cmake_build
> 
> 
> %install
> pushd prboom2/
>-%cmake_install
>+	%cmake_install
>+	desktop-file-install --dir=%{buildroot}%{_datadir}/applications ICONS/%{name}.desktop
>+	install -Dpm 644 ICONS/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
>+popd
> 
>-# desktop + icons
>-desktop-file-install --dir=%{buildroot}%{_datadir}/applications ICONS/%{name}.desktop
>-install -Dpm 644 ICONS/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
>+# docs
>+ln prboom2/AUTHORS ./
>+install -m 755 -d %{buildroot}%{_pkgdocdir}
>+cp -a docs patch_notes AUTHORS README.md %{buildroot}%{_pkgdocdir}
> 
> 
> %files
>-%doc docs/ patch_notes/ prboom2/AUTHORS
>+%{_bindir}/%{name}
>+%{_datadir}/applications/%{name}.desktop
>+
>+
>+%files data
> %license prboom2/COPYING
>-%{_bindir}/%{name}
>+%doc %{_pkgdocdir}
> %{_datadir}/%{name}
>-%{_datadir}/applications/%{name}.desktop
> %{_datadir}/pixmaps/%{name}.png
> 
> 
> %changelog
>+* Mon Jan 29 2024 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.27.5-1
>+- Update to v0.27.5
>+
>+* Sun Nov 19 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.27.4-1
>+- Update to v0.27.4
>+
>+* Tue Nov 14 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.27.3-1
>+- Update to v0.27.3
>+
>+* Mon Oct 30 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.27.2-1
>+- Update to v0.27.2
>+
>+* Sat Oct 28 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.27.0-1
>+- Update to v0.27.0
>+- Move data to a subpackage
>+
>+* Sun Jun 04 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.26.2-1
>+- Update to v0.26.2
>+
>+* Tue May 30 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.26.0-1
>+- Update to v0.26.0
>+
> * Mon Apr 03 2023 Artur Frenszek-Iwicki <fedora@svgames.pl> - 0.25.6-1
> - Update to v0.25.6
> - Review license tag and migrate to SPDX

Actions: View | Diff

Attachments on bug 2183981: 2012128 | 2056061