[kde-plasma-networkmanagement/f14] * Fri Jun 17 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.41.1.20110616git - 20110616 snapshot

[Kevin Kofler]

commit f69d093657fa3e5368ae282feace61549a51c630
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Fri Jun 17 18:45:06 2011 +0200

    * Fri Jun 17 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.41.1.20110616git
    - 20110616 snapshot (from git master)
    - drop NULL checks patch (fixed upstream)

 .gitignore                                   |    1 +
 kde-plasma-networkmanagement.spec            |   13 +++++++------
 networkmanagement-0.9-20110323-#710996.patch |   23 -----------------------
 sources                                      |    2 +-
 4 files changed, 9 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5d64116..d9fdda1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /networkmanagement-0.9-20110314.tar.bz2
 /networkmanagement-0.9-20110323.tar.bz2
+/networkmanagement-0.9-20110616.tar.bz2
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 4a0561d..3d7c334 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -1,10 +1,11 @@
 
-%define snap 20110323
+%global snap 20110616
 
 Name:           kde-plasma-networkmanagement
 Epoch:          1
 Version:        0.9
-Release:        0.40.%{snap}%{?dist}.1
+# Bump this integer: V if you do new builds (upgrade path)
+Release:        0.41.1.%{snap}git%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
@@ -23,9 +24,6 @@ Source10: 00-fedora-networkmanagement.js
 ## upstreamable patches
 
 ## upstream patches
-# fix missing NULL checks (#710996)
-# backported from upstream git (rev ff9076fe85f31b0cfa388d92a0c6d288ad07f396)
-Patch100: networkmanagement-0.9-20110323-#710996.patch
 
 BuildRequires:  kdelibs4-devel >= 4.5.0
 BuildRequires:  kdebase-workspace-devel
@@ -102,7 +100,6 @@ Provides:       knetworkmanager-vpnc = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %prep
 %setup -q -n networkmanagement-%{version}
-%patch100 -p1 -b .#710996
 
 # nuke monolithic knm bits
 rm -rfv monolithic po/*/knetworkmanager.po
@@ -217,6 +214,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
+* Fri Jun 17 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.41.1.20110616git
+- 20110616 snapshot (from git master)
+- drop NULL checks patch (fixed upstream)
+
 * Wed Jun 08 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 1:0.9-0.40.20110323.1
 - fix missing NULL checks (#710996, backported from upstream git)
 
diff --git a/sources b/sources
index 4f49967..e65d4fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c40c0d6b0dd7761aec891af8dbadb07  networkmanagement-0.9-20110323.tar.bz2
+bc9f24153071ee9ce1c353745d3677e0  networkmanagement-0.9-20110616.tar.bz2