More dependencies needed, specified in the README

[andy/viking.git] / mingw-viking.spec.in

diff --git a/mingw-viking.spec.in b/mingw-viking.spec.in
index b2d89aa8782bd6c133d5dab6e4a6764a02a603ad..fcc5684feb00787189cafad0e3114325f6f04a13 100644 (file)
--- a/mingw-viking.spec.in
+++ b/mingw-viking.spec.in
@@ -12,7 +12,7 @@ Source0:      %{_pkg_name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:     noarch
 
-# Only 32bit ATM
+# 32bit version only in this file. See mingw64-viking.spec for the 64bit version
 
 # Programs to enable the cross build
 BuildRequires: mingw32-filesystem
@@ -36,39 +36,33 @@ BuildRequires:      mingw32-gtk2-devel
 BuildRequires: mingw32-libexpat-devel
 BuildRequires: mingw32-libcurl-devel
 # Optional libraries
-BuildRequires: mingw32-libexif-devel
+BuildRequires: mingw32-libgexiv2-devel
 BuildRequires: mingw32-libbz2-devel
 BuildRequires: mingw32-file-devel
 BuildRequires: mingw32-libmagic1
 BuildRequires: mingw32-libbz2-1
 BuildRequires: mingw32-sqlite-devel
 BuildRequires: mingw32-libzip-devel
+BuildRequires: mingw32-libnettle-devel
 
 # Libs for runtime (and thus also available for the NSIS installer to include the dependencies)
 Requires:      mingw32-gtk2
 Requires:      mingw32-libexpat1
 Requires:      mingw32-libcurl4
-Requires:      mingw32-libexif12
+Requires:      mingw32-libgexiv2
+Requires:      mingw32-libstdc++6
 Requires:      mingw32-libsqlite3-0
 Requires:      mingw32-libzip4
+Requires:      mingw32-libnettle
 # Currently running makensis in seperate script - so you will need it then
 #Requires:     mingw32-cross-nsis
 
-
 %description
 Viking is a free/open source program to manage GPS data.
 You can import, plot and create tracks, routes and waypoints, show OSM and other maps, see real-time GPS position, control items, etc.
 Other advanced capabilities include Geotagging Images, generate Maps (using Mapnik), Upload and Download tracks from OSM, Routing from OSRM or Google, Name Searches from OSM Nominatim or Google and more.
 It is written in mainly in C with some C++ and uses the GTK+2 toolkit.
 
-#
-# TODO 64bit version - possibly like this...
-#
-#%package -n mingw64-%{_pkg_name}
-#Summary:      %{summary}
-#
-#%description -n mingw64-%{_pkg_name}
-#%{description}
 %prep
 %setup -q -n %{_pkg_name}-%{version}
 
@@ -79,9 +73,8 @@ pushd win32/installer/pixmaps
 popd
 
 #
-# Specifics for Windows build - i.e. no Mapnik, no gexiv2 & no GPSD
+# Specifics for Windows build - i.e. no Mapnik & no GPSD
 %{_mingw32_configure}\
-  --with-libexif \
   --disable-realtime-gps-tracking \
   --disable-mapnik \
   --disable-scrollkeeper \