From 11cf02afd623d2597c0c80159a815dcc2ef816e78eb7ec02db3c3ab12a168ab4 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 29 Sep 2011 08:25:39 +0000 Subject: [PATCH] Accepting request 85392 from home:vuntz:branches:GNOME:Factory Move to pkgconfig() BuildRequires OBS-URL: https://build.opensuse.org/request/show/85392 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/NetworkManager-strongswan?expand=0&rev=4 --- NetworkManager-strongswan.changes | 11 +++++++++++ NetworkManager-strongswan.spec | 17 ++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/NetworkManager-strongswan.changes b/NetworkManager-strongswan.changes index 1f08b0a..5a4a749 100644 --- a/NetworkManager-strongswan.changes +++ b/NetworkManager-strongswan.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Sep 29 08:22:12 UTC 2011 - vuntz@opensuse.org + +- Move to pkgconfig()-style BuildRequires: + + Old ones: NetworkManager-devel, libglade2-devel, + libgnomeui-devel, libgudev-1_0-devel. + + New ones: NetworkManager, dbus-glib-1, gnome-keyring-1, + gtk+-2.0, libgnomeui-2.0, libnm-glib,libnm-glib-vpn, + libnm-util. +- Remove unneeded update-desktop-files BuildRequires. + ------------------------------------------------------------------- Wed Sep 28 15:33:35 CEST 2011 - dimstar@opensuse.org diff --git a/NetworkManager-strongswan.spec b/NetworkManager-strongswan.spec index cbc3bc1..68d4095 100644 --- a/NetworkManager-strongswan.spec +++ b/NetworkManager-strongswan.spec @@ -28,12 +28,15 @@ Source0: http://download.strongswan.org/NetworkManager/%{name}-%{version} Source1: README # PATCH-FIX-UPSTREAM nm-strongswan-service-conf.patch binli@opensuse.org -- Dismiss the rpmlint warning for 'send_interface' Patch0: nm-strongswan-service-conf.patch -BuildRequires: NetworkManager-devel >= 0.9.0 BuildRequires: intltool -BuildRequires: libglade2-devel -BuildRequires: libgnomeui-devel -BuildRequires: libgudev-1_0-devel -BuildRequires: update-desktop-files +BuildRequires: pkgconfig(NetworkManager) >= 0.9.0 +BuildRequires: pkgconfig(dbus-glib-1) >= 0.30 +BuildRequires: pkgconfig(gnome-keyring-1) +BuildRequires: pkgconfig(gtk+-2.0) >= 2.6 +BuildRequires: pkgconfig(libgnomeui-2.0) +BuildRequires: pkgconfig(libnm-glib) +BuildRequires: pkgconfig(libnm-glib-vpn) +BuildRequires: pkgconfig(libnm-util) Requires: %{name}-frontend Requires: NetworkManager >= 0.9.0 Requires: strongswan >= 4.1.13 @@ -70,7 +73,7 @@ cp %{SOURCE1} README.SUSE %install %makeinstall -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} find %{buildroot}%{_libdir} -name '*.la' -delete -print %clean @@ -87,7 +90,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_libdir}/NetworkManager/libnm-strongswan-properties.so %{_libexecdir}/nm-strongswan-auth-dialog -%{_datadir}/gnome-vpn-properties +%{_datadir}/gnome-vpn-properties/ %files lang -f %{name}.lang