new upstream 1.2.4 release and reorganize package split

- new 1.2.4 release of NetworkManager-libreswan

- no longer require nm-connection-editor. Requiring it in the
  core package was wrong anyway. But now, also let the gnome
  subpackage not require nm-connection-editor. After all, the
  gnome plugin and auth-helpers are also used by gnome-control-center
  and gnome-shell.

- let only gnome package require shared-mime-info

- Split the libnm VPN plugin and put the GTK-free part in the
  core package.

- move the auth-dialog to the gnome package. For one, it is
  mainly used by nm-applet. But also, it has a GTK dependency,
  which we don't want in the core package.
This commit is contained in:
Thomas Haller 2016-06-30 11:03:24 +02:00
parent 3858343aff
commit 9277c9aba1
3 changed files with 13 additions and 6 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ NetworkManager-openswan-0.8.tar.gz
/NetworkManager-libreswan-1.1.92.tar.xz
/NetworkManager-libreswan-1.1.93.tar.xz
/NetworkManager-libreswan-1.2.2.tar.xz
/NetworkManager-libreswan-1.2.4.tar.xz

View File

@ -3,7 +3,7 @@
Summary: NetworkManager VPN plug-in for IPsec VPN
Name: NetworkManager-libreswan
Version: 1.2.2
Version: 1.2.4
Release: 1%{?dist}
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@ -23,7 +23,6 @@ BuildRequires: intltool gettext
Requires: NetworkManager >= %{nm_version}
Requires: dbus
Requires: /usr/sbin/ipsec
Requires: shared-mime-info
Provides: NetworkManager-openswan = %{version}-%{release}
Obsoletes: NetworkManager-openswan < %{version}-%{release}
@ -41,7 +40,7 @@ Summary: NetworkManager VPN plugin for libreswan - GNOME files
Group: System Environment/Base
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: nm-connection-editor
Requires: shared-mime-info
Provides: NetworkManager-openswan-gnome = %{version}-%{release}
Obsoletes: NetworkManager-openswan-gnome < %{version}-%{release}
@ -73,7 +72,7 @@ update-desktop-database &> /dev/null || :
update-desktop-database &> /dev/null || :
%files -f %{name}.lang
%{_libexecdir}/nm-libreswan-auth-dialog
%{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan.so
%{_sysconfdir}/dbus-1/system.d/nm-libreswan-service.conf
%{_prefix}/lib/NetworkManager/VPN/nm-libreswan-service.name
%{_libexecdir}/nm-libreswan-service
@ -82,7 +81,9 @@ update-desktop-database &> /dev/null || :
%license COPYING
%files -n NetworkManager-libreswan-gnome
%{_libdir}/NetworkManager/lib*.so*
%{_libexecdir}/nm-libreswan-auth-dialog
%{_libdir}/NetworkManager/libnm-*-properties.so
%{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan-editor.so
%dir %{_datadir}/gnome-vpn-properties/libreswan
%{_datadir}/gnome-vpn-properties/libreswan/nm-libreswan-dialog.ui
%{_sysconfdir}/NetworkManager/VPN/nm-libreswan-service.name
@ -90,6 +91,11 @@ update-desktop-database &> /dev/null || :
%changelog
* Thu Jun 30 2016 Thomas Haller <thaller@redhat.com> - 1.2.4-1
- Update to 1.2.4 release
- Move base VPN plugin library to base libreswan package
- Don't require nm-connection-editor anymore
* Wed May 11 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.2.2-1
- Update to 1.2.2 release

View File

@ -1 +1 @@
086f2f8b299cef4569a901dd0405e9bb NetworkManager-libreswan-1.2.2.tar.xz
01248eb95a1e1d647057a45aed85a3af NetworkManager-libreswan-1.2.4.tar.xz