rpms/kde-plasma-networkmanagement/F-11 kde-plasma-networkmanagement.spec, 1.10, 1.11

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25287/F-11

Modified Files:
	kde-plasma-networkmanagement.spec 
Log Message:
Sync from devel:

* Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
- Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
- Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-11/kde-plasma-networkmanagement.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- kde-plasma-networkmanagement.spec	30 Sep 2009 15:49:05 -0000	1.10
+++ kde-plasma-networkmanagement.spec	25 Oct 2009 08:03:24 -0000	1.11
@@ -1,13 +1,22 @@
+%if 0%{?fedora} && 0%{?fedora} < 11
+%define have_knm3 1
+%endif
 
 %define disclaimer \
 This is alpha software with known issues.\
 We still recommend nm-applet from NetworkManager-gnome for production use.
 
+%if 0%{?have_knm3}
+%define knetworkmanager knetworkmanager4
+%else
+%define knetworkmanager knetworkmanager
+%endif
+
 Name:           kde-plasma-networkmanagement
 # to be a higher, natural upgrade from F-10's knetworkmanager-0.7
 Epoch:          1
 Version:        0.9
-Release:        0.3.20090930svn%{?dist}
+Release:        0.4.20090930svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -34,49 +43,63 @@ Requires: NetworkManager
 Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
 Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21
 
-Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 A Plasma applet to control your wired and wireless network(s) in KDE 4 using
 the default NetworkManager service.
 %{?disclaimer}
 
-%package -n knetworkmanager
+%package -n %{knetworkmanager}
 Summary: NetworkManager KDE 4 integration
 Group: Applications/Internet
-Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n knetworkmanager
+Requires: %{knetworkmanager}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+%if 0%{?have_knm3}
+Conflicts: knetworkmanager < 0.8
+%else
+Obsoletes: knetworkmanager4 < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}
 KNetworkManager is a system tray applet for controlling network
 connections on systems that use the NetworkManager daemon.
 %{?disclaimer}
 
-%package -n knetworkmanager-libs
+%package -n %{knetworkmanager}-libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
-Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 #Requires: kdelibs4%{?_isa} >= %{kde4_version}
-%description -n knetworkmanager-libs
+%if ! 0%{?have_knm3}
+Obsoletes: knetworkmanager4-libs < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-libs
 %{summary}.
 
-%package -n knetworkmanager-openvpn
-Summary:        OpenVPN support for knetworkmanager
+%package -n %{knetworkmanager}-openvpn
+Summary:        OpenVPN support for %{knetworkmanager}
 Group:          Applications/Internet
-Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:       %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-openvpn
 Obsoletes:      kde-plasma-networkmanagement-openvpn < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-openvpn = %{?epoch:%{epoch}:}%{version}-%{release}
-%description -n knetworkmanager-openvpn
+%if ! 0%{?have_knm3}
+Obsoletes:      knetworkmanager4-openvpn < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-openvpn
 %{summary}.
 %{?disclaimer}
 
-%package -n knetworkmanager-vpnc
-Summary:        Vpnc support for knetworkmanager
+%package -n %{knetworkmanager}-vpnc
+Summary:        Vpnc support for %{knetworkmanager}
 Group:          Applications/Internet
-Requires:       knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+Requires:       %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 Requires:       NetworkManager-vpnc
 Obsoletes:      kde-plasma-networkmanagement-vpnc < %{?epoch:%{epoch}:}%{version}-%{release} 
 Provides:       kde-plasma-networkmanagement-vpnc = %{?epoch:%{epoch}:}%{version}-%{release} 
-%description -n knetworkmanager-vpnc
+%if ! 0%{?have_knm3}
+Obsoletes:      knetworkmanager4-vpnc < %{?epoch:%{epoch}:}%{version}-%{release}
+%endif
+%description -n %{knetworkmanager}-vpnc
 %{summary}.
 %{?disclaimer}
 
@@ -109,11 +132,11 @@ rm -fv %{buildroot}%{_kde4_libdir}/libkn
 rm -rf %{buildroot}
 
 
-%post -n knetworkmanager
+%post -n %{knetworkmanager}
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
-%postun -n knetworkmanager
+%postun -n %{knetworkmanager}
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
   touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -121,16 +144,16 @@ if [ $1 -eq 0 ] ; then
   gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
 fi
 
-%posttrans -n knetworkmanager
+%posttrans -n %{knetworkmanager}
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
 
-%post -n knetworkmanager-libs -p /sbin/ldconfig
+%post -n %{knetworkmanager}-libs -p /sbin/ldconfig
 
-%postun -n knetworkmanager-libs -p /sbin/ldconfig
+%postun -n %{knetworkmanager}-libs -p /sbin/ldconfig
 
 
-%files -n knetworkmanager
+%files -n %{knetworkmanager}
 %defattr(-,root,root,-)
 %doc TODO DESIGN COPYING COPYING.LIB
 %{_sysconfdir}/dbus-1/system.d/NetworkManager-kde4.conf
@@ -149,7 +172,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_datadir}/autostart/kde4-knetworkmanager-autostart.desktop
 %{_kde4_datadir}/applications/kde4/knetworkmanager.desktop
 
-%files -n knetworkmanager-libs
+%files -n %{knetworkmanager}-libs
 %defattr(-,root,root,-)
 %{_kde4_libdir}/libknmclient.so.4*
 %{_kde4_libdir}/libknminternals.so.4*
@@ -159,12 +182,12 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/libknm_nm.so
 %{_kde4_libdir}/libsolidcontrolfuture.so
 
-%files -n knetworkmanager-openvpn
+%files -n %{knetworkmanager}-openvpn
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/networkmanagement_openvpnui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_openvpnui.desktop
 
-%files -n knetworkmanager-vpnc
+%files -n %{knetworkmanager}-vpnc
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/networkmanagement_vpncui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_vpncui.desktop
@@ -180,6 +203,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Sun Oct 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.4.20090930svn
+- Build as knetworkmanager4 for F10 so KDE 3 KNM users are not forced to upgrade
+- Obsolete knetworkmanager4 (and keep replacing the KDE 3 KNM) on F11+
+
 * Wed Sep 30 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.3.20090930svn
 - New snapshot