Merge branch 'master' into cooking

diff --git a/AUTHORS b/AUTHORS
index 1044d29f09e9cac6034b185b473a3548e925750b..69cfb8ea2e144b0453e73099805644b28103bb34 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,4 +7,4 @@ Thanks to:
     Rudolf `divVerent` Polzer      - Technical support and assistance
     Matthias `matthiaskrgr` Krüger - Miscellaneous assistance
     Samual  `Samual` Lenks         - Preprocessor assistance
-    Igor `ignatenkobrian` Gnatenko - Fedora packages
+    Igor `ignatenkobrain` Gnatenko - Fedora packages

diff --git a/distro/fedora/INSTALL b/distro/fedora/INSTALL
index 390555a85f5b20fcf3340d551a42114d1c264e85..854067055844ff225d1e52cc7b4c66fcd4c8ce5a 100644 (file)
--- a/distro/fedora/INSTALL
+++ b/distro/fedora/INSTALL
@@ -8,6 +8,9 @@ For install gmqcc do this:
 For install qcvm do this:
 # yum install qcvm
 
+For install gmqpak do this:
+# yum install gmqpak
+
 To use the spec files in this fedora directory you need the core
 development tools , building enviroment for the user, and
 the directory structure for it. If you don't already have these, issue
@@ -21,8 +24,7 @@ $ rpmdev-setuptree
 Prepare and build the RPMs.
 
 $ cp gmqcc.spec ~/rpmbuild/SPECS/
-$ wget https://github.com/graphitemaster/gmqcc/archive/0.2.9.tar.gz -o ~/rpmbuild/SOURCES/gmqcc-0.2.9.tar.gz
-$ wget https://raw.github.com/graphitemaster/gmqcc/master/distro/archlinux/release/build_fix.patch -o ~/rpmbuild/SPECS/build_fix.patch
+$ wget https://github.com/graphitemaster/gmqcc/archive/0.3.5.tar.gz -o ~/rpmbuild/SOURCES/gmqcc-0.3.5.tar.gz
 $ rpmbuild -ba ~/rpmbuild/SPECS/gmqcc.spec
 
 Now we have RPMs in ~/rpmbuild/RPMS/ and you can install it via yum.

diff --git a/distro/fedora/gmqcc.spec b/distro/fedora/gmqcc.spec
index 9157bb4ba5e20c93a8fe69180b95d38b0bca2721..f88ecc5540066fe794ff4c14e547f404998c745e 100644 (file)
--- a/distro/fedora/gmqcc.spec
+++ b/distro/fedora/gmqcc.spec
@@ -1,10 +1,15 @@
 Name:           gmqcc
-Version:        0.3.0
+Version:        0.3.5
 Release:        2%{?dist}
 Summary:        Improved Quake C Compiler
 License:        MIT
 URL:            http://graphitemaster.github.io/gmqcc/
 Source0:        https://github.com/graphitemaster/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# fix build on big endian arches - stdlib.h required for exit()
+Patch0:         %{name}-0.3.5-stdlib.patch
+
+# tests fail on big endians
+ExclusiveArch:  %{ix86} x86_64 %{arm}
 
 %description
 Modern written-from-scratch compiler for the QuakeC language with
@@ -28,8 +33,9 @@ directories, or whole PAKs, as well as the opposite (creation of PAK files).
 
 %prep
 %setup -q
+%patch0 -p1
 echo '#!/bin/sh' > ./configure
-chmod +x ./configure
+chmod +x ./configure 
 
 # and for all for all of those switches they increase the runtime of the compile
 # making compiles of code slower
@@ -61,20 +67,28 @@ make check
 %files
 %doc LICENSE README AUTHORS CHANGES TODO
 %doc gmqcc.ini.example
-%{_mandir}/man1/gmqcc.1.gz
+%{_mandir}/man1/gmqcc.1*
 %{_bindir}/gmqcc
 
 %files -n qcvm
 %doc LICENSE README AUTHORS CHANGES TODO
-%{_mandir}/man1/qcvm.1.gz
+%{_mandir}/man1/qcvm.1*
 %{_bindir}/qcvm
 
 %files -n gmqpak
 %doc LICENSE README AUTHORS CHANGES TODO
-%{_mandir}/man1/gmqpak.1.gz
+%{_mandir}/man1/gmqpak.1*
 %{_bindir}/gmqpak
 
 %changelog
+* Sat Nov 16 2013 Dan Horák <dan[at]danny.cz> - 0.3.5-2
+- fix build on big endian arches
+- use the standard wildcarded filename for man pages
+- and make it Exclusive for little endians because tests fail on big endians
+
+* Thu Nov 14 2013 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.3.5-1
+- 0.3.5 upstream release
+
 * Thu Sep 26 2013 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.3.0-2
 - Optimizing compile flags
 

diff --git a/util.c b/util.c
index de0c77ff64a7d21ad0c12d41fcf52b2471a30246..84be6f31cc18cf89a542c6f9fda129f45b5f9cab 100644 (file)
--- a/util.c
+++ b/util.c
@@ -22,6 +22,7 @@
  * SOFTWARE.
  */
 #define GMQCC_PLATFORM_HEADER
+#include <stdlib.h>
 #include "gmqcc.h"
 #include "platform.h"