Renamed to NetworkManager-libreswan and updated to 1.2.2

- removed obsolete -symlink.patch

diff --git a/NetworkManager-libreswan.spec b/NetworkManager-libreswan.spec
new file mode 100644 (file)
index 0000000..160f716
--- /dev/null
+++ b/NetworkManager-libreswan.spec
@@ -0,0 +1,82 @@
+Summary:       NetworkManager VPN integration for libreswan
+Summary(pl.UTF-8):     Integracja NetworkManagera z libreswan
+Name:          NetworkManager-libreswan
+Version:       1.2.2
+Release:       1
+License:       GPL v2+
+Group:         X11/Applications
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-libreswan/1.2/%{name}-%{version}.tar.xz
+# Source0-md5: 086f2f8b299cef4569a901dd0405e9bb
+URL:           https://wiki.gnome.org/Projects/NetworkManager
+BuildRequires: NetworkManager-devel >= 2:1.2.0
+BuildRequires: NetworkManager-gtk-lib-devel >= 1.2.0
+BuildRequires: autoconf >= 2.52
+BuildRequires: automake
+BuildRequires: gettext-tools
+BuildRequires: glib2-devel >= 1:2.32
+BuildRequires: gtk+3-devel >= 3.4.0
+BuildRequires: intltool >= 0.35.0
+BuildRequires: libnl-devel >= 1: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:1.2.0
+Requires:      NetworkManager-gtk-lib >= 1.2.0
+Requires:      glib2 >= 1:2.32
+Requires:      gtk+3 >= 3.4.0
+Requires:      libnl >= 1:3.2.8
+Provides:      NetworkManager-openswan = %{version}-%{release}
+Obsoletes:     NetworkManager-openswan < 1.2.2
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+NetworkManager VPN integration for libreswan.
+
+%description -l pl.UTF-8
+Integracja NetworkManagera z libreswan.
+
+%prep
+%setup -q
+
+%build
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+       --disable-more-warnings \
+       --disable-static
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la
+
+%find_lang NetworkManager-libreswan
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f NetworkManager-libreswan.lang
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-libreswan-properties.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-vpn-plugin-libreswan.so
+%attr(755,root,root) %{_libdir}/nm-libreswan-auth-dialog
+%attr(755,root,root) %{_libdir}/nm-libreswan-service
+%attr(755,root,root) %{_libdir}/nm-libreswan-service-helper
+%{_libdir}/NetworkManager/VPN/nm-libreswan-service.name
+%{_sysconfdir}/NetworkManager/VPN/nm-libreswan-service.name
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-libreswan-service.conf
+%{_datadir}/appdata/network-manager-libreswan.metainfo.xml
+%dir %{_datadir}/gnome-vpn-properties/libreswan
+%{_datadir}/gnome-vpn-properties/libreswan/nm-libreswan-dialog.ui

diff --git a/NetworkManager-openswan-symlink.patch b/NetworkManager-openswan-symlink.patch
deleted file mode 100644 (file)
index eebbcac..0000000
--- a/NetworkManager-openswan-symlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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:

diff --git a/NetworkManager-openswan.spec b/NetworkManager-openswan.spec
deleted file mode 100644 (file)
index 82b950a..0000000
--- a/NetworkManager-openswan.spec
+++ /dev/null
@@ -1,83 +0,0 @@
-Summary:       NetworkManager VPN integration for openswan
-Summary(pl.UTF-8):     Integracja NetworkManagera z openswan
-Name:          NetworkManager-openswan
-Version:       1.0.8
-Release:       1
-License:       GPL v2+
-Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openswan/1.0/%{name}-%{version}.tar.xz
-# Source0-md5: 08f722970aa6a94cac2b038a83e36b87
-Patch0:                %{name}-symlink.patch
-URL:           https://wiki.gnome.org/Projects/NetworkManager
-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-tools
-BuildRequires: glib2-devel >= 1:2.32
-BuildRequires: gtk+3-devel >= 3.4.0
-BuildRequires: intltool >= 0.35.0
-BuildRequires: libnl-devel >= 1: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:1.0.0
-Requires:      NetworkManager-gtk-lib >= 1.0.0
-Requires:      dbus-glib >= 0.74
-Requires:      glib2 >= 1:2.32
-Requires:      gtk+3 >= 3.4.0
-Requires:      libnl >= 1:3.2.8
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%description
-NetworkManager VPN integration for openswan.
-
-%description -l pl.UTF-8
-Integracja NetworkManagera z openswan.
-
-%prep
-%setup -q
-%patch0 -p1
-
-%build
-%{__intltoolize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-       --disable-more-warnings \
-       --disable-static
-%{__make}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la
-
-%find_lang NetworkManager-openswan
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f NetworkManager-openswan.lang
-%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
-%{_sysconfdir}/NetworkManager/VPN/nm-openswan-service.name
-%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