Compare commits
32 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eb8b720b40 | ||
|
|
6bd1ebc5df | ||
|
|
a91d4b5dfd | ||
|
|
c9296b1cb0 | ||
|
|
ba84c28485 | ||
|
|
fc7d924714 | ||
|
|
28bafb957d | ||
|
|
4800191084 | ||
|
|
a58812aca8 | ||
|
|
2ed1589cd8 | ||
|
|
5dcd4e3675 | ||
|
|
6dadca94de | ||
|
|
38b526e53d | ||
|
|
0a86662498 | ||
|
|
86b98b0b26 | ||
|
|
f06be5bf57 | ||
|
|
1a1c2609e8 | ||
|
|
56611b7d2c | ||
|
|
db6004dafa | ||
|
|
3eb4b8a427 | ||
|
|
f2339cae36 | ||
|
|
9d69c859fe | ||
|
|
9671839fd1 | ||
|
|
6c27565c0c | ||
|
|
fc09ee14b0 | ||
|
|
9a03291e79 | ||
|
|
212dce30ab | ||
|
|
916919f6ba | ||
|
|
e0b1cf7ca2 | ||
|
|
389f41e533 | ||
|
|
dd39b7c5bc | ||
|
|
6af5570562 |
3 changed files with 139 additions and 22 deletions
31
abe-1.1-configure-c99.patch
Normal file
31
abe-1.1-configure-c99.patch
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
--- configure
|
||||
+++ configure
|
||||
@@ -960,7 +960,7 @@ cat > conftest.$ac_ext << EOF
|
||||
#line 961 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
-main(){return(0);}
|
||||
+int main(){return(0);}
|
||||
EOF
|
||||
if { (eval echo configure:966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
ac_cv_prog_cc_works=yes
|
||||
@@ -1418,8 +1418,8 @@ else
|
||||
#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
|
||||
#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
|
||||
int main () { int i; for (i = 0; i < 256; i++)
|
||||
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
|
||||
-exit (0); }
|
||||
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) return 2;
|
||||
+return 0; }
|
||||
|
||||
EOF
|
||||
if { (eval echo configure:1426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
|
||||
@@ -2031,7 +2031,7 @@ if test "$ac_x_libraries" = NO; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2033 "configure"
|
||||
#include "confdefs.h"
|
||||
-
|
||||
+#include <X11/Intrinsic.h>
|
||||
int main() {
|
||||
${x_direct_test_function}()
|
||||
; return 0; }
|
||||
11
abe-finishdrawmap.patch
Normal file
11
abe-finishdrawmap.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- src/Map.c~ 2005-03-05 10:20:04.000000000 -0600
|
||||
+++ src/Map.c 2025-01-08 15:30:08.904971564 -0600
|
||||
@@ -945,7 +945,7 @@
|
||||
drawMap(); // this calls finishDrawMap
|
||||
} else {
|
||||
// update the screen
|
||||
- finishDrawMap(!map.redraw);
|
||||
+ finishDrawMap();
|
||||
}
|
||||
|
||||
// uncomment to test slow machine game speed
|
||||
119
abe.spec
119
abe.spec
|
|
@ -1,9 +1,9 @@
|
|||
Name: abe
|
||||
Version: 1.1
|
||||
Release: 29%{?dist}
|
||||
Release: 55%{?dist}
|
||||
|
||||
Summary: Scrolling, platform-jumping, ancient pyramid exploring game
|
||||
License: GPL+
|
||||
License: GPL-1.0-or-later
|
||||
URL: http://abe.sourceforge.net/
|
||||
Source0: http://downloads.sourceforge.net/abe/%{name}-%{version}.tar.gz
|
||||
Source1: %{name}-icons.tar.xz
|
||||
|
|
@ -22,29 +22,32 @@ Patch2: %{name}-1.1-format.patch
|
|||
Patch3: %{name}-1.1-aarch64.patch
|
||||
# Fix build failure with -Werror=format-security
|
||||
Patch4: %{name}-1.1-format-security.patch
|
||||
Patch5: %{name}-1.1-configure-c99.patch
|
||||
Patch6: %{name}-finishdrawmap.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libXi-devel
|
||||
BuildRequires: libXmu-devel
|
||||
BuildRequires: SDL-devel
|
||||
BuildRequires: SDL_mixer-devel
|
||||
BuildRequires: make
|
||||
|
||||
Requires: hicolor-icon-theme
|
||||
|
||||
%global icondir %{_datadir}/icons/hicolor
|
||||
|
||||
%description
|
||||
A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game,
|
||||
vaguely in the style of similar games for the Commodore+4.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch -P0
|
||||
%patch -P1
|
||||
%patch -P2
|
||||
%patch -P3
|
||||
%patch -P4
|
||||
%patch -P5
|
||||
%patch -P6
|
||||
|
||||
# Fix the FSF's address
|
||||
sed 's/59 Temple Place, Suite 330, Boston, MA 02111-1307/51 Franklin Street, Suite 500, Boston, MA 02110-1335/' COPYING > COPYING.new
|
||||
|
|
@ -54,18 +57,18 @@ mv -f COPYING.new COPYING
|
|||
%build
|
||||
%configure --with-data-dir=%{_datadir}/%{name}
|
||||
sed -i "s|^CFLAGS =.*|CFLAGS = ${RPM_OPT_FLAGS} \$\(SDL_CFLAGS\)|" src/Makefile
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
|
||||
%install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install
|
||||
%make_install
|
||||
|
||||
# make install does not copy the game data files.
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/appdata/
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
|
||||
mkdir -p $RPM_BUILD_ROOT/%{icondir}
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/
|
||||
cp -p -r images maps sounds $RPM_BUILD_ROOT/%{_datadir}/%{name}
|
||||
tar xJf %{SOURCE1} -C $RPM_BUILD_ROOT%{icondir}
|
||||
tar xJf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/
|
||||
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/appdata/
|
||||
|
||||
cat << EOF > %{name}.desktop
|
||||
|
|
@ -81,14 +84,6 @@ EOF
|
|||
|
||||
desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.desktop
|
||||
|
||||
%post
|
||||
touch --no-create %{icondir} >&/dev/null ||:
|
||||
gtk-update-icon-cache %{icondir} >&/dev/null ||:
|
||||
|
||||
%postun
|
||||
touch --no-create %{icondir} >&/dev/null ||:
|
||||
gtk-update-icon-cache %{icondir} >&/dev/null ||:
|
||||
|
||||
%files
|
||||
%doc README
|
||||
%license COPYING
|
||||
|
|
@ -99,6 +94,86 @@ gtk-update-icon-cache %{icondir} >&/dev/null ||:
|
|||
%{_datadir}/icons/hicolor/*/apps/%{name}.png
|
||||
|
||||
%changelog
|
||||
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-55
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-54
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-53
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Jan 08 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.1-52
|
||||
- Patch for GCC 15
|
||||
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-51
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-50
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-49
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-48
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Wed Mar 08 2023 Gwyn Ciesla <gwync@protonmail.com> - 1.1-47
|
||||
- migrated to SPDX license
|
||||
|
||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-46
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Dec 06 2022 Peter Fordham <peter.fordham@gmail.com> - 1.1-45
|
||||
- Port configure script to C99
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-44
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-43
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-42
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-41
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-40
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-39
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 1.1-38
|
||||
- Use make macros
|
||||
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-37
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-36
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-35
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-34
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-33
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sun Jan 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.1-32
|
||||
- Remove obsolete scriptlets
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-31
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-30
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-29
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue