From 417fce55166bee4fb837597b83fda5459c05deb7d46c8865a2c8dd688014296d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 8 Feb 2012 21:09:50 +0000 Subject: [PATCH] Add patch to workaround flakey "auto" dir creation OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=19 --- schism-deptrack.diff | 29 +++++++++++++++++++++++++++++ schismtracker.spec | 12 +++++++----- 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 schism-deptrack.diff diff --git a/schism-deptrack.diff b/schism-deptrack.diff new file mode 100644 index 0000000..b324c31 --- /dev/null +++ b/schism-deptrack.diff @@ -0,0 +1,29 @@ +--- + Makefile.am | 1 + + configure.ac | 1 + + 2 files changed, 2 insertions(+) + +Index: schismtracker-20120105/Makefile.am +=================================================================== +--- schismtracker-20120105.orig/Makefile.am ++++ schismtracker-20120105/Makefile.am +@@ -158,6 +158,7 @@ CLEANFILES = \ + auto/helptext.c + + auto/default-font.c: Makefile.am scripts/bin2h.sh scripts/build-font.sh $(fonts) ++ ${MKDIR_P} auto + sh $(srcdir)/scripts/build-font.sh $(srcdir) $(fonts) >$@ + auto/helptext.c: Makefile.am scripts/genhelp.py $(helptexts) + $(PYTHON) $(srcdir)/scripts/genhelp.py $(srcdir) $(helptexts) >$@ +Index: schismtracker-20120105/configure.ac +=================================================================== +--- schismtracker-20120105.orig/configure.ac ++++ schismtracker-20120105/configure.ac +@@ -42,6 +42,7 @@ AC_PROG_CPP + AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_CC_C99 ++AC_PROG_MKDIR_P + + dnl Windows poop + AC_CHECK_TOOL([WINDRES], [windres]) diff --git a/schismtracker.spec b/schismtracker.spec index a2a8e7b..64cc6b5 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: schismtracker %define rversion 20120105 Version: 0.%rversion @@ -28,12 +29,15 @@ Source: %name-%rversion.tar.xz Source1: %name.desktop Patch1: schism-alsa.diff Patch2: schism-nodate.diff +Patch3: schism-deptrack.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel >= 1.2.10 BuildRequires: alsa-devel +BuildRequires: autoconf BuildRequires: automake BuildRequires: freeglut-devel BuildRequires: gcc-c++ +BuildRequires: libtool BuildRequires: python >= 2.4 BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel @@ -49,14 +53,12 @@ bugfixes and changes to improve IT playback. %prep %setup -qn %name-%rversion -%patch -P 1 -P 2 -p1 +%patch -P 1 -P 2 -P 3 -p1 %build -if [ ! -e configure ]; then - autoreconf -fi -fi +autoreconf -fi %configure -make +make %{?_smp_mflags} %install make DESTDIR=%buildroot install