dcbw pushed to NetworkManager-openvpn (epel7). "Update to NM-openvpn 1.0.0 to match RHEL 7.1 NM version"

Wed Apr 8 15:11:23 UTC 2015

>From b325c53b003d2167d6e215d4100206af1df8b054 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw at redhat.com>
Date: Wed, 8 Apr 2015 10:11:30 -0500
Subject: Update to NM-openvpn 1.0.0 to match RHEL 7.1 NM version

diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index d168563..88687d4 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -1,15 +1,22 @@
-%global snapshot %{nil}
+#global commit %{nil}
+#global snapshot %{nil}%{commit}
 
 Summary:   NetworkManager VPN plugin for OpenVPN
 Name:      NetworkManager-openvpn
 Epoch:     1
-Version:   0.9.8.2
-Release:   4%{snapshot}%{?dist}.1
+Version:   1.0.0
+Release:   3%{?snapshot}%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
 Group:     System Environment/Base
-Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}%{snapshot}.tar.bz2
-Patch1:    rh997255-fix-pkcs12-endless-loop.patch
+# git clone git://git.gnome.org/network-manager-openvpn
+# cd network-manager-openvpn
+# ./autogen.sh
+# make dist
+# mv NetworkManager-openvpn-0.9.9.0.tar.bz2 NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2
+Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz
+
+Patch0:    0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch
 
 BuildRequires: gtk3-devel
 BuildRequires: dbus-devel
@@ -17,14 +24,14 @@ BuildRequires: NetworkManager-devel
 BuildRequires: NetworkManager-glib-devel
 BuildRequires: glib2-devel
 BuildRequires: libtool intltool gettext
-BuildRequires: libgnome-keyring-devel
+BuildRequires: libnm-gtk-devel >= 0.9.9.0
+BuildRequires: libsecret-devel
 
 Requires: gtk3
 Requires: dbus
 Requires: NetworkManager
 Requires: openvpn
 Requires: shared-mime-info
-Requires: libgnome-keyring
 Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3
 
 %global _privatelibs libnm-openvpn-properties[.]so.*
@@ -40,7 +47,11 @@ Summary: NetworkManager VPN plugin for OpenVPN - GNOME files
 Group:   System Environment/Base
 
 Requires: NetworkManager-openvpn = %{epoch}:%{version}-%{release}
+%if 0%{?fedora} > 17
 Requires: nm-connection-editor
+%else
+Requires: NetworkManager-gnome
+%endif
 Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3
 
 %description -n NetworkManager-openvpn-gnome
@@ -49,14 +60,17 @@ the OpenVPN server with NetworkManager (GNOME files).
 
 %prep
 %setup -q -n %{name}-%{version}
-
-%patch1 -p1 -b .rh997255-fix-endless-loop
+%patch0 -p1
 
 %build
 if [ ! -f configure ]; then
   ./autogen.sh
 fi
-%configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes --with-gtkver=3
+%configure \
+        --disable-static \
+        --disable-dependency-tracking \
+        --enable-more-warnings=yes \
+        --with-gnome
 make %{?_smp_mflags}
 
 %check
@@ -84,8 +98,31 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui
 
 %changelog
-* Mon Feb 17 2014 Jon Ciesla <limburgher at gmail.com> - 1:0.9.8.2-4.1
-- Fix deps for gnome and epel7.
+* Wed Apr  8 2015 Dan Williams <dcbw at redhat.com> - 1:1.0.0-3
+- Default client renegotiation interval to zero (rh #969433)
+
+* Mon Feb 23 2015 Lubomir Rintel <lkundrak at v3.sk> - 1:1.0.0-2
+- Fix Source url
+
+* Mon Dec 22 2014 Dan Williams <dcbw at redhat.com> - 1:1.0.0-1
+- Update to 1.0
+
+* Tue Nov 11 2014 Lubomir Rintel <lkundrak at v3.sk> - 1:0.9.9.0-3.20141110git5afb8eb
+- Update to a later snapshot
+- Try to align with Fedora guidelines on snapshot versions
+
+* Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.9.9.0-3.git20140128
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Thu Jul 24 2014 Jiří Klimeš <jklimes at redhat.com> - 1:0.9.9.0-2
+- ui: correct selection of certificates in relation to p12/non-p12 files
+
+* Fri Jun 06 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.9.9.0-0.2.git20140128
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Jan 28 2014 Dan Williams <dcbw at redhat.com> - 1:0.9.9.0-0.1
+- core: add support for IPv6 inside tunnels (rh #1033868)
+- auth: add support for interactive mode
 
 * Tue Jan  7 2014 Jiří Klimeš <jklimes at redhat.com> - 1:0.9.8.2-4
 - properties: fix an endless loop when selecting PKCS12 file (rh #997255)
diff --git a/sources b/sources
index 5b60b42..8574823 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2073ef7ee98032dc777c7fbda7f8e2ad  NetworkManager-openvpn-0.9.8.2.tar.bz2
+1ed64b76a363dd1c7999eafcecef0e14  NetworkManager-openvpn-1.0.0.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/NetworkManager-openvpn.git/commit/?h=epel7&id=b325c53b003d2167d6e215d4100206af1df8b054
