diff --git a/.gitignore b/.gitignore index aebd861..f563bff 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ NetworkManager-openvpn-0.8.0.997.git20100609.tar.bz2 NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-0.9.3.995.git20120302.tar.bz2 /NetworkManager-openvpn-0.9.3.997.tar.bz2 +/NetworkManager-openvpn-0.9.8.2.tar.bz2 diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 3029982..cb15175 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -1,48 +1,57 @@ -%define nm_version 1:0.9.2 -%define dbus_version 1.1 -%define gtk2_version 3.0.1 -%define openvpn_version 2.1 -%define shared_mime_version 0.16-3 - -%define snapshot %{nil} -%define realversion 0.9.6.0 - -Summary: NetworkManager VPN plugin for OpenVPN -Name: NetworkManager-openvpn -Epoch: 1 -Version: 0.9.6.0 -Release: 3%{snapshot}%{?dist} -License: GPLv2+ -URL: http://www.gnome.org/projects/NetworkManager/ -Group: System Environment/Base -Source: %{name}-%{realversion}%{snapshot}.tar.xz - -BuildRequires: gtk3-devel >= %{gtk2_version} -BuildRequires: dbus-devel >= %{dbus_version} -BuildRequires: NetworkManager-devel >= %{nm_version} -BuildRequires: NetworkManager-glib-devel >= %{nm_version} +%global snapshot %{nil} + +Summary: NetworkManager VPN plugin for OpenVPN +Name: NetworkManager-openvpn +Epoch: 1 +Version: 0.9.8.2 +Release: 3%{snapshot}%{?dist} +License: GPLv2+ +URL: http://www.gnome.org/projects/NetworkManager/ +Group: System Environment/Base +Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}%{snapshot}.tar.bz2 + +BuildRequires: gtk3-devel +BuildRequires: dbus-devel +BuildRequires: NetworkManager-devel +BuildRequires: NetworkManager-glib-devel BuildRequires: glib2-devel -%if 0%{?fedora} > 16 +BuildRequires: libtool intltool gettext BuildRequires: libgnome-keyring-devel + +Requires: gtk3 +Requires: dbus +Requires: NetworkManager +Requires: openvpn +Requires: shared-mime-info +Requires: libgnome-keyring +Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 + +%global _privatelibs libnm-openvpn-properties[.]so.* +%global __provides_exclude ^(%{_privatelibs})$ +%global __requires_exclude ^(%{_privatelibs})$ + +%description +This package contains software for integrating VPN capabilities with +the OpenVPN server with NetworkManager. + +%package -n NetworkManager-openvpn-gnome +Summary: NetworkManager VPN plugin for OpenVPN - GNOME files +Group: System Environment/Base + +Requires: NetworkManager-openvpn = %{epoch}:%{version}-%{release} +%if 0%{?fedora} > 17 +Requires: nm-connection-editor %else -BuildRequires: gnome-keyring-devel +Requires: NetworkManager-gnome %endif -BuildRequires: libtool intltool gettext -Requires(post): %{_bindir}/update-desktop-database -Requires(postun): %{_bindir}/update-desktop-database -Requires: gtk3 >= %{gtk2_version} -Requires: dbus >= %{dbus_version} -Requires: NetworkManager >= %{nm_version} -Requires: openvpn >= %{openvpn_version} -Requires: shared-mime-info >= %{shared_mime_version} -Requires: gnome-keyring +Obsoletes: NetworkManager-openvpn < 1:0.9.8.2-3 -%description -This package contains software for integrating the OpenVPN VPN software -with NetworkManager and the GNOME desktop. +%description -n NetworkManager-openvpn-gnome +This package contains software for integrating VPN capabilities with +the OpenVPN server with NetworkManager (GNOME files). %prep -%setup -q -n %{name}-%{realversion} +%setup -q -n %{name}-%{version} %build if [ ! -f configure ]; then @@ -51,6 +60,9 @@ fi %configure --disable-static --disable-dependency-tracking --enable-more-warnings=yes --with-gtkver=3 make %{?_smp_mflags} +%check +make check + %install make install DESTDIR=%{buildroot} INSTALL="%{__install} -p" @@ -58,36 +70,32 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %find_lang %{name} -%post -/usr/bin/update-desktop-database > /dev/null -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%postun -/usr/bin/update-desktop-database > /dev/null -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ]; then - /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - %files -f %{name}.lang -%defattr(-, root, root) - -%doc AUTHORS ChangeLog README -%{_libdir}/NetworkManager/lib*.so* -%{_libexecdir}/nm-openvpn-auth-dialog +%doc COPYING AUTHORS README ChangeLog %{_sysconfdir}/dbus-1/system.d/nm-openvpn-service.conf %{_sysconfdir}/NetworkManager/VPN/nm-openvpn-service.name %{_libexecdir}/nm-openvpn-service +%{_libexecdir}/nm-openvpn-auth-dialog %{_libexecdir}/nm-openvpn-service-openvpn-helper -%{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui + +%files -n NetworkManager-openvpn-gnome +%doc COPYING AUTHORS README ChangeLog +%{_libdir}/NetworkManager/lib*.so* %dir %{_datadir}/gnome-vpn-properties/openvpn +%{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui %changelog -* Fri Aug 02 2013 Fedora Release Engineering - 1:0.9.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild +* Fri Jul 26 2013 Jiří Klimeš - 1:0.9.8.2-3 +- Fixing Obsoletes to ensure NetworkManager-openvpn-gnome installs on update (rh #988131) + +* Wed Jul 17 2013 Stef Walter - 1:0.9.8.2-2 +- Depend on libgnome-keyring (the client library), not gnome-keyring (daemon) (rh #811931) + +* Tue Jul 16 2013 Jiří Klimeš - 1:0.9.8.2-1 +- Update to 0.9.8.2 release + +* Sat Apr 06 2013 Dan Fruehauf - 1:0.9.8.0-1 +- Refactored spec file * Wed Feb 13 2013 Fedora Release Engineering - 1:0.9.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 0a7abc9..5b60b42 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4c11aae895f5967d36f3dc7a24046b2 NetworkManager-openvpn-0.9.6.0.tar.xz +2073ef7ee98032dc777c7fbda7f8e2ad NetworkManager-openvpn-0.9.8.2.tar.bz2