public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/asc-music] rawhide: Rebase asc-music from 1.0 to 1.3
@ 2026-07-15 17:47 Michal Schorm
  0 siblings, 0 replies; only message in thread
From: Michal Schorm @ 2026-07-15 17:47 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/asc-music
            Branch : rawhide
            Commit : f9c2b36c185a9c77bb726830b8aeeb2bfb4a046e
            Author : Michal Schorm <mschorm@redhat.com>
            Date   : 2026-07-14T22:18:24+02:00
            Stats  : +22/-12 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/asc-music/c/f9c2b36c185a9c77bb726830b8aeeb2bfb4a046e?branch=rawhide

            Log:
            Rebase asc-music from 1.0 to 1.3

Version numbers are packager-assigned — upstream (ASC project on
SourceForge) distributes individual MP3 files, not versioned releases.
All three tracks were uploaded to SourceForge in 2002:
- 'frontiers.mp3' (2002-03-03)
- 'time_to_strike.mp3' (2002-03-03)
- 'machine_wars.mp3' (2002-10-15)

Cross-distro versioning analysis:
- Debian invented versions 1.0 through 1.3 via packaging-only changes:
  1.0 (2004-08-01): initial release (native package)
  1.1 (2005-01-01): maintainer email change ("s/fenio@o2.pl/fenio@debian.org/ ;)")
  1.2 (2006-03-17): orphanage upload, Standards-Version bump
  1.3-1 (2006-06-15): adopted by Debian Games Team, converted from
    native to non-native package format ("Switched original tarball
    to non-native")
  No content changes between any versions. In Debian-native packages
  (1.0-1.2), any upload — even trivial ones — requires a version bump.
  After switching to non-native (1.3-1), only the Debian revision
  increments (1.3-2 .. 1.3-7).
- All Debian derivatives (Ubuntu, Kali, Devuan, Raspbian, PureOS, etc.)
  inherit version 1.3 with MP3 files (~41 packages via Repology).
- Fedora, ALT Linux, and Mageia all use version 1.0 with OGG transcodes.
  ALT Linux and Mageia import from Fedora.
- openSUSE, Arch, Gentoo do not package asc-music separately.
- Debian removed its watch file: "The music files won't see new updates."

Adopting version 1.3 aligns Fedora with the Debian/Ubuntu convention.
The actual content change is switching from lossy Fedora-transcoded
OGG files back to the original upstream MP3 files. The MP3 patent
concerns that motivated the original 2007 OGG transcode expired in
2017. ASC supports both formats natively via SDL_mixer
('music/*.mp3 music/*.ogg'), so this is transparent to users.

Source changes: instead of a packager-created tarball, use the three
upstream MP3 files directly as separate Source entries. Upstream does
not distribute a tarball, and compressing already-compressed MP3 data
saves only ~1.7%. Using pristine upstream URLs makes the sources
directly verifiable.

SPDX license analysis:
- All three MP3 files are original compositions by Michael Kievernagel,
  created specifically for the ASC game project
- ASC project is licensed under GPL-2.0-or-later ('COPYING' in main
  ASC source contains GPLv2 text with "or later" clause)
- Music files carry the same license as the parent project; no
  separate license files or metadata in the MP3 headers indicate
  otherwise
- 'GPL-2.0-or-later' is correct for this content-only package

Other changes:
- Drop 'README.fedora' (content duplicated in package description)
- Drop auto-converted license comment; SPDX tag is already correct

Co-Authored-By: Claude AI <noreply@anthropic.com>

---
diff --git a/.gitignore b/.gitignore
index 42e667a..21c5567 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-asc-music-1.0.tar.gz
+/*.mp3

diff --git a/asc-music.spec b/asc-music.spec
index 0f442b5..4e5c7ca 100644
--- a/asc-music.spec
+++ b/asc-music.spec
@@ -1,12 +1,13 @@
 Name:           asc-music
-Version:        1.0
-Release:        34%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        Background music for the game asc
-# Automatically converted from old format: GPLv2+ - review is highly recommended.
 License:        GPL-2.0-or-later
 URL:            http://www.asc-hq.org/
-# transcoded from: http://downloads.sourceforge.net/asc-hq/*.mp3
-Source0:        %{name}-%{version}.tar.gz
+# Upstream distributes individual MP3 files on SourceForge, not a tarball.
+Source0:        https://downloads.sourceforge.net/asc-hq/frontiers.mp3
+Source1:        https://downloads.sourceforge.net/asc-hq/machine_wars.mp3
+Source2:        https://downloads.sourceforge.net/asc-hq/time_to_strike.mp3
 Buildarch:      noarch
 Requires:       asc
 
@@ -19,26 +20,33 @@ asc cache file: $HOME/.asc/asc.cache, otherwise asc will not find the music.
 
 
 %prep
-%setup -q
+# No tarball to extract — sources are individual MP3 files
 
 
 %build
-# nothing todo content only
+# Nothing to build — content only
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/asc/music
-install -p -m 644 *.ogg $RPM_BUILD_ROOT%{_datadir}/asc/music
+install -p -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/asc/music
 
 
 
 %files
-%doc README.fedora
 %{_datadir}/asc/music
 
 
 %changelog
+* Tue Jul 14 2026 Michal Schorm <mschorm@redhat.com> - 1.3-1
+- Rebase to version 1.3
+- Switch from Fedora-transcoded OGG files back to upstream original MP3 files;
+  ASC supports both formats via SDL_mixer (playlist pattern: 'music/*.mp3 music/*.ogg')
+- Use individual upstream MP3 files as sources directly instead of a
+  packager-created tarball; upstream does not distribute a tarball
+- Drop 'README.fedora' (content duplicated in package description)
+- Drop auto-converted license comment; SPDX tag is already correct
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-34
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

diff --git a/sources b/sources
index cd836f7..bb3d7d5 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-4ce77480b214c490dc7e8e8173616096  asc-music-1.0.tar.gz
+SHA512 (frontiers.mp3) = b3e365f5c305416bcb1a746de85250e3e400751c5328d520edfe4180bd9c25dbafd1a87e520d206a2566d71e6e6886239d8b3421de8c97dc0e482149d3d83dac
+SHA512 (machine_wars.mp3) = 0f18a52bb551ed4138de2a37607a5d368e17f08d505ce2835574ed056a149e0df103df3fd66c752bce6de0a6b43544e3d05b015de054d91115e2e3435584a914
+SHA512 (time_to_strike.mp3) = 1d07827774246c59d516fdf2b2fd6d00f6b7ae7e2b90786ed7afd34b9a5c660c6c50dc2e085318c4892a6f5bcf5712271b92cf001dd647f58b4ee54e704dcf42

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-15 17:47 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-15 17:47 [rpms/asc-music] rawhide: Rebase asc-music from 1.0 to 1.3 Michal Schorm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox