Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package khunphan for openSUSE:Factory checked in at 2024-02-01 18:05:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/khunphan (Old) and /work/SRC/openSUSE:Factory/.khunphan.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "khunphan" Thu Feb 1 18:05:24 2024 rev:22 rq:1143211 version:0.55 Changes: -------- --- /work/SRC/openSUSE:Factory/khunphan/khunphan.changes 2017-02-12 00:49:26.309650416 +0100 +++ /work/SRC/openSUSE:Factory/.khunphan.new.1815/khunphan.changes 2024-02-01 18:06:04.668589421 +0100 @@ -1,0 +2,5 @@ +Sat Jan 20 02:30:26 UTC 2024 - Bernhard Wiedemann <bwiedem...@suse.com> + +- Use %autopatch to fix compilation with rpm-4.19 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ khunphan.spec ++++++ --- /var/tmp/diff_new_pack.f9nMkF/_old 2024-02-01 18:06:05.352614201 +0100 +++ /var/tmp/diff_new_pack.f9nMkF/_new 2024-02-01 18:06:05.352614201 +0100 @@ -37,7 +37,7 @@ Source0: http://www.ibiblio.org/pub/Linux/games/strategy/khunphan-0.55.tar.bz2 Source1: %name.desktop Source2: configure.ac -Patch: khunphan-0.55-codecleanup.diff +Patch0: khunphan-0.55-codecleanup.diff Patch1: khunphan-freeglut.diff Patch2: khunphan-DESTDIR.diff Patch3: khunphan-0.55-png_uint_32.diff @@ -61,11 +61,7 @@ %prep %setup -q -%patch -%patch1 -%patch2 -%patch3 -%patch4 -p1 +%autopatch -p1 chmod -x khunphan/{*.cpp,*.h} rm -f aclocal.m4 acinclude.m4 configure.files configure.in* cp %{S:2} . ++++++ khunphan-0.55-codecleanup.diff ++++++ --- /var/tmp/diff_new_pack.f9nMkF/_old 2024-02-01 18:06:05.380615216 +0100 +++ /var/tmp/diff_new_pack.f9nMkF/_new 2024-02-01 18:06:05.384615361 +0100 @@ -1,5 +1,5 @@ ---- khunphan/bstring.cpp -+++ khunphan/bstring.cpp +--- a/khunphan/bstring.cpp ++++ b/khunphan/bstring.cpp @@ -197,8 +197,10 @@ char *p; @@ -26,8 +26,8 @@ } char BString::firstchar(void) const ---- khunphan/bstring.h -+++ khunphan/bstring.h +--- a/khunphan/bstring.h ++++ b/khunphan/bstring.h @@ -122,35 +122,35 @@ void FScat(const char *s1, const char *s2, BString& s3); @@ -92,8 +92,8 @@ #endif // #ifndef __bstring_h__ ---- khunphan/bthreadfactory.cpp -+++ khunphan/bthreadfactory.cpp +--- a/khunphan/bthreadfactory.cpp ++++ b/khunphan/bthreadfactory.cpp @@ -39,7 +39,7 @@ atexit ( BThreadFactory::finalize ); } @@ -109,8 +109,8 @@ #endif -}; +} ---- khunphan/kpboard.cpp -+++ khunphan/kpboard.cpp +--- a/khunphan/kpboard.cpp ++++ b/khunphan/kpboard.cpp @@ -227,10 +227,10 @@ ::fprintf(fp, "\n"); } @@ -124,8 +124,8 @@ { // internal caching: if id is zero it first has to be calculated ---- khunphan/kpboard.h -+++ khunphan/kpboard.h +--- a/khunphan/kpboard.h ++++ b/khunphan/kpboard.h @@ -50,7 +50,7 @@ bool Move(tKPTokenID id, tKPDirection d); bool CanMove(tKPTokenID aTokenID, tKPDirection d) const; @@ -135,8 +135,8 @@ static KPIdHash idHash; bool IsSolved(void) const; int GetX(tKPTokenID aTokenID) const; ---- khunphan/kpglutuserinterface.cpp -+++ khunphan/kpglutuserinterface.cpp +--- a/khunphan/kpglutuserinterface.cpp ++++ b/khunphan/kpglutuserinterface.cpp @@ -24,6 +24,7 @@ #include <windows.h> #endif @@ -145,8 +145,8 @@ #include "kpglutuserinterface.h" ---- khunphan/kpidhash.cpp -+++ khunphan/kpidhash.cpp +--- a/khunphan/kpidhash.cpp ++++ b/khunphan/kpidhash.cpp @@ -168,9 +168,9 @@ continue; while ((n = p->pnext) != NULL) { @@ -159,8 +159,8 @@ p = p->pnext; } } ---- khunphan/main.cpp -+++ khunphan/main.cpp +--- a/khunphan/main.cpp ++++ b/khunphan/main.cpp @@ -46,7 +46,7 @@ { DEBUGPRINT(PACKAGE " aborted by user\n"); @@ -170,8 +170,8 @@ //#endif #ifdef WIN32 ---- khunphan/misc1.h -+++ khunphan/misc1.h +--- a/khunphan/misc1.h ++++ b/khunphan/misc1.h @@ -92,6 +92,10 @@ #include <stdlib.h> #endif ++++++ khunphan-0.55-png_uint_32.diff ++++++ --- /var/tmp/diff_new_pack.f9nMkF/_old 2024-02-01 18:06:05.396615795 +0100 +++ /var/tmp/diff_new_pack.f9nMkF/_new 2024-02-01 18:06:05.400615940 +0100 @@ -1,5 +1,5 @@ ---- khunphan/btexture.cpp -+++ khunphan/btexture.cpp +--- a/khunphan/btexture.cpp ++++ b/khunphan/btexture.cpp @@ -162,10 +162,15 @@ // read png file info png_read_info(png_ptr, info_ptr); ++++++ khunphan-DESTDIR.diff ++++++ --- /var/tmp/diff_new_pack.f9nMkF/_old 2024-02-01 18:06:05.412616375 +0100 +++ /var/tmp/diff_new_pack.f9nMkF/_new 2024-02-01 18:06:05.416616520 +0100 @@ -1,5 +1,5 @@ ---- khunphan/Music/Makefile.am -+++ khunphan/Music/Makefile.am +--- a/khunphan/Music/Makefile.am ++++ b/khunphan/Music/Makefile.am @@ -4,16 +4,14 @@ EXTRA_DIST = Cymbals.ogg Earth.ogg Mystery.ogg @@ -24,8 +24,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Music/Mystery.ogg ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Sounds/Makefile.am -+++ khunphan/Sounds/Makefile.am +--- a/khunphan/Sounds/Makefile.am ++++ b/khunphan/Sounds/Makefile.am @@ -5,28 +5,22 @@ EXTRA_DIST = changesetting.ogg gamesolved.ogg movetoken.ogg opengame.ogg openmenu.ogg quitgame.ogg tutorialnext.ogg @@ -70,8 +70,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Sounds/tutorialnext.ogg ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Sounds/bubbles/Makefile.am -+++ khunphan/Sounds/bubbles/Makefile.am +--- a/khunphan/Sounds/bubbles/Makefile.am ++++ b/khunphan/Sounds/bubbles/Makefile.am @@ -4,10 +4,10 @@ EXTRA_DIST = movetoken.ogg @@ -86,8 +86,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Sounds/bubbles/movetoken.ogg ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Sounds/marble/Makefile.am -+++ khunphan/Sounds/marble/Makefile.am +--- a/khunphan/Sounds/marble/Makefile.am ++++ b/khunphan/Sounds/marble/Makefile.am @@ -4,10 +4,10 @@ EXTRA_DIST = movetoken.ogg @@ -102,8 +102,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Sounds/marble/movetoken.ogg ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Sounds/metal/Makefile.am -+++ khunphan/Sounds/metal/Makefile.am +--- a/khunphan/Sounds/metal/Makefile.am ++++ b/khunphan/Sounds/metal/Makefile.am @@ -4,10 +4,10 @@ EXTRA_DIST = movetoken.ogg @@ -118,8 +118,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Sounds/metal/movetoken.ogg ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Sounds/painting/Makefile.am -+++ khunphan/Sounds/painting/Makefile.am +--- a/khunphan/Sounds/painting/Makefile.am ++++ b/khunphan/Sounds/painting/Makefile.am @@ -4,10 +4,10 @@ EXTRA_DIST = movetoken.ogg @@ -134,8 +134,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Sounds/painting/movetoken.ogg ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Sounds/rock/Makefile.am -+++ khunphan/Sounds/rock/Makefile.am +--- a/khunphan/Sounds/rock/Makefile.am ++++ b/khunphan/Sounds/rock/Makefile.am @@ -4,10 +4,10 @@ EXTRA_DIST = movetoken.ogg @@ -150,8 +150,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Sounds/rock/movetoken.ogg ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Sounds/smily/Makefile.am -+++ khunphan/Sounds/smily/Makefile.am +--- a/khunphan/Sounds/smily/Makefile.am ++++ b/khunphan/Sounds/smily/Makefile.am @@ -4,10 +4,10 @@ EXTRA_DIST = movetoken.ogg @@ -166,8 +166,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Sounds/smily/movetoken.ogg ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Textures/Makefile.am -+++ khunphan/Textures/Makefile.am +--- a/khunphan/Textures/Makefile.am ++++ b/khunphan/Textures/Makefile.am @@ -5,22 +5,18 @@ EXTRA_DIST = characters.png logo.png music_on.png sound_on.png soundmusic_off.png @@ -202,8 +202,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Textures/soundmusic_off.png ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Textures/bubbles/Makefile.am -+++ khunphan/Textures/bubbles/Makefile.am +--- a/khunphan/Textures/bubbles/Makefile.am ++++ b/khunphan/Textures/bubbles/Makefile.am @@ -4,19 +4,16 @@ EXTRA_DIST = board.png texture1.png texture2.png texture3.png @@ -233,8 +233,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Textures/bubbles/texture3.png ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Textures/marble/Makefile.am -+++ khunphan/Textures/marble/Makefile.am +--- a/khunphan/Textures/marble/Makefile.am ++++ b/khunphan/Textures/marble/Makefile.am @@ -4,19 +4,16 @@ EXTRA_DIST = board.png texture1.png texture2.png texture3.png @@ -264,8 +264,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Textures/marble/texture3.png ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Textures/metal/Makefile.am -+++ khunphan/Textures/metal/Makefile.am +--- a/khunphan/Textures/metal/Makefile.am ++++ b/khunphan/Textures/metal/Makefile.am @@ -4,19 +4,16 @@ EXTRA_DIST = board.png texture1.png texture2.png texture3.png @@ -295,8 +295,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Textures/metal/texture3.png ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Textures/painting/Makefile.am -+++ khunphan/Textures/painting/Makefile.am +--- a/khunphan/Textures/painting/Makefile.am ++++ b/khunphan/Textures/painting/Makefile.am @@ -4,19 +4,16 @@ EXTRA_DIST = board.png texture1.png texture2.png texture3.png @@ -326,8 +326,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Textures/painting/texture3.png ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Textures/rock/Makefile.am -+++ khunphan/Textures/rock/Makefile.am +--- a/khunphan/Textures/rock/Makefile.am ++++ b/khunphan/Textures/rock/Makefile.am @@ -4,19 +4,16 @@ EXTRA_DIST = board.png texture1.png texture2.png texture3.png @@ -357,8 +357,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Textures/rock/texture3.png ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Textures/smily/Makefile.am -+++ khunphan/Textures/smily/Makefile.am +--- a/khunphan/Textures/smily/Makefile.am ++++ b/khunphan/Textures/smily/Makefile.am @@ -4,19 +4,16 @@ EXTRA_DIST = board.png texture1.png texture2.png texture3.png @@ -388,8 +388,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Textures/smily/texture3.png ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/Textures/wood/Makefile.am -+++ khunphan/Textures/wood/Makefile.am +--- a/khunphan/Textures/wood/Makefile.am ++++ b/khunphan/Textures/wood/Makefile.am @@ -4,19 +4,16 @@ EXTRA_DIST = board.png texture1.png texture2.png texture3.png @@ -419,8 +419,8 @@ + -rm -f $(DESTDIR)$(datadir)/khunphan/Textures/wood/texture3.png ####### kdevelop will overwrite this part!!! (end)############ ---- khunphan/locale/Makefile.am -+++ khunphan/locale/Makefile.am +--- a/khunphan/locale/Makefile.am ++++ b/khunphan/locale/Makefile.am @@ -4,16 +4,14 @@ EXTRA_DIST = 900.lang 901.lang 999.lang ++++++ khunphan-freeglut.diff ++++++ --- /var/tmp/diff_new_pack.f9nMkF/_old 2024-02-01 18:06:05.428616954 +0100 +++ /var/tmp/diff_new_pack.f9nMkF/_new 2024-02-01 18:06:05.432617099 +0100 @@ -1,5 +1,5 @@ ---- khunphan/kpglutuserinterface.cpp -+++ khunphan/kpglutuserinterface.cpp +--- a/khunphan/kpglutuserinterface.cpp ++++ b/khunphan/kpglutuserinterface.cpp @@ -84,8 +84,7 @@ char temp[64];
