The package rpms/freeorion.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/freeorion.git/commit/?id=1e842776...
https://src.fedoraproject.org/cgit/rpms/freeorion.git/commit/?id=f7995d06....
Change:
+%ifarch armvhl7
+%ifarch armv7hl
Thanks.
Full change:
============
commit 4a7571e15c6af1c842baafbe1a17f78965ab9530
Author: josef radinger <cheese(a)nosuchhost.net>
Date: Fri Nov 9 20:14:21 2018 +0100
modify __global_compiler_flags on armv7hl
diff --git a/freeorion.spec b/freeorion.spec
index f7ad150..fffe196 100644
--- a/freeorion.spec
+++ b/freeorion.spec
@@ -2,13 +2,15 @@
%global _commit0 26f16b0597251d358f8757d6bdc85f6c731930cf
%global _shortcommit0 %(c=%{_commit0}; echo ${c:0:7})
+# we have some memory limits on the build-system
%ifarch armv7hl
-%global _smp_mflags -j1
+%global _smp_mflags -j1
+%global __global_compiler_flags %__global_compiler_flags -g1
%endif
Name: freeorion
Version: 0.4.8
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Turn-based space empire and galactic conquest (4X) computer game
Group: Amusements/Games
@@ -110,6 +112,9 @@ desktop-file-validate %{name}.desktop
%changelog
+* Fri Nov 09 2018 josef radinger <cheese(a)nosuchhost.net> - 0.4.8-4
+- modify __global_compiler_flags on armv7hl
+
* Fri Nov 09 2018 josef radinger <cheese(a)nosuchhost.net> - 0.4.8-3
- fix typo
commit f7995d06990e9509bfcee6683a402f28570e1cc5
Author: josef radinger <cheese(a)nosuchhost.net>
Date: Fri Nov 9 17:07:01 2018 +0100
fix typo
diff --git a/freeorion.spec b/freeorion.spec
index 4f55605..f7ad150 100644
--- a/freeorion.spec
+++ b/freeorion.spec
@@ -2,13 +2,13 @@
%global _commit0 26f16b0597251d358f8757d6bdc85f6c731930cf
%global _shortcommit0 %(c=%{_commit0}; echo ${c:0:7})
-%ifarch armvhl7
-%global _smp_mflags -j1
+%ifarch armv7hl
+%global _smp_mflags -j1
%endif
Name: freeorion
Version: 0.4.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Turn-based space empire and galactic conquest (4X) computer game
Group: Amusements/Games
@@ -110,6 +110,9 @@ desktop-file-validate %{name}.desktop
%changelog
+* Fri Nov 09 2018 josef radinger <cheese(a)nosuchhost.net> - 0.4.8-3
+- fix typo
+
* Fri Nov 09 2018 josef radinger <cheese(a)nosuchhost.net> - 0.4.8-2
- fix build for armv7hl by using make -j1
commit 1e842776baa274c07498a63b2c9c13aff4ccd444
Author: josef radinger <cheese(a)nosuchhost.net>
Date: Fri Nov 9 15:54:34 2018 +0100
fix build for armv7hl by using make -j1
diff --git a/freeorion.spec b/freeorion.spec
index aaa5224..4f55605 100644
--- a/freeorion.spec
+++ b/freeorion.spec
@@ -2,9 +2,13 @@
%global _commit0 26f16b0597251d358f8757d6bdc85f6c731930cf
%global _shortcommit0 %(c=%{_commit0}; echo ${c:0:7})
+%ifarch armvhl7
+%global _smp_mflags -j1
+%endif
+
Name: freeorion
Version: 0.4.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Turn-based space empire and galactic conquest (4X) computer game
Group: Amusements/Games
@@ -65,6 +69,9 @@ sed -i 's/CMAKE_CXX_EXTENSIONS OFF/CMAKE_CXX_EXTENSIONS ON/'
CMakeLists.txt
sed -i 's/CMAKE_CXX_EXTENSIONS OFF/CMAKE_CXX_EXTENSIONS ON/' GG/CMakeLists.txt
%endif
%cmake -DCMAKE_INSTALL_LIBDIR=%{_lib} .
+
+
+
%make_build
%install
@@ -103,6 +110,9 @@ desktop-file-validate %{name}.desktop
%changelog
+* Fri Nov 09 2018 josef radinger <cheese(a)nosuchhost.net> - 0.4.8-2
+- fix build for armv7hl by using make -j1
+
* Mon Oct 08 2018 josef radinger <cheese(a)nosuchhost.net> - 0.4.8-1
- bump version
- remove patch1
commit 7491445de46464c11cae31ef0fa54cc47c925b8a
Author: josef radinger <cheese(a)nosuchhost.net>
Date: Wed Nov 7 21:25:25 2018 +0100
bump version
remove patch1
remove patch2
remove patch3
diff --git a/.gitignore b/.gitignore
index 1bc841a..a680509 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/FreeOrion_v0.4.7.1_2017-09-03.139ffd9_Source.tar.gz
/fix_boost166.patch
+/FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz
diff --git a/FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz
b/FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz
new file mode 100644
index 0000000..c1a08a2
Binary files /dev/null and b/FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz differ
diff --git a/freeorion.spec b/freeorion.spec
index c073536..aaa5224 100644
--- a/freeorion.spec
+++ b/freeorion.spec
@@ -1,10 +1,10 @@
-%global _release_date 2017-09-03
-%global _commit0 139ffd9b323ab7e9f9eeae3483a9c2f4eee87fcd
+%global _release_date 2018-08-23
+%global _commit0 26f16b0597251d358f8757d6bdc85f6c731930cf
%global _shortcommit0 %(c=%{_commit0}; echo ${c:0:7})
Name: freeorion
-Version: 0.4.7.1
-Release: 12%{?dist}
+Version: 0.4.8
+Release: 1%{?dist}
Summary: Turn-based space empire and galactic conquest (4X) computer game
Group: Amusements/Games
@@ -13,12 +13,6 @@ URL:
http://freeorion.org
Source0:
https://github.com/freeorion/freeorion/releases/download/v%{version}/Free...
Source1: freeorion.appdata.xml
-Patch1: fix_boost166.patch
-#
https://github.com/freeorion/freeorion/issues/2182
-Patch2: fix-2182_backport-v0.4.7.1.patch
-#
https://github.com/freeorion/freeorion/commit/aa06d60163c6a915402d03e8842...
-Patch3: enclose-oarchive-scope-when-used-with-stringstream.patch
-
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: python2-devel >= 2.7
@@ -109,6 +103,12 @@ desktop-file-validate %{name}.desktop
%changelog
+* Mon Oct 08 2018 josef radinger <cheese(a)nosuchhost.net> - 0.4.8-1
+- bump version
+- remove patch1
+- remove patch2
+- remove patch3
+
* Thu Aug 23 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.7.1-12
- Rebuilt for glew 2.1.0
diff --git a/sources b/sources
index 34ea806..16b8a42 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (FreeOrion_v0.4.7.1_2017-09-03.139ffd9_Source.tar.gz) =
40c2c683c61f7a85e357742daef2d0e23dacc5e24c628072aabbc84af1d7229762620fb6b9452e9f2ecc2ff32dffe1fc11d0c9ab7cc5477c0e23b6b465ff614e
SHA512 (fix_boost166.patch) =
071981b2323f203bb9d31a3331caf719a91f6012e08d897d8f3218cb71b0bcc9838aab33ab25bfbb47851e35e4c58afdb80618fa3b9d36fd874ab7e318a906a2
+SHA512 (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) =
b7c7cdaf048872b93143f2321602a1861d264e91fc466192ec8b26559d6dad33b8252eefc6ad3f18f617dc69fbc419a0526619ea3dc1bd348ba78d9b79ec1240
commit 9238cf52eae3ea934a187206ca59d570ceccae98
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Aug 23 13:27:54 2018 +0200
- Rebuilt for glew 2.1.0
diff --git a/freeorion.spec b/freeorion.spec
index 5b483ca..c073536 100644
--- a/freeorion.spec
+++ b/freeorion.spec
@@ -4,7 +4,7 @@
Name: freeorion
Version: 0.4.7.1
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: Turn-based space empire and galactic conquest (4X) computer game
Group: Amusements/Games
@@ -109,6 +109,9 @@ desktop-file-validate %{name}.desktop
%changelog
+* Thu Aug 23 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.7.1-12
+- Rebuilt for glew 2.1.0
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.4.7.1-11
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit a312013c55424a71f62c5ac88e34b0f65416734a
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 00:50:43 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/freeorion.spec b/freeorion.spec
index eb36195..5b483ca 100644
--- a/freeorion.spec
+++ b/freeorion.spec
@@ -4,7 +4,7 @@
Name: freeorion
Version: 0.4.7.1
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Turn-based space empire and galactic conquest (4X) computer game
Group: Amusements/Games
@@ -109,6 +109,9 @@ desktop-file-validate %{name}.desktop
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
0.4.7.1-11
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Sat Jun 30 2018 Link Dupont <linkdupont(a)fedoraproject.org> - 0.4.7.1-10
- Patch to fix crash during save game save/load
commit 93c20c92acfd56ba2dbafb0ad45bc0e06f7b8154
Merge: 0aedae5 50c0f3b
Author: Link Dupont <link(a)sub-pop.net>
Date: Sun Jul 8 20:12:28 2018 -0700
Merge branch 'f28'
diff --cc freeorion.spec
index 1a13900,2561fb0..eb36195
--- a/freeorion.spec
+++ b/freeorion.spec
@@@ -107,12 -108,12 +109,15 @@@ desktop-file-validate %{name}.deskto
%changelog
+ * Sat Jun 30 2018 Link Dupont <linkdupont(a)fedoraproject.org> - 0.4.7.1-10
+ - Patch to fix crash during save game save/load
+
-* Wed Jun 27 2018 Link Dupont <linkdupont(a)fedoraproject.org> - 0.4.7.1-9
+* Wed Jun 27 2018 Link Dupont <linkdupont(a)fedoraproject.org> - 0.4.7.1-9.1
- Patch set to fix assertion crashes (RHBZ#1575292)
+* Tue May 01 2018 Jonathan Wakely <jwakely(a)redhat.com> - 0.4.7.1-9
+- Add BuildRequires: boost-python2-devel to fix build with boost-1.66.0-7.fc29
+
* Wed Mar 07 2018 Adam Williamson <awilliam(a)redhat.com> - 0.4.7.1-8
- Rebuild to fix GCC 8 mis-compilation
See
https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
commit 0aedae53de367e75c596ffd453577461eafb2fdc
Merge: 37227a0 e5e8889
Author: Link Dupont <link(a)sub-pop.net>
Date: Thu Jun 28 20:41:48 2018 -0700
Merge branch 'f28'
diff --cc freeorion.spec
index 7d334d1,df1e4a6..1a13900
--- a/freeorion.spec
+++ b/freeorion.spec
@@@ -4,7 -4,8 +4,7 @@@
Name: freeorion
Version: 0.4.7.1
--Release: 9%{?dist}
++Release: 9.1%{?dist}
Summary: Turn-based space empire and galactic conquest (4X) computer game
Group: Amusements/Games
@@@ -104,9 -107,9 +107,12 @@@ desktop-file-validate %{name}.deskto
%changelog
-* Wed Jun 27 2018 Link Dupont <linkdupont(a)fedoraproject.org> - 0.4.7.1-9
++* Wed Jun 27 2018 Link Dupont <linkdupont(a)fedoraproject.org> - 0.4.7.1-9.1
+ - Patch set to fix assertion crashes (RHBZ#1575292)
+
+* Tue May 01 2018 Jonathan Wakely <jwakely(a)redhat.com> - 0.4.7.1-9
+- Add BuildRequires: boost-python2-devel to fix build with boost-1.66.0-7.fc29
+
* Wed Mar 07 2018 Adam Williamson <awilliam(a)redhat.com> - 0.4.7.1-8
- Rebuild to fix GCC 8 mis-compilation
See
https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
commit 37227a094185a46efa80f20ce943d89fa657450a
Author: Jonathan Wakely <jwakely(a)redhat.com>
Date: Tue May 1 15:04:00 2018 +0100
Add BuildRequires: boost-python2-devel to fix build with boost-1.66.0-7.fc29
diff --git a/freeorion.spec b/freeorion.spec
index f479582..7d334d1 100644
--- a/freeorion.spec
+++ b/freeorion.spec
@@ -4,7 +4,7 @@
Name: freeorion
Version: 0.4.7.1
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Turn-based space empire and galactic conquest (4X) computer game
Group: Amusements/Games
@@ -18,6 +18,7 @@ BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: python2-devel >= 2.7
BuildRequires: boost-devel >= 1.47.0
+BuildRequires: boost-python2-devel
BuildRequires: mesa-libGL-devel
BuildRequires: freetype-devel
BuildRequires: mesa-libGLU-devel
@@ -103,6 +104,9 @@ desktop-file-validate %{name}.desktop
%changelog
+* Tue May 01 2018 Jonathan Wakely <jwakely(a)redhat.com> - 0.4.7.1-9
+- Add BuildRequires: boost-python2-devel to fix build with boost-1.66.0-7.fc29
+
* Wed Mar 07 2018 Adam Williamson <awilliam(a)redhat.com> - 0.4.7.1-8
- Rebuild to fix GCC 8 mis-compilation
See
https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")