From 485d0e38c987feafd902e204d1d48f9c3b831990 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Sep 03 2015 16:32:02 +0000
Subject: Update to 1.2 git snapshot with libnm-based properties plugin


---

diff --git a/.gitignore b/.gitignore
index 0dfda28..788336d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ NetworkManager-vpnc-0.8.1.tar.bz2
 /NetworkManager-vpnc-1.0.0.tar.xz
 /NetworkManager-vpnc-1.0.2.tar.xz
 /NetworkManager-vpnc-1.0.6.tar.xz
+/NetworkManager-vpnc-1.2.0.tar.xz
diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec
index 50c74e2..b4af5ae 100644
--- a/NetworkManager-vpnc.spec
+++ b/NetworkManager-vpnc.spec
@@ -1,26 +1,26 @@
-%global snapshot %{nil}
+%global snapshot .20150903git65701cd
 
 Summary:   NetworkManager VPN plugin for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
-Version:   1.0.6
-Release:   3%{snapshot}%{?dist}
+Version:   1.2.0
+Release:   0.1%{?snapshot}%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
 Group:     System Environment/Base
-Source0:   https://download.gnome.org/sources/NetworkManager-vpnc/1.0/%{name}-%{version}%{snapshot}.tar.xz
+Source0:   https://download.gnome.org/sources/NetworkManager-vpnc/1.2/%{name}-%{version}.tar.xz
 
 BuildRequires: gtk3-devel
-BuildRequires: dbus-devel
 BuildRequires: NetworkManager-devel
-BuildRequires: NetworkManager-glib-devel >= 1:0.9.9.0
+BuildRequires: NetworkManager-glib-devel >= 1:1.1.0
 BuildRequires: intltool gettext
-BuildRequires: libnm-gtk-devel >= 1.0.5
+BuildRequires: libnm-gtk-devel >= 0.9.9.0
+BuildRequires: libnma-devel >= 1.1.0
 BuildRequires: libsecret-devel
 
 Requires: gtk3
 Requires: dbus
-Requires: NetworkManager >= 1:0.9.9.0
+Requires: NetworkManager >= 1:1.1.0
 Requires: vpnc
 Requires: shared-mime-info
 Requires: gnome-keyring
@@ -38,7 +38,7 @@ the vpnc server with NetworkManager.
 Summary: NetworkManager VPN plugin for vpnc - GNOME files
 Group:   System Environment/Base
 
-Requires: NetworkManager-vpnc = %{epoch}:%{version}-%{release}
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: nm-connection-editor
 Obsoletes: NetworkManager-vpnc < 1:0.9.8.2-2
 
@@ -47,12 +47,15 @@ This package contains software for integrating VPN capabilities with
 the vpnc server with NetworkManager (GNOME files).
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations"
-%configure --enable-more-warnings=yes --with-gtkver=3 --with-tests=yes
+%configure \
+        --disable-static \
+        --enable-more-warnings=yes \
+        --with-tests=yes \
+        --with-dist-version=%{version}-%{release}
 make %{?_smp_mflags}
 
 %check
@@ -62,7 +65,6 @@ make check
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
-rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a
 
 %find_lang %{name}
 
@@ -82,23 +84,25 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
-
-%doc AUTHORS ChangeLog
-%{_libexecdir}/nm-vpnc-auth-dialog
 %{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf
-%{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
 %{_libexecdir}/nm-vpnc-service
 %{_libexecdir}/nm-vpnc-service-vpnc-helper
+%{_libexecdir}/nm-vpnc-auth-dialog
 %{_datadir}/applications/nm-vpnc-auth-dialog.desktop
-%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
+%{_prefix}/lib/NetworkManager/VPN/nm-vpnc-service.name
+%doc AUTHORS ChangeLog NEWS
+%license COPYING
 
 %files -n NetworkManager-vpnc-gnome
-%doc AUTHORS ChangeLog
 %{_libdir}/NetworkManager/lib*.so*
 %dir %{_datadir}/gnome-vpn-properties/vpnc
 %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.ui
+%{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
 
 %changelog
+* Tue Sep 01 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.2.0-1.20150901git65701cd
+- Update to 1.2 git snapshot with libnm-based properties plugin
+
 * Thu Aug 27 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.6-3
 - Update the BRs
 
@@ -108,7 +112,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 * Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-* Tue May 5 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.0.2-1
+* Tue May 5 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.2-1
 - Update to 1.0.2 release
 
 * Mon Dec 22 2014 Dan Williams <dcbw@redhat.com> - 1:1.0.0-1
diff --git a/sources b/sources
index 7ffb03e..67adc51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d6db51906c9c2765466fb765455ed11f  NetworkManager-vpnc-1.0.6.tar.xz
+358d9a9077a2cd3b4b643d75a7359a3e  NetworkManager-vpnc-1.2.0.tar.xz