Compare commits
No commits in common. "rawhide" and "f29" have entirely different histories.
6 changed files with 58 additions and 77 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,4 +1,3 @@
|
|||
zaz-0.7.0.tar.bz2
|
||||
zaz-0.8.0.tar.bz2
|
||||
/zaz-1.0.0.tar.bz2
|
||||
/zaz-1.0.1.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (zaz-1.0.1.tar.gz) = 23ec04acaf0e75d7b99a4b58992d77d8d2074db1a2712c58a2c2a719682ed5aef508d5ffb15ff8c9a1a5ced119342654b6e599300b36e82488865dd851acf3da
|
||||
d92a043780d06c699da0ba04aab32a6b zaz-1.0.0.tar.bz2
|
||||
|
|
|
|||
27
zaz-1.0.0-libvorbis.patch
Normal file
27
zaz-1.0.0-libvorbis.patch
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
Description: Link with libvorbis, too.
|
||||
This is fallout from the fact that other libraries in Debian, such as
|
||||
libvorbisfile, no longer include their own dependencies in the pkg-config
|
||||
output. Until now, zaz built just fine because -lvorbis was added by
|
||||
other libraries; now it has to add it on its own.
|
||||
.
|
||||
This bug should really be fixed upstream by adding an explicit check for
|
||||
libvorbis in configure.ac, something like
|
||||
AC_CHECK_LIB([vorbis], [vorbis_bitrate_addblock])
|
||||
I do intend to do that in a future upload, but IMHO this minimal patch
|
||||
ought to be suitable for the Jessie freeze.
|
||||
Debian-Bug: https://bugs.debian.org/768718
|
||||
Author: Peter Pentchev <roam@ringlet.net>
|
||||
Forwarded: not-yet
|
||||
Last-Update: 2014-11-10
|
||||
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -273,7 +273,7 @@
|
||||
splash.cpp
|
||||
|
||||
zaz_LDFLAGS =
|
||||
-zaz_LDADD = $(ZAZ_LIBS) $(FTGL_LIBS) $(GL_LIBS) @LIBINTL@
|
||||
+zaz_LDADD = $(ZAZ_LIBS) -lvorbis $(FTGL_LIBS) $(GL_LIBS) @LIBINTL@
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
17
zaz-1.0.0-mismatched_delete.patch
Normal file
17
zaz-1.0.0-mismatched_delete.patch
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
Author: Steve Cotton <steve@s.cotton.clara.co.uk>
|
||||
Description: Fix crash, fixes a potential memory corruption
|
||||
Bug-Debian: http://bugs.debian.org/649017
|
||||
Bug-Ubuntu: http://launchpad.net/bugs/656468
|
||||
Forwarded: no
|
||||
Last-Update: 2011-11-16
|
||||
--- a/src/game.cpp
|
||||
+++ b/src/game.cpp
|
||||
@@ -266,7 +266,7 @@
|
||||
delete ballPaths[b];
|
||||
}
|
||||
|
||||
- delete ballPaths;
|
||||
+ delete[] ballPaths;
|
||||
if (ownTextures)
|
||||
glDeleteTextures(14, ballText);
|
||||
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -durN zaz-1.0.1.orig/src/Makefile.in zaz-1.0.1/src/Makefile.in
|
||||
--- zaz-1.0.1.orig/src/Makefile.in 2021-01-31 02:41:45.000000000 +0100
|
||||
+++ zaz-1.0.1/src/Makefile.in 2021-03-16 17:11:17.855913419 +0100
|
||||
@@ -408,7 +408,7 @@
|
||||
splash.cpp
|
||||
|
||||
zaz_CXXFLAGS = $(ZAZ_CFLAGS)
|
||||
-zaz_LDADD = $(ZAZ_LIBS) $(FTGL_LIBS) $(GL_LIBS) @LIBINTL@
|
||||
+zaz_LDADD = $(ZAZ_LIBS) -lvorbis $(FTGL_LIBS) $(GL_LIBS) @LIBINTL@
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
76
zaz.spec
76
zaz.spec
|
|
@ -1,27 +1,28 @@
|
|||
Name: zaz
|
||||
Version: 1.0.1
|
||||
Release: 13%{?dist}
|
||||
Version: 1.0.0
|
||||
Release: 24%{?dist}
|
||||
Summary: A puzzle game where the player has to arrange balls in triplets
|
||||
|
||||
# Music released under CC-BY-SA
|
||||
# Automatically converted from old format: GPLv3+ and CC-BY-SA - review is highly recommended.
|
||||
License: GPL-3.0-or-later AND LicenseRef-Callaway-CC-BY-SA
|
||||
License: GPLv3+ and CC-BY-SA
|
||||
URL: http://zaz.sourceforge.net/
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
|
||||
# 128x128px icon by Zbigniew Jędrzejewski-Szmek
|
||||
Source1: %{name}.png
|
||||
# Appdata by Richard Hughes
|
||||
Source2: %{name}.appdata.xml
|
||||
# Debian man page
|
||||
Source3: %{name}.6
|
||||
# Fix crash, fixes a potential memory corruption
|
||||
# http://bugs.debian.org/649017
|
||||
Patch0: %{name}-1.0.0-mismatched_delete.patch
|
||||
# Fix jumpy keyboard
|
||||
# http://bugs.debian.org/649021
|
||||
Patch0: %{name}-1.0.0-jumpy_keyboard.patch
|
||||
Patch1: %{name}-1.0.0-jumpy_keyboard.patch
|
||||
# Link with libvorbis
|
||||
# https://bugs.debian.org/768718
|
||||
Patch1: %{name}-1.0.1-libvorbis.patch
|
||||
Patch2: %{name}-1.0.0-libvorbis.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: mesa-libGL-devel
|
||||
BuildRequires: SDL_image-devel
|
||||
|
|
@ -46,7 +47,10 @@ A 3D accelerator is needed for decent gameplay.
|
|||
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
# Fix permissions
|
||||
chmod 644 src/*.{cpp,h}
|
||||
|
|
@ -116,60 +120,6 @@ install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man6/
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
|
||||
|
||||
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 1.0.1-9
|
||||
- convert license to SPDX
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Mar 16 2021 Andrea Musuruane <musuruan@gmail.com> - 1.0.1-1
|
||||
- Updated to new upstream release
|
||||
|
||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-29
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue