rpms/kde-plasma-networkmanagement/F-12 kde-plasma-networkmanagement.spec, 1.24, 1.25 sources, 1.13, 1.14

[Kevin Kofler]

Author: kkofler

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

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

* Thu Jan 28 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.10.20091220svn
- -libs: use %%{_kde4_version}

* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.9.20091220svn
- 20091220 snapshot
- -libs: use/tighten qt4/kdelibs4 deps

* Tue Nov 24 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.8.20091124svn
- New snapshot
- 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: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12/kde-plasma-networkmanagement.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- kde-plasma-networkmanagement.spec	25 Oct 2009 16:05:27 -0000	1.24
+++ kde-plasma-networkmanagement.spec	10 Feb 2010 17:45:12 -0000	1.25
@@ -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.6.20091024svn%{?dist}
+Release:        0.10.20091220%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -26,14 +26,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 1039698 svn://anonsvn.kde.org/home/kde/trunk/playground/base/plasma/applets/networkmanager kde-plasma-networkmanagement-0.9
+#  svn export -r 1064692 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:  kdelibs-experimental-devel
-BuildRequires:  kdebase-workspace-devel >= 4.3.0
+BuildRequires:  kdelibs4-devel >= 4.3.80
+BuildRequires:  kdebase-workspace-devel
 BuildRequires:  NetworkManager-glib-devel >= 0.7.0
 BuildRequires:  PolicyKit-devel
+BuildRequires:  qt4-devel >= 4.6.0
 
 Requires: NetworkManager
 
@@ -66,7 +67,8 @@ connections on systems that use the Netw
 Summary: Runtime libraries for %{name}
 Group:   System Environment/Libraries
 Requires: %{knetworkmanager} = %{?epoch:%{epoch}:}%{version}-%{release} 
-#Requires: kdelibs4%{?_isa} >= %{kde4_version}
+%{?_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
@@ -123,6 +125,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 %{buildroot}%{_kde4_libdir}/kde4/networkmanagement_novellvpnui.so
+rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_novellvpnui.desktop
 
 
 %clean
@@ -135,15 +140,15 @@ touch --no-create %{_kde4_iconsdir}/oxyg
 
 %postun -n %{knetworkmanager}
 if [ $1 -eq 0 ] ; then
-  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
   touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
-  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null
-  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 fi
 
 %posttrans -n %{knetworkmanager}
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 %post -n %{knetworkmanager}-libs -p /sbin/ldconfig
 
@@ -159,8 +164,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,6 +187,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 %{_kde4_libdir}/kde4/networkmanagement_openvpnui.so
 %{_kde4_datadir}/kde4/services/networkmanagement_openvpnui.desktop
 
+#files -n %{knetworkmanager}-novellvpn
+#defattr(-,root,root,-)
+#{_kde4_libdir}/kde4/networkmanagement_novellvpnui.so
+#{_kde4_datadir}/kde4/services/networkmanagement_novellvpnui.desktop
+
 %files -n %{knetworkmanager}-vpnc
 %defattr(-,root,root,-)
 %{_kde4_libdir}/kde4/networkmanagement_vpncui.so
@@ -200,6 +208,20 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* Thu Jan 28 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.10.20091220svn
+- -libs: use %%{_kde4_version}
+
+* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.9.20091220svn
+- 20091220 snapshot
+- -libs: use/tighten qt4/kdelibs4 deps
+
+* Tue Nov 24 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.8.20091124svn
+- New snapshot
+- 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
+
 * Sun Oct 25 2009 Ben Boeckel <MathStuf at gmail.com> 1:0.9-0.6.20091024svn
 - Rebuild with new sources
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	25 Oct 2009 15:51:01 -0000	1.13
+++ sources	10 Feb 2010 17:45:13 -0000	1.14
@@ -1 +1 @@
-9f70db4f66c5bcc811fecce08d3b1e4d  kde-plasma-networkmanagement-0.9.tar.bz2
+b31479966fd13a7391f0211e41ce96d4  kde-plasma-networkmanagement-0.9.tar.bz2