From 4a42547926da64b60e8a711635321f4755aabe61 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Aug 24 2013 11:37:40 +0000
Subject: Merge remote-tracking branch 'origin/f19'


Sync with the F19 branch that was ahead of F20/rawhide.

---

diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec
index 9fb0b5b..a1ed26e 100644
--- a/NetworkManager-vpnc.spec
+++ b/NetworkManager-vpnc.spec
@@ -1,47 +1,56 @@
-%define nm_version          1:0.9.2
-%define dbus_version        1.1
-%define gtk3_version        3.0.1
-%define vpnc_version        0.5
-%define shared_mime_version 0.16-3
-
-%define snapshot %{nil}
-%define realversion 0.9.3.997
+%global snapshot %{nil}
 
 Summary:   NetworkManager VPN plugin for vpnc
 Name:      NetworkManager-vpnc
 Epoch:     1
-Version:   0.9.3.997
-Release:   5%{snapshot}%{?dist}
+Version:   0.9.8.2
+Release:   2%{snapshot}%{?dist}
 License:   GPLv2+
-Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
-Source:    %{name}-%{realversion}%{snapshot}.tar.bz2
+Group:     System Environment/Base
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}%{snapshot}.tar.xz
 
-BuildRequires: gtk3-devel             >= %{gtk3_version}
-BuildRequires: dbus-devel             >= %{dbus_version}
-BuildRequires: NetworkManager-devel   >= %{nm_version}
-BuildRequires: NetworkManager-glib-devel >= %{nm_version}
-%if 0%{?fedora} > 16
-BuildRequires: libgnome-keyring-devel
-%else
-BuildRequires: gnome-keyring-devel
-%endif
+BuildRequires: gtk3-devel
+BuildRequires: dbus-devel
+BuildRequires: NetworkManager-devel
+BuildRequires: NetworkManager-glib-devel
 BuildRequires: intltool gettext
+BuildRequires: libgnome-keyring-devel
 
-Requires: gtk3             >= %{gtk3_version}
-Requires: dbus             >= %{dbus_version}
-Requires: NetworkManager   >= %{nm_version}
-Requires: vpnc             >= %{vpnc_version}
-Requires: shared-mime-info >= %{shared_mime_version}
+Requires: gtk3
+Requires: dbus
+Requires: NetworkManager
+Requires: vpnc
+Requires: shared-mime-info
 Requires: gnome-keyring
+Obsoletes: NetworkManager-vpnc < 1:0.9.8.2-2
 
+%global _privatelibs libnm-vpnc-properties[.]so.*
+%global __provides_exclude ^(%{_privatelibs})$
+%global __requires_exclude ^(%{_privatelibs})$
 
 %description
-This package contains software for integrating the vpnc VPN software
-with NetworkManager and the GNOME desktop
+This package contains software for integrating VPN capabilities with
+the vpnc server with NetworkManager.
+
+%package -n NetworkManager-vpnc-gnome
+Summary: NetworkManager VPN plugin for vpnc - GNOME files
+Group:   System Environment/Base
+
+Requires: NetworkManager-vpnc = %{epoch}:%{version}-%{release}
+%if 0%{?fedora} > 17
+Requires: nm-connection-editor
+%else
+Requires: NetworkManager-gnome
+%endif
+Obsoletes: NetworkManager-vpnc < 1:0.9.8.2-2
+
+%description -n NetworkManager-vpnc-gnome
+This package contains software for integrating VPN capabilities with
+the vpnc server with NetworkManager (GNOME files).
 
 %prep
-%setup -q -n NetworkManager-vpnc-%{realversion}
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -53,8 +62,7 @@ make %{?_smp_mflags}
 make check
 
 %install
-
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a
@@ -77,26 +85,31 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
-%defattr(-, root, root)
 
 %doc AUTHORS ChangeLog
-%{_libdir}/NetworkManager/lib*.so*
 %{_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
-%{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.ui
 %{_datadir}/applications/nm-vpnc-auth-dialog.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
+
+%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
 
 %changelog
-* Fri Aug 02 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.9.3.997-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+* Fri Jul 26 2013 Jiří Klimeš <jklimes@redhat.com> - 1:0.9.8.2-2
+- Fixing Obsoletes to ensure NetworkManager-vpnc-gnome installs on update (rh #983632)
+
+* Fri Jun  7 2013 Dan Williams <dcbw@redhat.com> - 1:0.9.8.2-1
+- Update to 0.9.8.2 release
 
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.9.3.997-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Sat Apr 06 2013 Dan Fruehauf <malkodan@gmail.com> - 1:0.9.8.0-1
+- Refactored spec file
 
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.9.3.997-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index dca82bb..bd06f62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-42f9c002f037edd70a5dd99bb96249fd  NetworkManager-vpnc-0.9.3.997.tar.bz2
+abb26a6c3c8d6c1d91c78471aff86b3a  NetworkManager-vpnc-0.9.8.2.tar.xz