summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorStefan Wildemann <metalstrolch@users.noreply.github.com>2018-04-19 17:34:07 +0200
committerjkoan <jkoan@users.noreply.github.com>2018-04-19 17:34:07 +0200
commit1b69419d87f7b2fe1a6e0f6a23ef5e8e617b7cb7 (patch)
tree70386caa43b1d9b85d95e2ffdcc58ab9c44d57e3 /contrib
parent93eb2cdcc1e25c540de6dd6ab63bccb0f2d8dec5 (diff)
downloadnavit-1b69419d87f7b2fe1a6e0f6a23ef5e8e617b7cb7.tar.gz
fix:contrib:New version for sailfish 0.5.1-r5 (#444)
This bumps version for navit to 0.5.1-r5 This removes gcc from build dependencies This automatically zyppers in build requirements as given in spec file into sailfish build virtual machine. So no hand work required anymore.
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/sailfish/build_on_sailfish_sdk.sh2
-rwxr-xr-xcontrib/sailfish/navit-sailfish.spec9
2 files changed, 8 insertions, 3 deletions
diff --git a/contrib/sailfish/build_on_sailfish_sdk.sh b/contrib/sailfish/build_on_sailfish_sdk.sh
index 78cec2385..b62d43d96 100755
--- a/contrib/sailfish/build_on_sailfish_sdk.sh
+++ b/contrib/sailfish/build_on_sailfish_sdk.sh
@@ -4,7 +4,9 @@
if [ -z ${VERSION_ID+x} ]; then echo "VERSION_ID not set. Forgot to export VERSION_ID?"; exit 1; fi
#arm devices
+sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-install -R zypper in `cat navit-sailfish.spec | grep "^BuildRequires: " | sed -e "s/BuildRequires: //"`
sb2 -t SailfishOS-${VERSION_ID}-armv7hl -m sdk-build rpmbuild --define "_topdir /home/src1/rpmbuild" --define "navit_source `pwd`/../.." -bb navit-sailfish.spec
#intel devices
+sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-install -R zypper in `cat navit-sailfish.spec | grep "^BuildRequires: " | sed -e "s/BuildRequires: //"`
sb2 -t SailfishOS-${VERSION_ID}-i486 -m sdk-build rpmbuild --define "_topdir /home/src1/rpmbuild" --define "navit_source `pwd`/../.." -bb navit-sailfish.spec
diff --git a/contrib/sailfish/navit-sailfish.spec b/contrib/sailfish/navit-sailfish.spec
index d8799fb41..eedd2016e 100755
--- a/contrib/sailfish/navit-sailfish.spec
+++ b/contrib/sailfish/navit-sailfish.spec
@@ -10,14 +10,14 @@ Name: harbour-navit
Summary: Open Source car navigation system
#Version: %{navit_version}_%{git_version}
Version: 0.5.1
-Release: 4
+Release: 5
License: GPL
Group: Applications/Productivity
-URL: http://navit-projet.org/
+URL: http://navit-project.org/
#git is vor version info while building
BuildRequires: git
-BuildRequires: gcc
+#BuildRequires: gcc
BuildRequires: cmake
BuildRequires: glib2-devel
BuildRequires: gettext-devel
@@ -125,6 +125,9 @@ cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
%changelog
+*Tue Oct 17 2017 metalstrolch 0.5.1-5
+- Update upstream
+
*Tue Oct 17 2017 metalstrolch 0.5.1-4
- Fix medium GUI icon size to cope with changed icon set on upstream
- Update upstream