From 8d24f0a82379fb7010d5dcdf2f8f252289e71451 Mon Sep 17 00:00:00 2001
From: Dan Horák <dan@danny.cz>
Date: Sep 24 2014 21:34:28 +0000
Subject: - fix build on non-x86 arches, patch taken from Debian


---

diff --git a/stellarium-0.13.0-no-ms-bitfields.patch b/stellarium-0.13.0-no-ms-bitfields.patch
new file mode 100644
index 0000000..9257331
--- /dev/null
+++ b/stellarium-0.13.0-no-ms-bitfields.patch
@@ -0,0 +1,23 @@
+From: Tomasz Buchert <tomasz.buchert@inria.fr>
+Date: Sun, 20 Jul 2014 13:17:20 +0200
+Subject: Don't use -mno-ms-bitfields
+
+-mno-ms-bittfields exists only on x86/x64 architectures.
+It makes the build process fail on more exotic
+architectures, however it is not even needed there.
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4cb5f63..d3f76da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,7 +41,9 @@ ENDIF()
+ 
+ IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC)
+   # The stars structs rely on gnu gcc packing of bit-fields.
+-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
++  IF(WIN32)
++    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
++  ENDIF()
+   SET(GCC_VERSION "${CMAKE_CXX_COMPILER_VERSION}")
+ ELSE()
+   SET(GCC_VERSION "0.0")
diff --git a/stellarium.spec b/stellarium.spec
index 77ed13e..a1402e8 100644
--- a/stellarium.spec
+++ b/stellarium.spec
@@ -2,7 +2,7 @@
 Name:           stellarium
 
 Version:        0.13.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
 Group:          Amusements/Graphics
@@ -10,6 +10,8 @@ License:        GPLv2+
 URL:            http://www.stellarium.org
 Source0:        http://downloads.sourceforge.net/stellarium/stellarium-%{version}.tar.gz
 Patch1:         stellarium-0.13.0-desktop.patch
+# also http://bazaar.launchpad.net/~stellarium/stellarium/trunk/revision/6932
+Patch2:         stellarium-0.13.0-no-ms-bitfields.patch
 
 BuildRequires:  phonon-devel
 BuildRequires:  SDL_mixer-devel
@@ -31,8 +33,6 @@ BuildRequires:	perl-podlators
 Provides:       stellarium-doc = %{version}-%{release}
 Obsoletes:      stellarium-doc < 0.12.3
 
-ExcludeArch:	armv7hl
-
 %description
 Stellarium is a real-time 3D photo-realistic nightsky renderer. It can
 generate images of the sky as seen through the Earth's atmosphere with
@@ -42,6 +42,7 @@ constellations, planets, major satellites and nebulas.
 %prep
 %setup -q
 %patch1 -p1 -b .dsk
+%patch2 -p1 -b .cflags
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -76,6 +77,9 @@ cp -p data/stellarium.appdata.xml $RPM_BUILD_ROOT/%{_datadir}/appdata
 %{_mandir}/man1/stellarium.1.gz
 
 %changelog
+* Wed Sep 24 2014 Dan Horák <dan[at]danny.cz> - 0.13.0-3
+- fix build on non-x86 arches, patch taken from Debian
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.13.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild