[kdesvn] Update to 1.6.0 Drop kdex, virtual, and gcc47 patches applied upstream

Orion Poplawski orion at fedoraproject.org
Mon Aug 6 17:27:10 UTC 2012


commit 937027868ab0cd16e807896176366f6807d5071e
Author: Orion Poplawski <orion at nwra.com>
Date:   Mon Aug 6 11:27:12 2012 -0600

    Update to 1.6.0
    Drop kdex, virtual, and gcc47 patches applied upstream

 .gitignore              |    1 +
 kdesvn-1.5.3-kdex.patch |    9 ---------
 kdesvn-gcc47.patch      |   11 -----------
 kdesvn-virtual.patch    |   12 ------------
 kdesvn.spec             |   17 ++++++-----------
 sources                 |    2 +-
 6 files changed, 8 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 99a62cc..2dfc6eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 kdesvn-1.5.3.tar.bz2
 kdesvn-1.5.4.tar.bz2
 /kdesvn-1.5.5.tar.bz2
+/kdesvn-1.6.0.tar.bz2
diff --git a/kdesvn.spec b/kdesvn.spec
index 56c549b..1c2f153 100644
--- a/kdesvn.spec
+++ b/kdesvn.spec
@@ -1,18 +1,12 @@
 Name:           kdesvn
-Version:        1.5.5
-Release:        6%{?dist}
+Version:        1.6.0
+Release:        1%{?dist}
 Summary:        A subversion client for KDE4 with KIO integration
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://kdesvn.alwins-world.de/
 Source0:        http://kdesvn.alwins-world.de/downloads/kdesvn-%{version}.tar.bz2
-#Update kdex.dtd title
-Patch0:         kdesvn-1.5.3-kdex.patch
-# Remove problematic virtual inheritance
-Patch1:         kdesvn-virtual.patch
-# Compile with gcc 4.7
-Patch2:         kdesvn-gcc47.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  subversion-devel, kdelibs-devel, neon-devel, cmake, gettext
@@ -44,9 +38,6 @@ developing applications that use the %{name} subversion wrapper library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .kdex
-%patch1 -p1 -b .virtual
-%patch2 -p1 -b .gcc47
 
 
 %build
@@ -117,6 +108,10 @@ xdg-icon-resource forceupdate --theme hicolor
 
 
 %changelog
+* Mon Aug 6 2012 - Orion Poplawski <orion at cora.nwra.com> - 1.6.0-1
+- Update to 1.6.0
+- Drop kdex, virtual, and gcc47 patches applied upstream
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 28d253c..6c7f779 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f11d31cc55fba408b7971541ee261d0  kdesvn-1.5.5.tar.bz2
+7e6adc98ff4777a06d5752d3f2b58fa3  kdesvn-1.6.0.tar.bz2


More information about the scm-commits mailing list