commit 8c7de524f396d5b7adefb46e2a5dadc564a6008d
Author: Marcin Banasiak <[email protected]>
Date: Sun Dec 21 17:34:46 2014 +0100
Update to 1.0.0
- added -symlink.patch to fix symlink pointing to build root
NetworkManager-openswan-symlink.patch | 11 +++++++++++
NetworkManager-openswan.spec | 23 ++++++++++++++++-------
2 files changed, 27 insertions(+), 7 deletions(-)
---
diff --git a/NetworkManager-openswan.spec b/NetworkManager-openswan.spec
index 388a159..98f1385 100644
--- a/NetworkManager-openswan.spec
+++ b/NetworkManager-openswan.spec
@@ -1,29 +1,34 @@
Summary: NetworkManager VPN integration for openswan
Summary(pl.UTF-8): Integracja NetworkManagera z openswan
Name: NetworkManager-openswan
-Version: 0.9.8.4
+Version: 1.0.0
Release: 1
License: GPL v2+
Group: X11/Applications
-Source0:
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openswan/0.9/%{name}-%{version}.tar.xz
-# Source0-md5: 6cb2b64bc79c4174856613d077667b66
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openswan/1.0/%{name}-%{version}.tar.xz
+# Source0-md5: 2294c870a370e61ba1fa58149d89aa4c
+Patch0: %{name}-symlink.patch
URL: http://projects.gnome.org/NetworkManager/
BuildRequires: GConf2-devel >= 2.0
-BuildRequires: NetworkManager-devel >= 2:0.9.8.4
+BuildRequires: NetworkManager-devel >= 2:1.0.0
+BuildRequires: NetworkManager-gtk-lib-devel >= 1.0.0
BuildRequires: autoconf >= 2.52
BuildRequires: automake
BuildRequires: dbus-glib-devel >= 0.74
BuildRequires: gettext-devel
-BuildRequires: gtk+3-devel >= 3.0.0
+BuildRequires: glib2-devel >= 2.32.0
+BuildRequires: gtk+3-devel >= 3.4.0
BuildRequires: intltool >= 0.35.0
-BuildRequires: libgnome-keyring-devel
+BuildRequires: libnl-devel >= 3.2.8
+BuildRequires: libsecret-devel
BuildRequires: libtool
BuildRequires: libxml2-devel >= 2.0
BuildRequires: pkgconfig
BuildRequires: tar >= 1:1.22
BuildRequires: xz
-Requires: NetworkManager >= 2:0.9.8.4
+Requires: NetworkManager >= 2:1.0.0
Requires: dbus-glib >= 0.74
+Requires: gtk+3 >= 3.4.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -34,6 +39,7 @@ Integracja NetworkManagera z openswan.
%prep
%setup -q
+%patch0 -p1
%build
%{__intltoolize}
@@ -43,6 +49,7 @@ Integracja NetworkManagera z openswan.
%{__autoheader}
%{__automake}
%configure \
+ --disable-more-warnings \
--disable-static
%{__make}
@@ -63,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog
%attr(755,root,root) %{_libdir}/NetworkManager/libnm-openswan-properties.so
+%attr(755,root,root) %{_libdir}/nm-libreswan-service-helper
%attr(755,root,root) %{_libdir}/nm-openswan-auth-dialog
%attr(755,root,root) %{_libdir}/nm-openswan-service
%attr(755,root,root) %{_libdir}/nm-openswan-service-helper
@@ -70,3 +78,4 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %verify(not md5 mtime size)
/etc/dbus-1/system.d/nm-openswan-service.conf
%dir %{_datadir}/gnome-vpn-properties/openswan
%{_datadir}/gnome-vpn-properties/openswan/nm-openswan-dialog.ui
+%{_desktopdir}/nm-openswan-auth-dialog.desktop
diff --git a/NetworkManager-openswan-symlink.patch
b/NetworkManager-openswan-symlink.patch
new file mode 100644
index 0000000..eebbcac
--- /dev/null
+++ b/NetworkManager-openswan-symlink.patch
@@ -0,0 +1,11 @@
+--- NetworkManager-openswan-1.0.0/src/Makefile.am.orig 2014-12-21
17:29:43.804895083 +0100
++++ NetworkManager-openswan-1.0.0/src/Makefile.am 2014-12-21
17:29:51.711518916 +0100
+@@ -36,7 +36,7 @@ nm_openswan_service_helper_LDADD = \
+ $(LIBNL_LIBS)
+
+ install-exec-hook:
+- $(LN_S) -f $(DESTDIR)$(libexecdir)/nm-openswan-service-helper \
++ $(LN_S) -f nm-openswan-service-helper \
+ $(DESTDIR)$(libexecdir)/nm-libreswan-service-helper
+
+ uninstall-hook:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/NetworkManager-openswan.git/commitdiff/8c7de524f396d5b7adefb46e2a5dadc564a6008d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
