[marble] 4.11.97
Rex Dieter
rdieter at fedoraproject.org
Sun Dec 1 13:42:08 UTC 2013
commit 1c958dbf149fcd0ccbe9604c0181c8fb14572d22
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sun Dec 1 07:42:01 2013 -0600
4.11.97
.gitignore | 2 +-
0001-Python-bindings-update.patch | 497 -
0002-Python-bindings-update.patch | 2011 ----
0003-Python-bindings-update-for-4.12.patch | 1017 --
0004-Python-bindings-update-for-4.12.-Docs.patch |12343 ----------------------
marble.spec | 16 +-
sources | 2 +-
7 files changed, 7 insertions(+), 15881 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3651deb..5574d26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/marble-4.11.3.tar.xz
-/marble-4.11.95.tar.xz
+/marble-4.11.97.tar.xz
diff --git a/marble.spec b/marble.spec
index 5b59b87..e5a4ea7 100644
--- a/marble.spec
+++ b/marble.spec
@@ -6,8 +6,8 @@
Name: marble
Summary: Virtual globe and world atlas
Epoch: 1
-Version: 4.11.95
-Release: 3%{?dist}
+Version: 4.11.97
+Release: 1%{?dist}
License: LGPLv2+
#URL: https://projects.kde.org/projects/kde/kdeedu/marble
@@ -27,11 +27,6 @@ Patch0: marble-4.11.90-qextserialport.patch
## upstreamable patches
## upstream patches
-# backported from 4.11.97
-Patch100: 0001-Python-bindings-update.patch
-Patch101: 0002-Python-bindings-update.patch
-Patch102: 0003-Python-bindings-update-for-4.12.patch
-Patch103: 0004-Python-bindings-update-for-4.12.-Docs.patch
BuildRequires: desktop-file-utils
BuildRequires: kdelibs4-devel >= %{version}
@@ -116,10 +111,6 @@ Requires: pykde4 >= %{version}
%setup -q
%patch0 -p1 -b .qextserialport
-%patch100 -p1 -b .python-bindings-update-1
-%patch101 -p1 -b .python-bindings-update-2
-%patch102 -p1 -b .python-bindings-update-3
-%patch103 -p1 -b .python-bindings-update-4
%build
@@ -216,6 +207,9 @@ fi
%changelog
+* Sun Dec 01 2013 Rex Dieter <rdieter at fedoraproject.org> - 1:4.11.97-1
+- 4.11.97
+
* Sun Dec 01 2013 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:4.11.95-3
- backport more Python bindings updates from 4.11.97, reenable Python bindings
diff --git a/sources b/sources
index 810fc41..d5b6b0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e141cf4d9f28aaa19fcc8e534618417 marble-4.11.95.tar.xz
+1ca82e7d781beb168d6b1a7c18b32062 marble-4.11.97.tar.xz
More information about the scm-commits
mailing list