First halfway-working RPM build

4 files changed, 54 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..432d7b1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+/goattracker-2.68/
+/goattracker-2.68.tar.xz
+/GoatTracker_2.68.zip
+/rpm-build/
+/rpm-dist/
+
diff --git a/Makefile-bme b/Makefile-bme
new file mode 100644
index 0000000..82f66fe
--- /dev/null
+++ b/Makefile-bme
@@ -0,0 +1,5 @@
+# -*- Makefile -*-
+
+all: datafile dat2inc
+
+datafile: datafile.o bme_end.o
diff --git a/Makefile-src b/Makefile-src
new file mode 100644
index 0000000..0423cf5
--- /dev/null
+++ b/Makefile-src
@@ -0,0 +1,13 @@
+# -*- Makefile -*-
+
+CFLAGS = $(SDL_CFLAGS)
+PREFIX =
+SUFFIX =
+LIBS = $(SDL_LIBS)
+INSTALL = install
+
+include makefile.common
+
+install:
+	$(INSTALL) -m 0755 -d "$(DESTDIR)$(BINDIR)"
+	$(INSTALL) -m 0755 $(EXE) "$(DESTDIR)$(BINDIR)/"
diff --git a/goattracker.spec b/goattracker.spec
index a413e23..978aa31 100644
--- a/goattracker.spec
+++ b/goattracker.spec
@@ -12,10 +12,13 @@ URL:		http://sourceforge.net/projects/goattracker2/
 # These zipfiles need to be cleaned of executables, and as that means we need
 # to repackage them anyway, we can use .tar.xz for that.
 # Run "./cleanup-sources.sh 2.68" for 
-Source0:	%{name}-%{version}-cleaned-up.tar.xz
+Source0:	%{name}-%{version}.tar.xz
+# We need our own make files. The existing ones strip binaries, drop cflags, etc
+Source10:	Makefile-bme
+Source11:	Makefile-src
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#BuildRequires:	
+BuildRequires:	SDL-devel
 #Requires:	
 
 %description
@@ -23,16 +26,30 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %prep
 %setup -q
+cp %{SOURCE10} Makefile-bme
+cp %{SOURCE11} Makefile-src
+sed -i \
+    -e '/^	strip $@/d' \
+    -e '/^CC=/d' \
+    -e '/^CXX=/d' \
+    -e's/^	\(datafile\|dat2inc\) /	.\/bme\/\1 /' \
+    src/makefile.common
 
 
 %build
-%configure
-make %{?_smp_mflags}
+#configure
+make CFLAGS="%{optflags}" -f "$PWD/Makefile-bme" -C src/bme %{?_smp_mflags}
+make \
+     CFLAGS="%{optflags} -Wall -Ibme -Iasm" \
+     SDL_CFLAGS="$(sdl-config --cflags)" \
+     SDL_LIBS="$(sdl-config --libs)" \
+     -f "$PWD/Makefile-src" -C src %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make -f "$PWD/Makefile-src" -C src \
+     install DESTDIR="$RPM_BUILD_ROOT" BINDIR="%{_bindir}"
 
 
 %clean
@@ -41,8 +58,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc
-
+%doc authors copying readme.txt
+%doc readme_sdl.txt readme_resid.txt
+%doc goat_tracker_commands.pdf
+%{_bindir}/betaconv
+%{_bindir}/goattrk2
+%{_bindir}/ins2snd2
+%{_bindir}/mod2sng
+%{_bindir}/sngspli2
 
 
 %changelog