From 651334f33d79dccc6695bddbdd6aae96e3d8446e Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Feb 23 2015 10:02:37 +0000 Subject: Fix build --- diff --git a/0001-build-allow-building-against-network-manager-applet-.patch b/0001-build-allow-building-against-network-manager-applet-.patch new file mode 100644 index 0000000..7858965 --- /dev/null +++ b/0001-build-allow-building-against-network-manager-applet-.patch @@ -0,0 +1,29 @@ +From 0fb965fab82241b41febd2492be40fa5e2c53eae Mon Sep 17 00:00:00 2001 +From: Lubomir Rintel +Date: Mon, 23 Feb 2015 10:51:53 +0100 +Subject: [PATCH] build: allow building against network-manager-applet 0.9.9.0 + +Rebase to 1.0.0 tarball pulls in 1f14047 (release: bump version to 0.995 +(1.0-rc1)), but nothing that's 0.9.10 specific at all. + +We still ship that one. +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0a69758..770af17 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -81,7 +81,7 @@ if test x"$with_gnome" != xno; then + AC_SUBST(GTK_LIBS) + GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_4" + +- PKG_CHECK_MODULES(NMGTK, libnm-gtk >= 0.9.10) ++ PKG_CHECK_MODULES(NMGTK, libnm-gtk >= 0.9.9.0) + AC_SUBST(NMGTK_CFLAGS) + AC_SUBST(NMGTK_LIBS) + +-- +2.1.0 + diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index af55df7..1c45792 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -10,6 +10,7 @@ License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz +Patch0: 0001-build-allow-building-against-network-manager-applet-.patch BuildRequires: gtk3-devel BuildRequires: dbus-devel @@ -20,6 +21,7 @@ BuildRequires: libtool intltool gettext BuildRequires: libgnome-keyring-devel BuildRequires: libnm-gtk-devel >= 0.9.9.0 BuildRequires: libsecret-devel +BuildRequires: autoconf Requires: gtk3 Requires: dbus @@ -55,8 +57,10 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build +autoconf if [ ! -f configure ]; then ./autogen.sh fi