rdieter pushed to marble (master). "fix build"

[notifications at fedoraproject.org]

>From b9dc6bed2eb3d96cc4bb9a1baf1564276715bf3c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Sun, 19 Apr 2015 18:30:56 -0500
Subject: fix build


diff --git a/marble-14.12.3-quazip_qt5.patch b/marble-14.12.3-quazip_qt5.patch
deleted file mode 100644
index 0f4805a..0000000
--- a/marble-14.12.3-quazip_qt5.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up marble-14.12.3/cmake/modules/Findquazip.cmake.quazip marble-14.12.3/cmake/modules/Findquazip.cmake
---- marble-14.12.3/cmake/modules/Findquazip.cmake.quazip	2015-02-23 02:27:55.000000000 -0600
-+++ marble-14.12.3/cmake/modules/Findquazip.cmake	2015-03-12 12:04:25.222115177 -0500
-@@ -7,7 +7,11 @@ if(QUAZIP_INCLUDE_DIR AND QUAZIP_LIBRARI
- else(QUAZIP_INCLUDE_DIR AND QUAZIP_LIBRARIES)
- 
-   find_path(QUAZIP_INCLUDE_DIR NAMES quazip/quazip.h)
-+  if(QT5BUILD)
-+  find_library(QUAZIP_LIBRARIES NAMES quazip-qt5)
-+  else(QT5BUILD)
-   find_library(QUAZIP_LIBRARIES NAMES quazip)
-+  endif(QT5BUILD)
- 
-   include(FindPackageHandleStandardArgs)
-   find_package_handle_standard_args(quazip DEFAULT_MSG QUAZIP_INCLUDE_DIR QUAZIP_LIBRARIES)
diff --git a/marble-15.04.0-quazip5.patch b/marble-15.04.0-quazip5.patch
new file mode 100644
index 0000000..99b5065
--- /dev/null
+++ b/marble-15.04.0-quazip5.patch
@@ -0,0 +1,17 @@
+diff -up marble-15.04.0/cmake/modules/Findquazip.cmake.quazip_qt5 marble-15.04.0/cmake/modules/Findquazip.cmake
+--- marble-15.04.0/cmake/modules/Findquazip.cmake.quazip_qt5	2015-04-06 08:49:36.000000000 -0500
++++ marble-15.04.0/cmake/modules/Findquazip.cmake	2015-04-19 17:52:12.963173973 -0500
+@@ -6,8 +6,13 @@ if(QUAZIP_INCLUDE_DIR AND QUAZIP_LIBRARI
+   set(QUAZIP_FOUND TRUE)
+ else(QUAZIP_INCLUDE_DIR AND QUAZIP_LIBRARIES)
+ 
++  if(QT5BUILD)
++  find_path(QUAZIP_INCLUDE_DIR NAMES quazip5/quazip.h)
++  find_library(QUAZIP_LIBRARIES NAMES quazip5)
++  else(QT5BUILD)
+   find_path(QUAZIP_INCLUDE_DIR NAMES quazip/quazip.h)
+   find_library(QUAZIP_LIBRARIES NAMES quazip)
++  endif(QT5BUILD)
+ 
+   include(FindPackageHandleStandardArgs)
+   find_package_handle_standard_args(quazip DEFAULT_MSG QUAZIP_INCLUDE_DIR QUAZIP_LIBRARIES)
diff --git a/marble.spec b/marble.spec
index 93da990..df30653 100644
--- a/marble.spec
+++ b/marble.spec
@@ -27,8 +27,8 @@ Source0:  http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-
 
 # find libqextserialport-1.2.so and qt5 versions
 Patch0: marble-14.12.3-qextserialport.patch
-# find quazip-qt5
-Patch1: marble-14.12.3-quazip_qt5.patch
+# find quazip5
+Patch1: marble-15.04.0-quazip5.patch
 
 ## upstreamable patches
 # 1. add/fix support for MOBILE/TOUCH marble app versions
@@ -70,6 +70,8 @@ BuildRequires: pkgconfig(Qt5Svg)
 BuildRequires: pkgconfig(Qt5Sql)
 BuildRequires: pkgconfig(Qt5Concurrent)
 BuildRequires: pkgconfig(Qt5PrintSupport)
+# https://bugzilla.redhat.com/show_bug.cgi?id=1197484
+#BuildRequires: quazip-qt5-devel
 %endif
 # TODO: The following are not packaged in Fedora:
 # * liblocation , position information on Maemo 5 devices , <http://maemo.org/>
@@ -352,7 +354,7 @@ fi
 
 %files common
 %doc LICENSE.txt
-%doc CREDITS MANIFESTO.txt TODO USECASES
+%doc CREDITS MANIFESTO.txt USECASES
 %{_kde4_iconsdir}/hicolor/*/*/marble.*
 %{_kde4_datadir}/mime/packages/geo.xml
 %dir %{_kde4_appsdir}/marble/
@@ -397,8 +399,8 @@ fi
 %postun widget -p /sbin/ldconfig
 
 %files widget
-%{_kde4_libdir}/libmarblewidget.so.20
-%{_kde4_libdir}/libmarblewidget.so.0.19.*
+%{_kde4_libdir}/libmarblewidget.so.21
+%{_kde4_libdir}/libmarblewidget.so.0.21.*
 %{_kde4_libdir}/kde4/plugins/marble/
 
 %files widget-data
@@ -417,8 +419,8 @@ fi
 
 %if 0%{?qt5}
 %files widget-qt5
-%{_libdir}/libmarblewidget-qt5.so.20
-%{_libdir}/libmarblewidget-qt5.so.0.19.*
+%{_libdir}/libmarblewidget-qt5.so.21
+%{_libdir}/libmarblewidget-qt5.so.0.21.*
 %{_libdir}/marble/plugins/
 
 %files widget-qt5-devel
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/marble.git/commit/?h=master&id=b9dc6bed2eb3d96cc4bb9a1baf1564276715bf3c