From ef1331be0be5303c0fe15c2e168da73de4ccdf77 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Feb 19 2021 15:04:36 +0000 Subject: 0.2.7 --- diff --git a/.gitignore b/.gitignore index 765a611..3752563 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ apricots-0.2.6.tar.gz +/apricots-0.2.7.tar.gz diff --git a/apricots-0.2.6-alincludes.patch b/apricots-0.2.6-alincludes.patch deleted file mode 100644 index df2d8f5..0000000 --- a/apricots-0.2.6-alincludes.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- apricots/sampleio.cpp~ 2012-03-02 07:49:55.000000000 -0600 -+++ apricots/sampleio.cpp 2012-03-02 08:04:28.828977306 -0600 -@@ -13,6 +13,10 @@ - // Code cleanup - - #include "sampleio.h" -+#include -+#include -+#include -+ - - // Empty Noaudio sound routines - #if AP_AUDIO==AUDIO_NOAUDIO diff --git a/apricots-0.2.6-alut-apricots.patch b/apricots-0.2.6-alut-apricots.patch deleted file mode 100644 index bb6204d..0000000 --- a/apricots-0.2.6-alut-apricots.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- apricots/apricots.cpp 2008-08-26 12:38:27.000000000 -0500 -+++ apricots/apricots.cpp 2008-08-26 12:38:27.000000000 -0500 -@@ -16,6 +16,7 @@ - int main(int, char**){ - #endif - -+atexit(SDL_Quit); - // Initialize data - gamedata g; - init_data(g); diff --git a/apricots-0.2.6-alut-configure.patch b/apricots-0.2.6-alut-configure.patch deleted file mode 100644 index 6f204ba..0000000 --- a/apricots-0.2.6-alut-configure.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.in 2008-08-26 12:40:55.000000000 -0500 -+++ configure.in 2008-08-26 12:40:55.000000000 -0500 -@@ -100,7 +100,9 @@ - - dnl Check for OpenAL - AC_CHECK_HEADER(AL/al.h,[CXXFLAGS="$CXXFLAGS -DAP_AUDIO_OPENAL"]) --AC_CHECK_LIB( openal, alutInit) -+dnl AC_CHECK_LIB( openal, alutInit) -+AC_CHECK_LIB( openal, alGetError) -+AC_CHECK_LIB( alut, alutInit) - - KDE_CHECK_EXTRA_LIBS - all_libraries="$all_libraries $USER_LDFLAGS" diff --git a/apricots-0.2.6-alut-sampleio.patch b/apricots-0.2.6-alut-sampleio.patch deleted file mode 100644 index 02fc5d8..0000000 --- a/apricots-0.2.6-alut-sampleio.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- apricots/sampleio.cpp 2008-08-26 12:40:09.000000000 -0500 -+++ apricots/sampleio.cpp 2008-08-26 12:40:09.000000000 -0500 -@@ -74,12 +74,12 @@ - alListenerfv(AL_ORIENTATION, front ); - - // Load in samples -- ALvoid* data = malloc(5 * (512 * 3) * 1024); -+ //ALvoid* data = malloc(5 * (512 * 3) * 1024); - alGenBuffers(numsamples, samples); - - for (int i = 0; i < numsamples; i++){ -- ALsizei freq; -- ALboolean fileok; -+ //ALsizei freq; -+ //ALboolean fileok; - // Evil OpenAL portability fix done here - #ifdef _WIN32 - ALenum format; -@@ -87,15 +87,17 @@ - alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash); - fileok = (alGetError() == AL_NO_ERROR); - #else -- ALsizei format; -- ALsizei trash; -- fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq); -+ //ALsizei format; -+ //ALsizei trash; -+ //fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq); -+ samples[i] = alutCreateBufferFromFile(filenames[i]); - #endif -- if (!fileok){ -+ //if (!fileok){ -+ if (samples[i] == AL_NONE){ - cerr << "sampleio: could not open " << filenames[i] << endl; - exit(1); - } -- alBufferData(samples[i], format, data, filelen, freq); -+ //alBufferData(samples[i], format, data, filelen, freq); - } - - // Generate Sources -@@ -107,7 +109,7 @@ - alSourcefv(sources[j], AL_ORIENTATION, back ); - } - -- free(data); -+ //free(data); - - } - diff --git a/apricots-0.2.6-path.patch b/apricots-0.2.6-path.patch deleted file mode 100644 index e8e2958..0000000 --- a/apricots-0.2.6-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in 2008-08-26 12:58:47.000000000 -0500 -+++ configure.in 2008-08-26 12:58:47.000000000 -0500 -@@ -44,7 +44,7 @@ - dnl - unset CDPATH - dnl make /usr/local the default for the installation --AC_PREFIX_DEFAULT(/usr/local) -+AC_PREFIX_DEFAULT(/usr) - - if test "x$prefix" = "xNONE"; then - prefix=$ac_default_prefix diff --git a/apricots.spec b/apricots.spec index f89c625..657d530 100644 --- a/apricots.spec +++ b/apricots.spec @@ -2,24 +2,19 @@ %global debug_package %{nil} %define apricotsdir %{_datadir}/apricots Name: apricots -Version: 0.2.6 -Release: 30%{?dist} +Version: 0.2.7 +Release: 1%{?dist} Summary: 2D air combat game License: GPLv2 -URL: http://www.fishies.org.uk/apricots.html -Source0: http://www.fishies.org.uk/apricots-%{version}.tar.gz +URL: https://github.com/moggers87/apricots +Source0: %{url}/archive/v%{version}/apricots-%{version}.tar.gz Source1: apricots.png #Icon created from screenshot on website Source2: apricots.desktop -Patch0: apricots-0.2.6-alut-apricots.patch -Patch1: apricots-0.2.6-alut-sampleio.patch -Patch2: apricots-0.2.6-alut-configure.patch -# alut patches sent upstream. -Patch3: apricots-0.2.6-path.patch -#Patch4: apricots-0.2.6-alincludes.patch + BuildRequires: gcc gcc-c++ -BuildRequires: SDL-devel +BuildRequires: SDL2-devel BuildRequires: freealut-devel BuildRequires: desktop-file-utils BuildRequires: openal-soft-devel @@ -35,28 +30,14 @@ and fun. %prep %setup -q -chmod -x apricots/*.cpp -chmod -x apricots/*.h -chmod -x AUTHORS -chmod -x ChangeLog -chmod -x COPYING -chmod -x README -chmod -x TODO - -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 -#%patch4 -p0 - %build +./bootstrap #Use %%configure once --as-needed is fixed, and fix debug at top of spec. ./configure --prefix=%{_prefix} %make_build %install -rm -rf %{buildroot} mkdir -p %{buildroot}%{_bindir} install -m 755 apricots/apricots %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_datadir}/apricots @@ -78,7 +59,8 @@ install -p -m 644 %{SOURCE1} \ %files -%doc AUTHORS ChangeLog COPYING README TODO +%license COPYING +%doc AUTHORS ChangeLog README.md %{_bindir}/apricots %{_datadir}/apricots %{_datadir}/applications/apricots.desktop @@ -87,6 +69,9 @@ install -p -m 644 %{SOURCE1} \ %changelog +* Fri Feb 19 2021 Gwyn Ciesla - 0.2.7-1 +- 0.2.7, new upstream. + * Tue Jan 26 2021 Fedora Release Engineering - 0.2.6-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 6389472..3d7266c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -910828d717e46d8cbd9c24f702d09fbc apricots-0.2.6.tar.gz +SHA512 (apricots-0.2.7.tar.gz) = cea322ec712d4fb8f6e83feca57c9613b86f47d0899c78290c44916e5c7c817e218d6b4188ee73bcf5aec9cbefb13acc0fe5fbdaa03a99186cd06d0f9942e824