[kde-plasma-networkmanagement] * Fri Mar 25 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.43.20110323 - Add Obsoletes/Provides
Kevin Kofler
kkofler at fedoraproject.org
Fri Mar 25 10:58:57 UTC 2011
commit 36d80c6123f3217cd7bc998c1d9ab3882b22bf96
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Fri Mar 25 11:58:40 2011 +0100
* Fri Mar 25 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.43.20110323
- Add Obsoletes/Provides for the dropped subpackages on F15+
kde-plasma-networkmanagement.spec | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 46d0b63..589b848 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -8,7 +8,7 @@
Name: kde-plasma-networkmanagement
Epoch: 1
Version: 0.9
-Release: 0.42.%{snap}%{?dist}
+Release: 0.43.%{snap}%{?dist}
Summary: NetworkManager KDE 4 integration
Group: Applications/Internet
@@ -55,6 +55,22 @@ Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
Obsoletes: knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?nm09}
+Obsoletes: %{name}-openvpn < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: %{name}-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-pptp < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: %{name}-pptp = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: %{name}-vpnc < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: %{name}-vpnc = %{?epoch:%{epoch}:}%{version}-%{release}
+
+Obsoletes: knetworkmanager-openvpn < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: knetworkmanager-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: knetworkmanager-pptp < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: knetworkmanager-pptp = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: knetworkmanager-vpnc < %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: knetworkmanager-vpnc = %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+
%description
A Plasma applet to control your wired and wireless network(s) in KDE 4 using
the default NetworkManager service.
@@ -221,6 +237,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
%changelog
+* Fri Mar 25 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.43.20110323
+- Add Obsoletes/Provides for the dropped subpackages on F15+
+
* Fri Mar 25 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.42.20110323
- Conditionalize NM 0.9 (with compat patches) support to F15+
- Merge VPN subpackages into the main package for F15+ to match NM 0.9 packaging
More information about the scm-commits
mailing list