X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=NetworkManager-openvpn.spec;h=09a486c6e99d15b6e2f53cd0aa4b49b04d92126f;hb=d10ea6e2d1ba38ecccad32ad3c3a986363ddd53c;hp=25edc261d45a214cb6b57f03cd15f5c7484238e4;hpb=0c5bb9184f8e1d68d9e9e8e9f37a33c35cd23d9d;p=packages%2FNetworkManager-openvpn.git

diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index 25edc26..09a486c 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -1,29 +1,38 @@
-# TODO
-# - uses openvpn user/group, but pld does not have any
-#   see NetworkManager-openvpn-0.8/properties/import-export.c
-#   add in openvpn.spec? switch to nobody/nobody?
 Summary:	NetworkManager VPN integration for OpenVPN
 Summary(pl.UTF-8):	Integracja NetworkManagera z OpenVPN-em
 Name:		NetworkManager-openvpn
-Version:	0.8.998
+Version:	1.2.8
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	6e27f02b993506c96a669141d63667fd
-URL:		http://projects.gnome.org/NetworkManager/
-BuildRequires:	GConf2-devel >= 2.0
-BuildRequires:	NetworkManager-devel >= 0.8.988
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.2/%{name}-%{version}.tar.xz
+# Source0-md5:	9f325be386aa906ff9b0b7c0bdf2a59a
+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 >= 1:1.9
-BuildRequires:	dbus-glib-devel >= 0.74
-BuildRequires:	gettext-devel
-BuildRequires:	gtk+3-devel >= 3.0.0
+BuildRequires:	gettext-tools
+BuildRequires:	glib2-devel >= 1:2.32
+BuildRequires:	gtk+3-devel >= 3.4
 BuildRequires:	intltool >= 0.36.2
-BuildRequires:	libgnome-keyring-devel
+BuildRequires:	libsecret-devel >= 0.18
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-Requires:	NetworkManager >= 0.8.988
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Provides:	group(nm-openvpn)
+Provides:	user(nm-openvpn)
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires:	NetworkManager >= 2:1.2.0
+Requires:	NetworkManager-gtk-lib >= 1.2.0
+Requires:	glib2 >= 1:2.32
+Requires:	gtk+3 >= 3.4
+Requires:	libsecret >= 0.18
 Requires:	openvpn
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,7 +52,8 @@ Integracja NetworkManagera z OpenVPN-em.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--disable-static
 %{__make}
 
 %install
@@ -52,19 +62,34 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la
 
 %find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+%groupadd -g 324 -r -f nm-openvpn
+%useradd -u 324 -s /bin/false -c "Default user for running openvpn spawned by NetworkManager" -g nm-openvpn nm-openvpn
+
+%postun
+if [ "$1" = "0" ]; then
+	%userremove nm-openvpn
+	%groupremove nm-openvpn
+fi
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
+%doc AUTHORS ChangeLog README
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn.so
+%attr(755,root,root) %{_libdir}/NetworkManager/libnm-vpn-plugin-openvpn-editor.so
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-openvpn-properties.so
 %attr(755,root,root) %{_libdir}/nm-openvpn-auth-dialog
 %attr(755,root,root) %{_libdir}/nm-openvpn-service
 %attr(755,root,root) %{_libdir}/nm-openvpn-service-openvpn-helper
+%{_prefix}/lib/NetworkManager/VPN/nm-openvpn-service.name
 %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf
+%{_datadir}/appdata/network-manager-openvpn.metainfo.xml
 %{_datadir}/gnome-vpn-properties/openvpn