5 changed files with 51 additions and 100 deletions
--- a/.gitignore
+++ b/.gitignore
@ -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
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (zaz-1.0.1.tar.gz) = 23ec04acaf0e75d7b99a4b58992d77d8d2074db1a2712c58a2c2a719682ed5aef508d5ffb15ff8c9a1a5ced119342654b6e599300b36e82488865dd851acf3da
+d92a043780d06c699da0ba04aab32a6b  zaz-1.0.0.tar.bz2
--- a/zaz-1.0.0-mismatched_delete.patch
+++ b/zaz-1.0.0-mismatched_delete.patch
@ -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);
+ 
--- a/zaz-1.0.1-libvorbis.patch
+++ b/zaz-1.0.1-libvorbis.patch
@ -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:
--- a/zaz.spec
+++ b/zaz.spec
@ -1,28 +1,25 @@
 Name:           zaz
-Version:        1.0.1
-Release:        13%{?dist}
+Version:        1.0.0
+Release:        20%{?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
-# Link with libvorbis
-# https://bugs.debian.org/768718
-Patch1:         %{name}-1.0.1-libvorbis.patch
+Patch1:         %{name}-1.0.0-jumpy_keyboard.patch

-BuildRequires:  make
-BuildRequires:  gcc-c++
 BuildRequires:  mesa-libGL-devel
 BuildRequires:  SDL_image-devel
 BuildRequires:  libtheora-devel
@ -46,15 +43,18 @@ A 3D accelerator is needed for decent gameplay.


 %prep
-%autosetup -p1
+%setup -q
+%patch0 -p1
+%patch1 -p1

 # Fix permissions
 chmod 644 src/*.{cpp,h}


 %build
+LDFLAGS=-lvorbis
 %configure
-%make_build
+make %{?_smp_mflags}


 %install
@ -92,11 +92,11 @@ desktop-file-validate \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

 # Install appdata
-install -d $RPM_BUILD_ROOT%{_datadir}/metainfo
+install -d $RPM_BUILD_ROOT%{_datadir}/appdata
 install -p -m 0644 %{SOURCE2} \
-  $RPM_BUILD_ROOT%{_datadir}/metainfo
+  $RPM_BUILD_ROOT%{_datadir}/appdata
 appstream-util validate-relax --nonet \
-  $RPM_BUILD_ROOT%{_datadir}/metainfo/*.appdata.xml
+  $RPM_BUILD_ROOT%{_datadir}/appdata/*.appdata.xml

 # Install man page
 install -d $RPM_BUILD_ROOT%{_mandir}/man6
@ -104,10 +104,26 @@ install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man6/

 %find_lang %{name}

+
+%post
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f %{name}.lang
 %{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/metainfo/%{name}.appdata.xml
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_mandir}/man6/*
@ -116,75 +132,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
-
-* Sat Feb 24 2018 Andrea Musuruane <musuruan@gmail.com> - 1.0.0-23
- Added gcc dependency
- Added a patch from Debian to link libvorbis
- Used new AppData directory
- Spec file clean up
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 18 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.0.0-21
- Remove obsolete scriptlets
-
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild