public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/milkytracker] f45: Update to v1.06
@ 2026-09-21 14:07 Artur Frenszek-Iwicki
  0 siblings, 0 replies; only message in thread
From: Artur Frenszek-Iwicki @ 2026-09-21 14:07 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/milkytracker
Branch : f45
Commit : d3af92bfa6a854728bcee0ff44066b4aa473b924
Author : Artur Frenszek-Iwicki <fedora@svgames.pl>
Date   : 2026-09-21T15:45:00+02:00
Stats  : +64/-54 in 8 file(s)
URL    : https://src.fedoraproject.org/rpms/milkytracker/c/d3af92bfa6a854728bcee0ff44066b4aa473b924?branch=f45

Log:
Update to v1.06

---
diff --git a/.gitignore b/.gitignore
index 75d8d58..3e5e2cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ milkytracker-0.90.80.tar.bz2
 /v1.01.00.tar.gz
 /v1.02.00.tar.gz
 /v1.03.00.tar.gz
+/v1.06.tar.gz

diff --git a/milkytracker-1.03.00-c++11.patch b/milkytracker-1.03.00-c++11.patch
deleted file mode 100644
index 4174258..0000000
--- a/milkytracker-1.03.00-c++11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru MilkyTracker-1.03.00/CMakeLists.txt MilkyTracker-1.03.00-cpp11/CMakeLists.txt
---- MilkyTracker-1.03.00/CMakeLists.txt	2020-12-10 00:58:14.000000000 +0200
-+++ MilkyTracker-1.03.00-cpp11/CMakeLists.txt	2023-02-19 17:24:38.288927217 +0200
-@@ -23,7 +23,7 @@
- project(MilkyTracker)
- 
- # Set C++ standard to C++98
--set(CMAKE_CXX_STANDARD 98)
-+set(CMAKE_CXX_STANDARD 11)
- set(CMAKE_CXX_EXTENSIONS OFF)
- 
- # Enable IDE solution folders

diff --git a/milkytracker-1.03.00-no-cmp0004.patch b/milkytracker-1.03.00-no-cmp0004.patch
deleted file mode 100644
index 0a59adc..0000000
--- a/milkytracker-1.03.00-no-cmp0004.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru MilkyTracker-1.03.00/CMakeLists.txt MilkyTracker-1.03.00-no-CMP0004/CMakeLists.txt
---- MilkyTracker-1.03.00/CMakeLists.txt	2026-03-23 21:49:40.689831790 +0200
-+++ MilkyTracker-1.03.00-no-CMP0004/CMakeLists.txt	2026-03-23 21:50:44.605777544 +0200
-@@ -171,10 +171,6 @@
-     message(STATUS "Enabled MIDI support (WinMM)")
-     add_subdirectory(src/midi)
- else()
--    # Workaround for SDL bug #3295, which occurs in SDL2 <2.0.5
--    # https://bugzilla.libsdl.org/show_bug.cgi?id=3295
--    cmake_policy(SET CMP0004 OLD)
--
-     find_package(SDL2 REQUIRED)
- endif()
- 

diff --git a/milkytracker-1.06-VER_FULL.patch b/milkytracker-1.06-VER_FULL.patch
new file mode 100644
index 0000000..81e1a35
--- /dev/null
+++ b/milkytracker-1.06-VER_FULL.patch
@@ -0,0 +1,15 @@
+--- MilkyTracker-1.06/CMakeLists.txt.orig	2025-06-18 22:53:16.000000000 +0200
++++ MilkyTracker-1.06/CMakeLists.txt	2026-09-21 15:35:18.453977258 +0200
+@@ -51,10 +51,10 @@
+ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+ 
+ # Version number in format X.YY.ZZ
+ set(VER_X  1)
+-set(VER_YY 05)
+-set(VER_ZZ 01)
++set(VER_YY 06)
++set(VER_ZZ 00)
+ set(VER_FULL "${VER_X}.${VER_YY}.${VER_ZZ}")
+ 
+ # Generate version header from the above
+ configure_file(

diff --git a/milkytracker-1.06-no-cmp0004.patch b/milkytracker-1.06-no-cmp0004.patch
new file mode 100644
index 0000000..fa0230c
--- /dev/null
+++ b/milkytracker-1.06-no-cmp0004.patch
@@ -0,0 +1,15 @@
+--- MilkyTracker-1.06/CMakeLists.txt.orig	2025-06-18 22:53:16.000000000 +0200
++++ MilkyTracker-1.06/CMakeLists.txt	2026-09-17 23:09:49.737590429 +0200
+@@ -161,12 +161,8 @@
+     # Haiku MIDI support requires no external libraries
+     message(STATUS "Enabled MIDI support (Haiku)")
+     add_subdirectory(src/midi)
+ else()
+-    # Workaround for SDL bug #3295, which occurs in SDL2 <2.0.5
+-    # https://bugzilla.libsdl.org/show_bug.cgi?id=3295
+-    cmake_policy(SET CMP0004 OLD)
+-
+     find_package(SDL2 REQUIRED)
+ endif()
+ 
+ # Prefer static linkage under OS X for libraries located with find_package()

diff --git a/milkytracker.desktop b/milkytracker.desktop
deleted file mode 100644
index 7a7c72a..0000000
--- a/milkytracker.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-
-[Desktop Entry]
-Name=MilkyTracker
-Comment=Module tracker
-Exec=milkytracker %U
-Terminal=false
-Type=Application
-Icon=milkytracker
-StartupNotify=false
-Categories=AudioVideo;Audio;Sequencer;

diff --git a/milkytracker.spec b/milkytracker.spec
index d3d2e0c..4c88d2a 100644
--- a/milkytracker.spec
+++ b/milkytracker.spec
@@ -1,16 +1,20 @@
 Name:           milkytracker
-Version:        1.03.00
-Release:        16%{?dist}
+%global rtld_name org.milkytracker.MilkyTracker
+
+Version:        1.06
+Release:        1%{?dist}
 Summary:        Module tracker software for creating music
 
-# Automatically converted from old format: GPLv3+ - review is highly recommended.
-License:        GPL-3.0-or-later
+License:        GPL-3.0-or-later AND BSD-3-Clause
 URL:            http://www.milkytracker.org/
 Source0:        https://github.com/milkytracker/MilkyTracker/archive/v%{version}.tar.gz
-Patch0:         milkytracker-1.03.00-c++11.patch
-Patch1:         milkytracker-1.03.00-no-cmp0004.patch
 
-BuildRequires: make
+# Remove workaround for bug when using SDL2 <2.0.5
+Patch1:         milkytracker-1.06-no-cmp0004.patch
+
+# Milkytracker 1.06's CMakeLists.txt set "1.05.01" as the version
+Patch2:         milkytracker-1.06-VER_FULL.patch
+
 BuildRequires:  SDL2-devel
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@@ -25,17 +29,18 @@ BuildRequires:  jack-audio-connection-kit-devel
 MilkyTracker is an application for creating music in the .MOD and .XM formats.
 Its goal is to be free replacement for the popular Fasttracker II software.
 
+
 %prep
-%setup -q -n MilkyTracker-%{version}
-%patch -P0 -p1
-%patch -P1 -p1
+%autosetup -p1 -n MilkyTracker-%{version}
 
 find . -regex '.*\.\(cpp\|h\|inl\)' -print0 | xargs -0 chmod 644
 
+
 %build
 %{cmake} -DBUILD_SHARED_LIBS:BOOL=OFF
 %cmake_build
 
+
 %install
 %cmake_install
 
@@ -45,27 +50,37 @@ find . -regex '.*\.\(cpp\|h\|inl\)' -print0 | xargs -0 chmod 644
 mv -v %{buildroot}%{_docdir}/MilkyTracker %{buildroot}%{_pkgdocdir}
 
 # copy the icon
-mkdir -p %{buildroot}%{_datadir}/pixmaps
-cp -p resources/pictures/carton.png %{buildroot}%{_datadir}/pixmaps/milkytracker.png
+install -m 755 -d %{buildroot}%{_datadir}/pixmaps
+install -m 644 -p resources/pictures/carton.png %{buildroot}%{_datadir}/pixmaps/milkytracker.png
 
 # copy the desktop file
-desktop-file-install \
-  --dir=%{buildroot}%{_datadir}/applications/ resources/milkytracker.desktop
+install -m 755 -d %{buildroot}%{_datadir}/applications
+install -m 644 -p resources/milkytracker.desktop %{buildroot}%{_datadir}/applications/
 
 # copy the appdata file
-install -v -D -m 644 resources/milkytracker.appdata %{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
+install -m 755 -d %{buildroot}%{_metainfodir}
+install -m 644 -p %{_vpath_builddir}/resources/org.milkytracker.MilkyTracker.metainfo.xml %{buildroot}%{_metainfodir}
+
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/milkytracker.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/%{rtld_name}.metainfo.xml
 
 
 %files
+%{_bindir}/milkycli
 %{_bindir}/milkytracker
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/metainfo/%{name}.appdata.xml
+%{_datadir}/metainfo/%{rtld_name}.metainfo.xml
 %{_datadir}/pixmaps/milkytracker.png
 %{_datadir}/%{name}
 %{_pkgdocdir}
 
+
 %changelog
+* Mon Sep 21 2026 Artur Frenszek-Iwicki <fedora@svgames.pl> - 1.06-1
+- Update to v1.06
+
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.03.00-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 

diff --git a/sources b/sources
index a86fb18..a11916f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v1.03.00.tar.gz) = d5489994d9c5d24552073afcbd787c20720096dd81d640356fc13b2e2b8a49713b798066d54f2b589f3819c14279142e295e4d6317ed325537069faad47abbe6
+SHA512 (v1.06.tar.gz) = 7e4cc898a814554cd5d9d8765e9ddf8f294010ead12316d65d15cc5b70cd9c3ebf5adca7f80d7f00921d3da3ae50909655ae03c8169d570de3098700f984fd7b

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

only message in thread, other threads:[~2026-09-21 14:07 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-21 14:07 [rpms/milkytracker] f45: Update to v1.06 Artur Frenszek-Iwicki

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