[NetworkManager-vpnc/f18] Update to 0.9.8.2; split UI to separate package
Daniel Williams
dcbw at fedoraproject.org
Fri Jun 7 22:14:26 UTC 2013
commit 6b3c01c033f0c98a14487b03ac261fb104f1e97d
Author: Dan Williams <dcbw at redhat.com>
Date: Fri Jun 7 17:15:03 2013 -0500
Update to 0.9.8.2; split UI to separate package
.gitignore | 1 +
NetworkManager-vpnc.spec | 84 +++++++++++++++++++++++++++------------------
sources | 2 +-
3 files changed, 52 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7df8a72..cb4d3a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ NetworkManager-vpnc-0.8.1.tar.bz2
/NetworkManager-vpnc-0.8.996.tar.bz2
/NetworkManager-vpnc-0.8.998.git20110405.tar.bz2
/NetworkManager-vpnc-0.8.999.tar.bz2
+/NetworkManager-vpnc-0.9.8.2.tar.xz
diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec
index f288434..bec47c4 100644
--- a/NetworkManager-vpnc.spec
+++ b/NetworkManager-vpnc.spec
@@ -1,47 +1,56 @@
-%define nm_version 1:0.9.2
-%define dbus_version 1.1
-%define gtk3_version 3.0.1
-%define vpnc_version 0.5
-%define shared_mime_version 0.16-3
-
-%define snapshot %{nil}
-%define realversion 0.9.3.997
+%global snapshot %{nil}
Summary: NetworkManager VPN plugin for vpnc
Name: NetworkManager-vpnc
Epoch: 1
-Version: 0.9.3.997
-Release: 3%{snapshot}%{?dist}
+Version: 0.9.8.2
+Release: 1%{snapshot}%{?dist}
License: GPLv2+
-Group: System Environment/Base
URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{realversion}%{snapshot}.tar.bz2
+Group: System Environment/Base
+Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.9/%{name}-%{version}%{snapshot}.tar.xz
-BuildRequires: gtk3-devel >= %{gtk3_version}
-BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: NetworkManager-devel >= %{nm_version}
-BuildRequires: NetworkManager-glib-devel >= %{nm_version}
-%if 0%{?fedora} > 16
-BuildRequires: libgnome-keyring-devel
-%else
-BuildRequires: gnome-keyring-devel
-%endif
+BuildRequires: gtk3-devel
+BuildRequires: dbus-devel
+BuildRequires: NetworkManager-devel
+BuildRequires: NetworkManager-glib-devel
BuildRequires: intltool gettext
+BuildRequires: libgnome-keyring-devel
-Requires: gtk3 >= %{gtk3_version}
-Requires: dbus >= %{dbus_version}
-Requires: NetworkManager >= %{nm_version}
-Requires: vpnc >= %{vpnc_version}
-Requires: shared-mime-info >= %{shared_mime_version}
+Requires: gtk3
+Requires: dbus
+Requires: NetworkManager
+Requires: vpnc
+Requires: shared-mime-info
Requires: gnome-keyring
+Obsoletes: NetworkManager-vpnc < 0.9.8.2-1
+%global _privatelibs libnm-vpnc-properties[.]so.*
+%global __provides_exclude ^(%{_privatelibs})$
+%global __requires_exclude ^(%{_privatelibs})$
%description
-This package contains software for integrating the vpnc VPN software
-with NetworkManager and the GNOME desktop
+This package contains software for integrating VPN capabilities with
+the vpnc server with NetworkManager.
+
+%package -n NetworkManager-vpnc-gnome
+Summary: NetworkManager VPN plugin for vpnc - GNOME files
+Group: System Environment/Base
+
+Requires: NetworkManager-vpnc = %{epoch}:%{version}-%{release}
+%if 0%{?fedora} > 17
+Requires: nm-connection-editor
+%else
+Requires: NetworkManager-gnome
+%endif
+Obsoletes: NetworkManager-vpnc < 0.9.8.2-1
+
+%description -n NetworkManager-vpnc-gnome
+This package contains software for integrating VPN capabilities with
+the vpnc server with NetworkManager (GNOME files).
%prep
-%setup -q -n NetworkManager-vpnc-%{realversion}
+%setup -q -n %{name}-%{version}
%build
@@ -53,8 +62,7 @@ make %{?_smp_mflags}
make check
%install
-
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a
@@ -77,21 +85,29 @@ fi
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
-%defattr(-, root, root)
%doc AUTHORS ChangeLog
-%{_libdir}/NetworkManager/lib*.so*
%{_libexecdir}/nm-vpnc-auth-dialog
%{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf
%{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
%{_libexecdir}/nm-vpnc-service
%{_libexecdir}/nm-vpnc-service-vpnc-helper
-%{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.ui
%{_datadir}/applications/nm-vpnc-auth-dialog.desktop
%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
+
+%files -n NetworkManager-vpnc-gnome
+%doc AUTHORS ChangeLog
+%{_libdir}/NetworkManager/lib*.so*
%dir %{_datadir}/gnome-vpn-properties/vpnc
+%{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.ui
%changelog
+* Fri Jun 7 2013 Dan Williams <dcbw at redhat.com> - 1:0.9.8.2-1
+- Update to 0.9.8.2 release
+
+* Sat Apr 06 2013 Dan Fruehauf <malkodan at gmail.com> - 1:0.9.8.0-1
+- Refactored spec file
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.9.3.997-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index dca82bb..bd06f62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-42f9c002f037edd70a5dd99bb96249fd NetworkManager-vpnc-0.9.3.997.tar.bz2
+abb26a6c3c8d6c1d91c78471aff86b3a NetworkManager-vpnc-0.9.8.2.tar.xz
More information about the scm-commits
mailing list