[marble] 4.11.90

Rex Dieter rdieter at fedoraproject.org
Sat Nov 16 05:15:36 UTC 2013


commit 7cd5c69c1b1cd142163be93ff3c3a801abd82543
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Nov 15 23:15:44 2013 -0600

    4.11.90

 .gitignore                          |    5 +----
 marble-4.10.90-qextserialport.patch |   12 ------------
 marble-4.11.90-qextserialport.patch |   12 ++++++++++++
 marble.spec                         |    7 +++++--
 sources                             |    2 +-
 5 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4598aae..c5939a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,2 @@
-/marble-4.10.5.tar.xz
-/marble-4.11.0.tar.xz
-/marble-4.11.1.tar.xz
-/marble-4.11.2.tar.xz
 /marble-4.11.3.tar.xz
+/marble-4.11.90.tar.xz
diff --git a/marble-4.11.90-qextserialport.patch b/marble-4.11.90-qextserialport.patch
new file mode 100644
index 0000000..d30850b
--- /dev/null
+++ b/marble-4.11.90-qextserialport.patch
@@ -0,0 +1,12 @@
+diff -up marble-4.11.90/cmake/modules/FindQextSerialPort.cmake.qextserialport marble-4.11.90/cmake/modules/FindQextSerialPort.cmake
+--- marble-4.11.90/cmake/modules/FindQextSerialPort.cmake.qextserialport	2013-11-15 23:13:22.312594680 -0600
++++ marble-4.11.90/cmake/modules/FindQextSerialPort.cmake	2013-11-15 23:14:47.161042461 -0600
+@@ -7,7 +7,7 @@ if(QEXTSERIALPORT_INCLUDE_DIR AND QEXTSE
+ else(QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARIES)
+ 
+   find_path(QEXTSERIALPORT_INCLUDE_DIR NAMES qextserialport.h PATH_SUFFIXES QtExtSerialPort HINTS ${QT_INCLUDE_DIR})
+-  find_library(QEXTSERIALPORT_LIBRARIES NAMES qextserialport HINTS ${QT_LIBRARY_DIR})
++  find_library(QEXTSERIALPORT_LIBRARIES NAMES qextserialport qextserialport-1.2 HINTS ${QT_LIBRARY_DIR})
+ 
+   include(FindPackageHandleStandardArgs)
+   find_package_handle_standard_args(QextSerialPort DEFAULT_MSG QEXTSERIALPORT_INCLUDE_DIR QEXTSERIALPORT_LIBRARIES)
diff --git a/marble.spec b/marble.spec
index ad02fc8..bb8c7a0 100644
--- a/marble.spec
+++ b/marble.spec
@@ -4,7 +4,7 @@
 Name:    marble
 Summary: Virtual globe and world atlas 
 Epoch:   1
-Version: 4.11.3
+Version: 4.11.90
 Release: 1%{?dist}
 
 License: LGPLv2+
@@ -20,7 +20,7 @@ Source0:  http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.ta
 
 # find libqextserialport-1.2.so
 # TODO: upstreamable? Or do we want to fix qextserialport-devel instead?
-Patch0: marble-4.10.90-qextserialport.patch
+Patch0: marble-4.11.90-qextserialport.patch
 
 ## upstreamable patches
 
@@ -202,6 +202,9 @@ fi
 
 
 %changelog
+* Sat Nov 16 2013 Rex Dieter <rdieter at fedoraproject.org> - 1:4.11.90-1
+- 4.11.90
+
 * Sat Nov 02 2013 Rex Dieter <rdieter at fedoraproject.org> - 1:4.11.3-1
 - 4.11.3
 
diff --git a/sources b/sources
index 39ef242..a8aba23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f1b385b6a8b49137f60c410b1c70986  marble-4.11.3.tar.xz
+b628131acbad77c596bfd18811ec4e3a  marble-4.11.90.tar.xz


More information about the scm-commits mailing list