Attachment 891679 Details for Bug 1093552 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-installation-of-cityplacemarks.cache-1093552.patch (text/plain), 2.65 KB, created by Yaakov Selkowitz on 2014-05-02 04:05:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-05-02 04:05:23 UTC

Size: 2.65 KB

patch

obsolete

>From 4226331d8130458857a8ff8ca289a175cacbb181 Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Thu, 1 May 2014 23:05:02 -0500
>Subject: [PATCH] Fix installation of cityplacemarks.cache (#1093552)
>
>---
> marble-4.12.0-app_versions.patch | 15 +++------------
> marble.spec                      |  5 ++++-
> 2 files changed, 7 insertions(+), 13 deletions(-)
>
>diff --git a/marble-4.12.0-app_versions.patch b/marble-4.12.0-app_versions.patch
>index e11f480..ad1bbe2 100644
>--- a/marble-4.12.0-app_versions.patch
>+++ b/marble-4.12.0-app_versions.patch
>@@ -1,12 +1,10 @@
> diff -up marble-4.12.0/CMakeLists.txt.app_versions marble-4.12.0/CMakeLists.txt
> --- marble-4.12.0/CMakeLists.txt.app_versions	2013-12-11 14:55:59.000000000 -0500
> +++ marble-4.12.0/CMakeLists.txt	2013-12-24 10:33:37.496698469 -0500
>-@@ -26,7 +26,8 @@ include( MarbleMacros )
>- # Generate the tiles with the tilecreator at compile time
>+@@ -27,6 +27,7 @@ include( MarbleMacros )
>  # if this option is set, srtm.jpg will not be installed but the generated tiles instead
>  option(QTONLY "Create Marble version without KDE dependencies" OFF)
>--option(MOBILE "Create a Marble version optimized for handheld devices")
>-+option(MOBILE "Create a Marble version optimized for handheld devices" ON)
>+ option(MOBILE "Create a Marble version optimized for handheld devices")
> +option(TOUCH  "Create a Marble version optimized for meego/touch devices" OFF)
>  
>  ####################################################
>@@ -14,14 +12,7 @@ diff -up marble-4.12.0/CMakeLists.txt.app_versions marble-4.12.0/CMakeLists.txt
> diff -up marble-4.12.0/src/apps/CMakeLists.txt.app_versions marble-4.12.0/src/apps/CMakeLists.txt
> --- marble-4.12.0/src/apps/CMakeLists.txt.app_versions	2013-12-11 14:55:59.000000000 -0500
> +++ marble-4.12.0/src/apps/CMakeLists.txt	2013-12-24 10:29:27.472965499 -0500
>-@@ -1,11 +1,15 @@
>- add_subdirectory(marble-ui)
>- add_subdirectory(marble-qt)
>-+if ( MOBILE )
>- add_subdirectory(marble-mobile)
>-+endif ( MOBILE )
>- 
>- if (NOT QTONLY)
>+@@ -6,6 +6,8 @@
>    add_subdirectory(marble-kde)
>  endif()
>  
>diff --git a/marble.spec b/marble.spec
>index f44cb63..150a7c0 100644
>--- a/marble.spec
>+++ b/marble.spec
>@@ -8,7 +8,7 @@ Name:    marble
> Summary: Virtual globe and world atlas 
> Epoch:   1
> Version: 4.13.0
>-Release: 1%{?dist}
>+Release: 2%{?dist}
> 
> License: LGPLv2+
> #URL:    https://projects.kde.org/projects/kde/kdeedu/marble
>@@ -267,6 +267,9 @@ fi
> 
> 
> %changelog
>+* Fri May 05 2014 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - 1:4.13.0-2
>+- Fix installation of cityplacemarks.cache (#1093552)
>+
> * Sat Apr 12 2014 Rex Dieter <rdieter@fedoraproject.org> - 1:4.13.0-1
> - 4.13.0
> 
>-- 
>1.8.5.5
>

Actions: View | Diff

Attachments on bug 1093552: 891679 | 891691