From 00c42397d45a9c0cb05c111613cfc21938f948d7 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 3 Mar 2022 15:56:12 -0500 Subject: [PATCH] Update to 1.2.52 (RH#2060590) --- .gitignore | 1 + sdl12-compat.spec | 29 ++++++++++++++--------------- sources | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index e9316ed..2855c1b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /sdl12-compat-c6cfc8f.tar.gz /sdl12-compat-a10d6b6.tar.gz /sdl12-compat-4e4527a.tar.gz +/sdl12-compat-1.2.52.tar.gz diff --git a/sdl12-compat.spec b/sdl12-compat.spec index 27270e9..e976ebe 100644 --- a/sdl12-compat.spec +++ b/sdl12-compat.spec @@ -1,7 +1,3 @@ -%global commit 4e4527a123fb99a1677055d89c5fc74323ddc4d8 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20211125 - %if 0%{?rhel} # Features disabled for RHEL %bcond_with static @@ -10,14 +6,14 @@ %endif Name: sdl12-compat -Version: 0.0.1~git.%{commitdate}.%{shortcommit} -Release: 4%{?dist} +Version: 1.2.52 +Release: 1%{?dist} Summary: SDL 1.2 runtime compatibility library using SDL 2.0 # mp3 decoder code is MIT-0/PD # SDL_opengl.h is zlib and MIT License: zlib and (Public Domain or MIT-0) and MIT URL: https://github.com/libsdl-org/sdl12-compat -Source0: %{url}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source0: %{url}/archive/release-%{version}/%{name}-%{version}.tar.gz # Multilib aware-header stub Source1: SDL_config.h @@ -38,10 +34,10 @@ BuildRequires: mesa-libGLU-devel # This replaces SDL Obsoletes: SDL < 1.2.15-49 Conflicts: SDL < 1.2.50 -Provides: SDL = 1.2.50 -Provides: SDL%{?_isa} = 1.2.50 +Provides: SDL = %{version} +Provides: SDL%{?_isa} = %{version} # This dlopens SDL2 (?!), so manually depend on it -Requires: SDL2%{?_isa} >= 2.0.14 +Requires: SDL2%{?_isa} >= 2.0.18 %description Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -59,8 +55,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} # This replaces SDL-devel Obsoletes: SDL-devel < 1.2.15-49 Conflicts: SDL-devel < 1.2.50 -Provides: SDL-devel = 1.2.50 -Provides: SDL-devel%{?_isa} = 1.2.50 +Provides: SDL-devel = %{version} +Provides: SDL-devel%{?_isa} = %{version} %if ! %{with static} # We don't provide the static library, but we want to replace SDL-static anyway Obsoletes: SDL-static < 1.2.15-49 @@ -92,8 +88,8 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release} # This replaces SDL-static Obsoletes: SDL-static < 1.2.15-49 Conflicts: SDL-static < 1.2.50 -Provides: SDL-static = 1.2.50 -Provides: SDL-static%{?_isa} = 1.2.50 +Provides: SDL-static = %{version} +Provides: SDL-static%{?_isa} = %{version} %description static Simple DirectMedia Layer (SDL) is a cross-platform multimedia library @@ -111,7 +107,7 @@ this layer. %prep -%autosetup -n %{name}-%{commit} -S git_am +%autosetup -n %{name}-release-%{version} -S git_am %build @@ -154,6 +150,9 @@ rm -rf %{buildroot}%{_libdir}/*.a %changelog +* Thu Mar 03 2022 Neal Gompa - 1.2.52-1 +- Update to 1.2.52 (RH#2060590) + * Sat Jan 22 2022 Fedora Release Engineering - 0.0.1~git.20211125.4e4527a-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index ce9e201..33b6f11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sdl12-compat-4e4527a.tar.gz) = bd613d367bc0d0e7e011b31acf5f81075708a783a71073e0bbcf6c4e62538da6ba412a685f7bf50714b8c78fb77e0ce76b54d32dae4ef4110400d42dcac50bb8 +SHA512 (sdl12-compat-1.2.52.tar.gz) = cd8f34f61ee9c6d0bd635f4c7a6f3cfb6bb570976f3bf843f1e3893b3a86d087a40bdf5f6bb2de16c9534ec42bc846b6ff599ac557c3b088c447e6106e2558f9