rpms/kde-plasma-networkmanagement/devel kde-plasma-networkmanagement.spec, 1.30, 1.31 sources, 1.14, 1.15

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kde-plasma-networkmanagement.spec sources 
Log Message:
* Mon Dec 21 2009 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.9.20091220svn
- 20091220 snapshot
- -libs: use/tighten qt4/kdelibs4 deps



Index: kde-plasma-networkmanagement.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/kde-plasma-networkmanagement.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- kde-plasma-networkmanagement.spec	19 Dec 2009 02:28:41 -0000	1.30
+++ kde-plasma-networkmanagement.spec	21 Dec 2009 13:52:33 -0000	1.31
@@ -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.8.20091124svn%{?dist}
+Release:        0.9.20091220%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -26,17 +26,18 @@ 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 1053937 svn://anonsvn.kde.org/home/kde/trunk/kdereview/networkmanagement 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
-# hopefully temporary
 BuildRequires:  qt4-devel >= 4.6.0
 
+%global kde4_version %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
+
 Requires: NetworkManager
 
 # multilib upgrades
@@ -68,8 +69,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}
-#Requires: qt4%{?_isa} >= %{_qt4_version}
+Requires: kdelibs4%{?_isa} %{?_kde4_version:>= %{_kde4_version}}
+Requires: qt4%{?_isa} %{?_qt4_version:>= %{_qt4_version}}
 %if ! 0%{?have_knm3}
 Obsoletes: knetworkmanager4-libs < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
@@ -209,6 +210,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/
 
 
 %changelog
+* 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kde-plasma-networkmanagement/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	25 Nov 2009 02:55:31 -0000	1.14
+++ sources	21 Dec 2009 13:52:33 -0000	1.15
@@ -1 +1 @@
-132cc876e5197445613bb6379df47476  kde-plasma-networkmanagement-0.9.tar.bz2
+b31479966fd13a7391f0211e41ce96d4  kde-plasma-networkmanagement-0.9.tar.bz2