[NetworkManager-pptp/f19] Update to 0.9.8.2 release; split GUI to separate package

Thu Jul 11 10:15:09 UTC 2013

commit e73446075a2fe77fecd19a94090734591f58a51d
Author: Jiří Klimeš <jklimes at redhat.com>
Date:   Wed Jul 10 16:15:59 2013 +0200

    Update to 0.9.8.2 release; split GUI to separate package
    
    and cleanup spec file (rh #950282)

 .gitignore               |    1 +
 NetworkManager-pptp.spec |  131 ++++++++++++++++++++++-----------------------
 sources                  |    2 +-
 3 files changed, 66 insertions(+), 68 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 54b8688..c6543f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ NetworkManager-pptp-0.8.git20100411.tar.bz2
 NetworkManager-pptp-0.8.1.tar.bz2
 /NetworkManager-pptp-0.9.3.995.git20120302.tar.bz2
 /NetworkManager-pptp-0.9.3.997.tar.bz2
+/NetworkManager-pptp-0.9.8.2.tar.bz2
diff --git a/NetworkManager-pptp.spec b/NetworkManager-pptp.spec
index ec0ad2d..ad802f9 100644
--- a/NetworkManager-pptp.spec
+++ b/NetworkManager-pptp.spec
@@ -1,106 +1,104 @@
-%define nm_version          1:0.9.2
-%define dbus_version        1.1
-%define gtk3_version        3.0
-%define ppp_version         2.4.5
-%define shared_mime_version 0.16-3
+%global snapshot %{nil}
+%global ppp_version %(rpm -q ppp --queryformat '%{VERSION}')
 
-%define snapshot %{nil}
-%define realversion 0.9.3.997
-
-Summary:   NetworkManager VPN plugin for pptp
+Summary:   NetworkManager VPN plugin for PPTP
 Name:      NetworkManager-pptp
 Epoch:     1
-Version:   0.9.3.997
-Release:   4%{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
-
-BuildRequires: gtk3-devel             >= %{gtk3_version}
-BuildRequires: dbus-devel             >= %{dbus_version}
-BuildRequires: dbus-glib-devel        >= 0.74
-BuildRequires: NetworkManager-devel   >= %{nm_version}
-BuildRequires: NetworkManager-glib-devel >= %{nm_version}
-%if 0%{?fedora} > 16
+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
+BuildRequires: ppp-devel
+BuildRequires: libtool intltool gettext
 BuildRequires: libgnome-keyring-devel
-%else
-BuildRequires: gnome-keyring-devel
-%endif
-BuildRequires: intltool gettext
-BuildRequires: ppp-devel = %{ppp_version}
 
-Requires: dbus             >= %{dbus_version}
-Requires: NetworkManager   >= %{nm_version}
-Requires: ppp              = %{ppp_version}
-Requires: shared-mime-info >= %{shared_mime_version}
+Requires: gtk3
+Requires: dbus
+Requires: NetworkManager
 Requires: pptp
+Requires: ppp
+Requires: shared-mime-info
 Requires: gnome-keyring
-Requires(post):   desktop-file-utils
-Requires(postun): desktop-file-utils
+Obsoletes: NetworkManager-pptp < 0.9.8.2-1
 
+%global _privatelibs libnm-pptp-properties[.]so.*
+%global __provides_exclude ^(%{_privatelibs})$
+%global __requires_exclude ^(%{_privatelibs})$
 
 %description
-This package contains software for integrating PPTP VPN support with
-the NetworkManager and the GNOME desktop.
+This package contains software for integrating VPN capabilities with
+the PPTP server with NetworkManager.
 
-%prep
-%setup -q -n NetworkManager-pptp-%{realversion}
+%package -n NetworkManager-pptp-gnome
+Summary: NetworkManager VPN plugin for PPTP - GNOME files
+Group:   System Environment/Base
+
+Requires: NetworkManager-pptp = %{epoch}:%{version}-%{release}
+%if 0%{?fedora} > 17
+Requires: nm-connection-editor
+%else
+Requires: NetworkManager-gnome
+%endif
+Obsoletes: NetworkManager-pptp < 0.9.8.2-1
+
+%description -n NetworkManager-pptp-gnome
+This package contains software for integrating VPN capabilities with
+the PPTP server with NetworkManager (GNOME files).
 
+%prep
+%setup -q -n %{name}-%{version}
 
 %build
+if [ ! -f configure ]; then
+  ./autogen.sh
+fi
 %configure \
 	--disable-static \
 	--enable-more-warnings=yes \
 	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version}
-
 make %{?_smp_mflags}
 
-%install
+%check
+make check
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%install
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.a
-
-rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.la
-rm -f %{buildroot}%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.a
+rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la
 
 %find_lang %{name}
 
-
-%post
-/usr/bin/update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-      %{_bindir}/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 %{_bindir}/gtk-update-icon-cache ]; then
-      %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
-
 %files -f %{name}.lang
-%defattr(-, root, root)
-
-%doc AUTHORS ChangeLog
-%{_libdir}/NetworkManager/lib*.so*
-%{_libexecdir}/nm-pptp-auth-dialog
+%doc COPYING AUTHORS README ChangeLog
 %{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf
 %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name
 %{_libexecdir}/nm-pptp-service
-%{_libdir}/pppd/2.*/nm-pptp-pppd-plugin.so
-#%{_datadir}/applications/nm-pptp.desktop
-#%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-pptp-settings.png
+%{_libexecdir}/nm-pptp-auth-dialog
+%{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.so
+
+%files -n NetworkManager-pptp-gnome
+%doc COPYING AUTHORS README ChangeLog
+%{_libdir}/NetworkManager/lib*.so*
 %dir %{_datadir}/gnome-vpn-properties/pptp
 %{_datadir}/gnome-vpn-properties/pptp/nm-pptp-dialog.ui
 
 %changelog
+* Thu Jul 11 2013 Jiří Klimeš <jklimes at redhat.com> - 1:0.9.8.2-1
+- Update to 0.9.8.2 release
+
+* Sun Apr 07 2013 Dan Fruehauf <malkodan at gmail.com> - 1:0.9.8.0-1
+- Refactored spec file
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.9.3.997-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -249,4 +247,3 @@ fi
 * Thu Nov 15 2007 Lubomir Kundrak <lkundrak at redhat.com> 0.7.0-0.1.svn3085
 - Initial packaging attempt, inspired by NetworkManager-openvpn
 - Nearly completly rewritten spec, all bugs in it are solely my responsibility
-
diff --git a/sources b/sources
index e1ae6fe..de38e2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c85a3f620046bc6a8e352cf79f5c1382  NetworkManager-pptp-0.9.3.997.tar.bz2
+b6750afdba77dc96fc496084ae9c6ea0  NetworkManager-pptp-0.9.8.2.tar.bz2
