[kde-plasma-networkmanagement] - 20110106 snapshot (sans translations for now)

[Rex Dieter]

commit e5cfc083da3359f576d04e5da978600d96aac34a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 6 13:41:58 2011 -0600

    - 20110106 snapshot (sans translations for now)

 .gitignore                             |    1 +
 kde-plasma-networkmanagement.spec      |   28 +-
 networkmanagement-vpn_always_ask.patch |  874 --------------------------------
 sources                                |    2 +-
 4 files changed, 15 insertions(+), 890 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 67f3ff4..f2fcaeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /networkmanagement-0.9-20101117.tar.bz2
+/networkmanagement-0.9-20110106.tar.bz2
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 1a5f6ea..8bdc97c 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -1,21 +1,20 @@
 
-%define snap 20101117
+%define snap 20110106
 
 Name:           kde-plasma-networkmanagement
 Epoch:          1
 Version:        0.9
-Release:        0.31.%{snap}%{?dist}
+Release:        0.32.%{snap}%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 Group:          Applications/Internet
 License:        (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and LGPLv2
-URL:            http://en.opensuse.org/KNetworkManager
+URL:            https://projects.kde.org/projects/extragear/base/networkmanagement 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# The source for this package was pulled from upstream's Subversion repository
-# using the create_tarball.rb script from kdesdk trunk:
-# ./create_tarball.rb -n -a networkmanagement
-# Please always use create_tarball.rb so translations get included.
+# The source for this package was pulled from upstream git repo
+# git clone git clone git://anongit.kde.org/networkmanagement
+# (cd networkmanagement ;  git archive --prefix networkmanagement-0.9/ --format tar master > ../networkmanagement-0.9-20110106 )
 Source0:        networkmanagement-%{version}-%{snap}.tar.bz2
 
 # Add plasma-nm to default systray if needed, for upgraders...
@@ -25,9 +24,6 @@ Source10: 00-fedora-networkmanagement.js
 # knetworkmanager doesn´t recognize BSSID
 # http://bugs.kde.org/238046
 Patch51: networkmanagement-bssid.patch
-# fix using vpnc secrets of type ALWAYS_ASK
-# http://bugs.kde.org/244416
-Patch52: networkmanagement-vpn_always_ask.patch
 
 ## upstream patches
 
@@ -106,11 +102,10 @@ Provides:       knetworkmanager-vpnc = %{?epoch:%{epoch}:}%{version}-%{release}
 %setup -q -n networkmanagement-%{version}
 
 %patch51 -p0 -b .bssid
-%patch52 -p1 -b .vpn_always_ask
 
 # nuke monolithic knm bits
-rm -rf monolithic po/*/knetworkmanager.po
-sed -i -e 's|add_subdirectory(monolithic)|#add_subdirectory(monolithic)|' CMakeLists.txt
+rm -rfv monolithic po/*/knetworkmanager.po
+sed -i.no_monolithic -e 's|add_subdirectory(monolithic)|#add_subdirectory(monolithic)|' CMakeLists.txt
 
 
 %build
@@ -143,8 +138,8 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_strongswanui
 # migrate to nm plasmoid
 install -m644 -p -D %{SOURCE10} %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/00-fedora-networkmanagement.js
 
-%find_lang libknetworkmanager 
-%find_lang plasma_applet_networkmanagement
+%find_lang libknetworkmanager || touch libknetworkmanager.lang
+%find_lang plasma_applet_networkmanagement || touch plasma_applet_networkmanagement.lang
 
 
 %clean
@@ -219,6 +214,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
+* Thu Jan 06 2011 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.32.20110106
+- 20110106 snapshot (sans translations for now)
+
 * Wed Nov 17 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.31.20101117
 - 20101117 snapshot
 - "Always ask for password" does not work (#582933,kde#244416)
diff --git a/sources b/sources
index a13c7f3..d1a6aa0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfc7f4fb1cf8b25ba47be61cc500fa1e  networkmanagement-0.9-20101117.tar.bz2
+e53d7984880cc7fc5c583ef195d33dcd  networkmanagement-0.9-20110106.tar.bz2