From eb85226096a0023730a194b6ef519e01c909b5a3 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 15 Nov 2022 01:44:02 -0500 Subject: [PATCH] import sdl12-compat-1.2.52-1.el9 --- .gitignore | 2 +- .sdl12-compat.metadata | 2 +- SPECS/sdl12-compat.spec | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 264a634..f602dcf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/sdl12-compat-4e4527a.tar.gz +SOURCES/sdl12-compat-1.2.52.tar.gz diff --git a/.sdl12-compat.metadata b/.sdl12-compat.metadata index 5a4bee4..3856483 100644 --- a/.sdl12-compat.metadata +++ b/.sdl12-compat.metadata @@ -1 +1 @@ -1e5f8f43b1ceef2003b83cc63c3b90542c5c880b SOURCES/sdl12-compat-4e4527a.tar.gz +9e90950c7c98c55adef3c75397ffd5bf8bfed6af SOURCES/sdl12-compat-1.2.52.tar.gz diff --git a/SPECS/sdl12-compat.spec b/SPECS/sdl12-compat.spec index 9a80b66..16e5a04 100644 --- a/SPECS/sdl12-compat.spec +++ b/SPECS/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,10 @@ rm -rf %{buildroot}%{_libdir}/*.a %changelog +* Fri Mar 04 2022 Neal Gompa - 1.2.52-1 +- Rebase to 1.2.52 + Resolves: rhbz#2060907 + * Sat Dec 11 2021 Neal Gompa - 0.0.1~git.20211125.4e4527a-4 - Conflict with all old SDL subpackages properly