rpms/kde-plasma-networkmanagement/F-12 kde-plasma-networkmanagement.spec, 1.25, 1.26 sources, 1.14, 1.15

Wed Feb 10 18:17:54 UTC 2010

Author: kkofler

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

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

* Wed Feb 10 2010 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.11.20100210svn
- update to revision 1088283 (2010-02-10)
- drop F10 conditionals
- warn about the plasmoid being experimental, recommend knetworkmanager
- drop minimum version requirements for qt and kdelibs, not needed anymore


Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12/kde-plasma-networkmanagement.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26

--- kde-plasma-networkmanagement.spec	10 Feb 2010 17:45:12 -0000	1.25
+++ kde-plasma-networkmanagement.spec	10 Feb 2010 18:17:54 -0000	1.26
@@ -1,22 +1,7 @@
-%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.10.20091220%{?dist}
+Release:        0.11.20100210%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -26,15 +11,15 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r 1064692 svn://anonsvn.kde.org/home/kde/trunk/kdereview/networkmanagement kde-plasma-networkmanagement-0.9
+#  svn export -r 1088283 svn://anonsvn.kde.org/home/kde/trunk/kdereview/networkmanagement kde-plasma-networkmanagement-0.9
 #  tar -c kde-plasma-networkmanagement-0.9 | bzip2 --best -c > kde-plasma-networkmanagement-0.9.tar.bz2
 Source0:        %{name}-%{version}.tar.bz2
 
-BuildRequires:  kdelibs4-devel >= 4.3.80
+BuildRequires:  kdelibs4-devel
 BuildRequires:  kdebase-workspace-devel
 BuildRequires:  NetworkManager-glib-devel >= 0.7.0
 BuildRequires:  PolicyKit-devel
-BuildRequires:  qt4-devel >= 4.6.0
+BuildRequires:  qt4-devel
 
 Requires: NetworkManager
 
@@ -42,66 +27,60 @@ 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}
+# FIXME: Drop this? It makes trying out the plasmoid painful as the monolithic
+#        version autostarts. -- Kevin
+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}
+This Plasma applet is alpha software with known issues. We recommend
+knetworkmanager (the system tray version) for production use.
+
+%package -n knetworkmanager
 Summary: NetworkManager KDE 4 integration
 Group: Applications/Internet
-Requires: %{knetworkmanager}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?have_knm3}
-Conflicts: knetworkmanager < 0.8
-%else
+Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes: knetworkmanager4 < %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%description -n %{knetworkmanager}
+%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} 
+# FIXME: What about people who want to try the experimental plasmoid? -- Kevin
+Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
 %{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
 %{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
-%if ! 0%{?have_knm3}
 Obsoletes: knetworkmanager4-libs < %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%description -n %{knetworkmanager}-libs
+%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} 
+# FIXME: What about people who want to try the experimental plasmoid? -- Kevin
+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}
-%if ! 0%{?have_knm3}
 Obsoletes:      knetworkmanager4-openvpn < %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%description -n %{knetworkmanager}-openvpn
+%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} 
+# FIXME: What about people who want to try the experimental plasmoid? -- Kevin
+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} 
-%if ! 0%{?have_knm3}
 Obsoletes:      knetworkmanager4-vpnc < %{?epoch:%{epoch}:}%{version}-%{release}
-%endif
-%description -n %{knetworkmanager}-vpnc
+%description -n knetworkmanager-vpnc
 %{summary}.
-%{?disclaimer}
 
 
 %prep
@@ -134,11 +113,11 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4
 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 || :
@@ -146,16 +125,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
@@ -172,7 +151,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*
@@ -182,17 +161,17 @@ 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}-novellvpn
+#files -n knetworkmanager-novellvpn
 #defattr(-,root,root,-)
 #{_kde4_libdir}/kde4/networkmanagement_novellvpnui.so
 #{_kde4_datadir}/kde4/services/networkmanagement_novellvpnui.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
@@ -208,6 +187,12 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Wed Feb 10 2010 Kevin Kofler <Kevin at tigcc.ticalc.org>  1:0.9-0.11.20100210svn
+- update to revision 1088283 (2010-02-10)
+- drop F10 conditionals
+- warn about the plasmoid being experimental, recommend knetworkmanager
+- drop minimum version requirements for qt and kdelibs, not needed anymore
+
 * Thu Jan 28 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.10.20091220svn
 - -libs: use %%{_kde4_version}
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	10 Feb 2010 17:45:13 -0000	1.14
+++ sources	10 Feb 2010 18:17:54 -0000	1.15
@@ -1 +1 @@
-b31479966fd13a7391f0211e41ce96d4  kde-plasma-networkmanagement-0.9.tar.bz2
+f843f3fc2cbfa622670d2ef69d2b9b9c  kde-plasma-networkmanagement-0.9.tar.bz2

