dvratil pushed to plasma-nm (f22). "Plasma 5.2.95"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Apr 27 13:30:16 UTC 2015


>From 8d4a6bf667bdbcda8b7c04714d313cce72faa895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil at redhat.com>
Date: Thu, 23 Apr 2015 17:44:19 +0200
Subject: Plasma 5.2.95


diff --git a/.gitignore b/.gitignore
index b8d3966..84255c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /plasma-nm-5.2.0.tar.xz
 /plasma-nm-5.2.1.tar.xz
 /plasma-nm-5.2.2.tar.xz
+/plasma-nm-5.2.95.tar.xz
diff --git a/plasma-nm.spec b/plasma-nm.spec
index 4f0c7e6..00ae831 100644
--- a/plasma-nm.spec
+++ b/plasma-nm.spec
@@ -1,6 +1,6 @@
 Name:           plasma-nm
-Version:        5.2.2
-Release:        2%{?dist}
+Version:        5.2.95
+Release:        1%{?dist}
 Summary:        Plasma Next applet written in QML for managing network connections
 License:        LGPLv2+ and GPLv2+
 URL:            https://projects.kde.org/projects/kde/workspace/plasma-nm
@@ -16,9 +16,6 @@ Source0:        http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{ve
 # Add plasma-nm to default systray if needed, for upgraders...
 Source10:       01-fedora-plasma-nm.js
 
-# Upstream patches
-Patch0:         plasma-nm-adapt-to-modemmanager-qt-API-changes.patch
-
 BuildRequires:  gettext
 
 BuildRequires:  kf5-rpm-macros
@@ -47,7 +44,8 @@ BuildRequires:  kf5-kdeclarative-devel
 BuildRequires:  kf5-kinit-devel
 BuildRequires:  kf5-kdelibs4support-devel
 BuildRequires:  kf5-networkmanager-qt-devel
-BuildRequires:  kf5-modemmanager-qt-devel
+# API changed in 5.9.0
+BuildRequires:  kf5-modemmanager-qt-devel >= 5.9.0
 
 BuildRequires:  pkgconfig(NetworkManager) >= 0.9.8
 BuildRequires:  pkgconfig(ModemManager) >= 1.0.0
@@ -97,7 +95,7 @@ Provides:       kde-plasma-nm-openvpn = %{version}-%{release}
 %{summary}.
 
 %package        vpnc
-Summary:        Vpnc support for %{name} 
+Summary:        Vpnc support for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       NetworkManager-vpnc
 Obsoletes:      kde-plasma-networkmanagement-vpnc < 1:0.9.1.0
@@ -155,9 +153,7 @@ Provides:       kde-plasma-nm-pptp = %{version}-%{release}
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
-
-%patch0 -p1 -b .adapt-to-modemmanager-qt-API-changes
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 mkdir -p %{_target_platform}
@@ -245,6 +241,9 @@ install -m644 -p -D %{SOURCE10} %{buildroot}%{_datadir}/plasma/updates/01-fedora
 %endif
 
 %changelog
+* Wed Apr 22 2015 Daniel Vrátil <dvratil at redhat.com> - 5.2.95-1
+- Plasma 5.2.95
+
 * Thu Apr 09 2015 Jan Grulich <jgrulich at redhat.com> - 5.2.2-2
 - Rebuild (kf5-modemmanager-qt)
 
diff --git a/sources b/sources
index 8c85ba2..52cd613 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-296b78fb6b84f80441f6144b11a5d6a5  plasma-nm-5.2.2.tar.xz
+27997aec60ec54d902999501183fa1a6  plasma-nm-5.2.95.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/plasma-nm.git/commit/?h=f22&id=8d4a6bf667bdbcda8b7c04714d313cce72faa895


More information about the scm-commits mailing list