[maniadrive] Fix maniadrive not working on ARM due to char being unsigned there (#1067778)
Hans de Goede
jwrdegoede at fedoraproject.org
Fri Feb 21 12:51:17 UTC 2014
commit 9b68e95d9472e11ab950ae35439a9b3153078baf
Author: Hans de Goede <hdegoede at redhat.com>
Date: Fri Feb 21 13:52:03 2014 +0100
Fix maniadrive not working on ARM due to char being unsigned there (#1067778)
maniadrive.spec | 43 +++++++++++++++----------------------------
unsigned-eof-bug.patch | 13 +++++++++++++
2 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/maniadrive.spec b/maniadrive.spec
index 3f235c7..9d8133e 100644
--- a/maniadrive.spec
+++ b/maniadrive.spec
@@ -1,6 +1,6 @@
Name: maniadrive
Version: 1.2
-Release: 56%{?dist}
+Release: 57%{?dist}
Summary: 3D stunt driving game
Group: Amusements/Games
License: GPLv2+
@@ -14,7 +14,7 @@ Patch1: %{name}-1.2-php-5.2.8-fix.patch
Patch2: %{name}-1.2-fix-ode-assert.h
Patch3: %{name}-1.2-fix-modifying-php-strings-inline.patch
Patch4: maniadrive-1.2-ode-0.12.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch5: unsigned-eof-bug.patch
BuildRequires: glew-devel ode-devel php-devel php-embedded-devel
BuildRequires: libjpeg-devel libXinerama-devel libv4l-devel
BuildRequires: libvorbis-devel desktop-file-utils
@@ -76,6 +76,7 @@ developing applications that use raydium.
%patch2 -p1
%patch3 -p1
%patch4 -p0
+%patch5 -p1
rm -r rayphp/r3s rayphp/README
@@ -93,7 +94,6 @@ gcc $RPM_OPT_FLAGS -o %{name}-track-editor `php-config --includes` \
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}
mkdir -p $RPM_BUILD_ROOT%{_includedir}/raydium/headers
@@ -130,60 +130,47 @@ install -p -m 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%post -n raydium -p /sbin/ldconfig
%postun -n raydium -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
# no docs these are all in the -data package
%{_bindir}/%{name}
%{_bindir}/%{name}-wrapper
-%if 0%{?fedora} && 0%{?fedora} < 19
-%{_datadir}/applications/fedora-%{name}.desktop
-%else
-%{_datadir}/applications/%{name}.desktop
-%endif
+%{_datadir}/applications/*%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%files track-editor
-%defattr(-,root,root,-)
%{_bindir}/%{name}-track-editor*
-%if 0%{?fedora} && 0%{?fedora} < 19
-%{_datadir}/applications/fedora-%{name}-track-editor.desktop
-%else
-%{_datadir}/applications/%{name}-track-editor.desktop
-%endif
+%{_datadir}/applications/*%{name}-track-editor.desktop
%files -n raydium
-%defattr(-,root,root,-)
%{_libdir}/libraydium-%{version}.so
%{_datadir}/raydium
%files -n raydium-devel
-%defattr(-,root,root,-)
%{_libdir}/libraydium.so
%{_includedir}/raydium
%changelog
+* Fri Feb 21 2014 Hans de Goede <hdegoede at redhat.com> - 1.2-57
+- Fix maniadrive not working on ARM due to char being unsigned there (#1067778)
+
* Mon Nov 18 2013 Dave Airlie <airlied at redhat.com> - 1.2-56
- rebuilt for GLEW 1.10
diff --git a/unsigned-eof-bug.patch b/unsigned-eof-bug.patch
new file mode 100644
index 0000000..d2d77d1
--- /dev/null
+++ b/unsigned-eof-bug.patch
@@ -0,0 +1,13 @@
+diff --git a/mania.h b/mania.h
+index a0a2e7c..7113abb 100644
+--- a/mania.h
++++ b/mania.h
+@@ -119,7 +119,7 @@ signed char mni_generate(char *filename)
+ {
+ FILE *in;
+ FILE *tri, *box;
+-char c;
++signed c;
+ char str[RAYDIUM_MAX_NAME_LEN];
+ float x,y,z;
+ float vx,vy,vz;
More information about the scm-commits
mailing list