rpms/kde-plasma-networkmanagement/devel kde-plasma-networkmanagement.spec, 1.26, 1.27 sources, 1.13, 1.14

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Log Message:
* Tue Nov 24 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.8.20091124svn
- New snapshot
- drop disclaimer
- BR: qt4-devel >= 4.6.0



Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- kde-plasma-networkmanagement.spec	25 Nov 2009 00:22:54 -0000	1.26
+++ kde-plasma-networkmanagement.spec	25 Nov 2009 02:55:31 -0000	1.27
@@ -2,9 +2,9 @@
 %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.
+#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
@@ -16,7 +16,7 @@ Name:           kde-plasma-networkmanage
 # to be a higher, natural upgrade from F-10's knetworkmanager-0.7
 Epoch:          1
 Version:        0.9
-Release:        0.7.20091024svn%{?dist}
+Release:        0.8.20091124svn%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -26,7 +26,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
+<<<<<<< kde-plasma-networkmanagement.spec
+#  svn export -r 1053937 svn://anonsvn.kde.org/home/kde/trunk/kdereview/networkmanagement kde-plasma-networkmanagement-0.9
+=======
 #  svn export -r 1039698 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
+>>>>>>> 1.26
 #  tar -c kde-plasma-networkmanagement-0.9 | bzip2 --best -c > kde-plasma-networkmanagement-0.9.tar.bz2
 Source0:        %{name}-%{version}.tar.bz2
 
@@ -34,6 +38,8 @@ BuildRequires:  kdelibs-experimental-dev
 BuildRequires:  kdebase-workspace-devel >= 4.3.0
 BuildRequires:  NetworkManager-glib-devel >= 0.7.0
 BuildRequires:  PolicyKit-devel
+# hopefully temporary
+BuildRequires:  qt4-devel >= 4.6.0
 
 Requires: NetworkManager
 
@@ -65,12 +71,19 @@ connections on systems that use the Netw
 %package -n %{knetworkmanager}-libs
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
+<<<<<<< kde-plasma-networkmanagement.spec
+Requires: knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release} 
+#Requires: kdelibs4%{?_isa} >= %{_kde4_version}
+#Requires: qt4%{?_isa} >= %{_qt4_version}
+%description -n knetworkmanager-libs
+=======
 Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
 #Requires: kdelibs4%{?_isa} >= %{kde4_version}
 %if ! 0%{?have_knm3}
 Obsoletes: knetworkmanager4-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 %description -n %{knetworkmanager}-libs
+>>>>>>> 1.26
 %{summary}.
 
 %package -n %{knetworkmanager}-openvpn
@@ -123,6 +136,9 @@ make install/fast -C %{_target_platform}
 ## unpackaged files
 # nuke -devel type stuff for which there isn't a public API
 rm -fv %{buildroot}%{_kde4_libdir}/libknm{client,internals,service,ui}.so
+# novellvpn bits (TODO: what is it, useful?)
+rm -fv %{_kde4_libdir}/kde4/networkmanagement_novellvpnui.so
+rm -fv %{_kde4_datadir}/kde4/services/networkmanagement_novellvpnui.desktop
 
 
 %clean
@@ -159,8 +175,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libexecdir}/networkmanagement_configshell
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_appsdir}/desktoptheme/default/networkmanagement/networkmanagement-wireless.svgz
-%{_kde4_appsdir}/desktoptheme/default/networkmanagement/networkmanagement.svg
 %{_kde4_appsdir}/networkmanagement/
 %{_kde4_datadir}/kde4/services/kcm_networkmanagement.desktop
 %{_kde4_datadir}/kde4/services/networkmanagement_pptpui.desktop
@@ -184,7 +198,16 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/kde4/networkmanagement_openvpnui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_openvpnui.desktop
 
+<<<<<<< kde-plasma-networkmanagement.spec
+#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
+>>>>>>> 1.26
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/networkmanagement_vpncui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_vpncui.desktop
@@ -200,6 +223,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Tue Nov 24 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.8.20091124svn
+- New snapshot
+- drop disclaimer
+- BR: qt4-devel >= 4.6.0
+
 * Tue Nov 24 2009 Ben Boeckel <MathStuf at gmail.com> - 1:0.9-0.7.20091024svn
 - Rebuild for Qt 4.6b1 ABI break
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	25 Oct 2009 15:45:43 -0000	1.13
+++ sources	25 Nov 2009 02:55:31 -0000	1.14
@@ -1 +1 @@
-9f70db4f66c5bcc811fecce08d3b1e4d  kde-plasma-networkmanagement-0.9.tar.bz2
+132cc876e5197445613bb6379df47476  kde-plasma-networkmanagement-0.9.tar.bz2