[numptyphysics] Update to fix FTBFS.
Jon Ciesla
limb at fedoraproject.org
Thu Jul 26 20:05:13 UTC 2012
commit ee732eda31f553749a8a352e862a9919cbe7f01c
Author: Jon Ciesla <limburgher at gmail.com>
Date: Thu Jul 26 15:04:46 2012 -0500
Update to fix FTBFS.
.gitignore | 1 +
numptyphysics-0.3-doublefree.patch | 20 -------
numptyphysics-0.3-gcc43.patch | 93 ----------------------------------
numptyphysics-0.4-datadir.patch | 12 ++++
numptyphysics-0.4-gcc47.patch | 11 ++++
numptyphysics-0.4-missing-link.patch | 12 ++++
numptyphysics.spec | 52 +++++++++----------
sources | 3 +-
8 files changed, 61 insertions(+), 143 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4e5d6e8..73f92ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
numptyphysics.tar.gz
numptyphysics-levels-2008-09-27.tar.gz
+/harmattan-numptyphysics-a22cde2.tar.gz
diff --git a/numptyphysics-0.4-datadir.patch b/numptyphysics-0.4-datadir.patch
new file mode 100644
index 0000000..3e5d50d
--- /dev/null
+++ b/numptyphysics-0.4-datadir.patch
@@ -0,0 +1,12 @@
+diff -urb harmattan-numptyphysics-a22cde2/makefile harmattan-numptyphysics-a22cde2.b/makefile
+--- harmattan-numptyphysics-a22cde2/makefile 2012-07-26 16:52:01.611055981 +0300
++++ harmattan-numptyphysics-a22cde2.b/makefile 2012-07-26 17:08:13.949539087 +0300
+@@ -4,7 +4,7 @@
+ DESTDIR ?=
+ PREFIX = /opt/numptyphysics
+
+-CXXFLAGS += -DINSTALL_BASE_PATH=\"$(PREFIX)/data\"
++CXXFLAGS += -DINSTALL_BASE_PATH=\"/usr/share/numptyphysics\"
+
+ SOURCES = $(wildcard *.cpp)
+
diff --git a/numptyphysics-0.4-gcc47.patch b/numptyphysics-0.4-gcc47.patch
new file mode 100644
index 0000000..70e2521
--- /dev/null
+++ b/numptyphysics-0.4-gcc47.patch
@@ -0,0 +1,11 @@
+diff -urb harmattan-numptyphysics-a22cde2/happyhttp.cpp harmattan-numptyphysics-a22cde2.b/happyhttp.cpp
+--- harmattan-numptyphysics-a22cde2/happyhttp.cpp 2012-07-25 20:42:31.000000000 +0300
++++ harmattan-numptyphysics-a22cde2.b/happyhttp.cpp 2012-07-26 16:50:04.193390958 +0300
+@@ -34,6 +34,7 @@
+ #include <arpa/inet.h>
+ #include <netdb.h> // for gethostbyname()
+ #include <errno.h>
++ #include <unistd.h>
+ #endif
+
+ #ifdef WIN32
diff --git a/numptyphysics-0.4-missing-link.patch b/numptyphysics-0.4-missing-link.patch
new file mode 100644
index 0000000..15d1025
--- /dev/null
+++ b/numptyphysics-0.4-missing-link.patch
@@ -0,0 +1,12 @@
+diff -urb harmattan-numptyphysics-a22cde2.b/makefile harmattan-numptyphysics-a22cde2/makefile
+--- harmattan-numptyphysics-a22cde2.b/makefile 2012-07-26 16:52:01.611055981 +0300
++++ harmattan-numptyphysics-a22cde2/makefile 2012-07-26 16:53:30.942725990 +0300
+@@ -11,7 +11,7 @@
+ all: $(APP)
+
+ # Required modules (uses pkg-config)
+-PKGS = sdl SDL_image
++PKGS = sdl SDL_image zlib x11
+
+ CXXFLAGS += $(shell pkg-config --cflags $(PKGS))
+ LIBS += $(shell pkg-config --libs $(PKGS))
diff --git a/numptyphysics.spec b/numptyphysics.spec
index 4a63927..5956c6f 100644
--- a/numptyphysics.spec
+++ b/numptyphysics.spec
@@ -1,21 +1,19 @@
Name: numptyphysics
-Version: 0.3
-Release: 0.9.20080925svn%{?dist}
+Version: 0.4
+Release: 0.1.git.20120726.a22cde2%{?dist}
Summary: A crayon-drawing based physics puzzle game
Group: Amusements/Games
License: GPLv3+
URL: http://numptyphysics.garage.maemo.org/
-# svn co -r81 https://garage.maemo.org/svn/numptyphysics/trunk numptyphysics
-# tar czf numptyphysics.tar.gz numptyphysics --exclude .svn
-Source0: numptyphysics.tar.gz
+Source0: https://github.com/harmattan/numptyphysics/tarball/a22cde2/harmattan-numptyphysics-a22cde2.tar.gz
Source1: numptyphysics.desktop
-Source10: numptyphysics-levels-2008-09-27.tar.gz
-Patch0: numptyphysics-0.3-gcc43.patch
-Patch1: numptyphysics-0.3-doublefree.patch
+#Source10: numptyphysics-levels-2008-09-27.tar.gz
+Patch0: numptyphysics-0.4-gcc47.patch
+Patch1: numptyphysics-0.4-missing-link.patch
+Patch2: numptyphysics-0.4-datadir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires: SDL_image-devel
+BuildRequires: SDL_image-devel SDL_ttf-devel SDL-devel vim-common zlib-devel
BuildRequires: desktop-file-utils
%description
@@ -25,44 +23,35 @@ the little yellow thing.
%prep
-%setup -q -n %{name}
-%patch0 -p1 -b .gcc43
-%patch1 -p1 -b .doublefree
+%setup -q -n harmattan-numptyphysics-a22cde2
+%patch0 -p1 -b .gcc47
+%patch1 -p1 -b .link
+%patch2 -p1 -b .datadir
%build
-# Note the ARCH variable doesn't denote real arch. It's just used to hit a
-# conditional that we're not compiling with mingw
-make %{?_smp_mflags} \
- ARCH=i686 \
- CCOPTS="%{optflags} -IBox2D/Include"
+make %{?_smp_mflags} CCOPTS="%{optflags}"
%install
-rm -rf $RPM_BUILD_ROOT
-
# Directory structure
install -d $RPM_BUILD_ROOT%{_datadir}/numptyphysics
install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
# Files
-install -pm 644 *.png *.nph *.jpg $RPM_BUILD_ROOT%{_datadir}/numptyphysics
-install -pm 755 i686/Game $RPM_BUILD_ROOT%{_bindir}/numptyphysics
-install -pm 644 debian/numptyphysics64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/numptyphysics.png
+install -pm 644 data/* $RPM_BUILD_ROOT%{_datadir}/numptyphysics
+install -pm 755 numptyphysics $RPM_BUILD_ROOT%{_bindir}
+install -pm 644 data/numptyphysics.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/numptyphysics.png
# Additional levels
-tar xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/numptyphysics
+#tar xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/numptyphysics
# Icon
desktop-file-install --vendor=fedora %{SOURCE1} \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
%defattr(-,root,root,-)
%{_bindir}/numptyphysics
@@ -72,6 +61,13 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jul 26 2012 Jonathan Dieter <jdieter at lesbg.com> - 0.4-0.1.git.20120726.a22cde2
+- Update to latest git
+- Remove upstreamed patches
+- Add patches to fix build problems
+- Fixup whitespace and preserve changelog. - Jon Ciesla <limburgher at gmail.com>
+- Added SDL_devel, vim-common, zlib-devel BuildRequires. - JC
+
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3-0.9.20080925svn
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index 72db8a4..db27323 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-168d11194b355f75857a135258445035 numptyphysics.tar.gz
-ba58d3affbbd83d091245c8a24bf4b31 numptyphysics-levels-2008-09-27.tar.gz
+626b92cf9c72e2cbf5097ca9ba07ef45 harmattan-numptyphysics-a22cde2.tar.gz
More information about the scm-commits
mailing list