packages: NetworkManager-pptp/NetworkManager-pptp.spec - use unversioned pp...

[glen]

Author: glen                         Date: Mon Apr  2 09:40:21 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use unversioned ppp plugins dir

---- Files affected:
packages/NetworkManager-pptp:
   NetworkManager-pptp.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/NetworkManager-pptp/NetworkManager-pptp.spec
diff -u packages/NetworkManager-pptp/NetworkManager-pptp.spec:1.14 packages/NetworkManager-pptp/NetworkManager-pptp.spec:1.15
--- packages/NetworkManager-pptp/NetworkManager-pptp.spec:1.14	Sat Mar 24 12:22:32 2012
+++ packages/NetworkManager-pptp/NetworkManager-pptp.spec	Mon Apr  2 11:40:16 2012
@@ -1,12 +1,9 @@
 # $Revision$, $Date$
-#
-%define		ppp_version	2.4.5
-#
 Summary:	NetworkManager VPN integration for PPTP
 Summary(pl.UTF-8):	Integracja NetworkManagera z protokołem PPTP
 Name:		NetworkManager-pptp
 Version:	0.9.4.0
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/%{name}-%{version}.tar.xz
@@ -23,12 +20,12 @@
 BuildRequires:	libgnome-keyring-devel
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-BuildRequires:	ppp-plugin-devel >= 3:%{ppp_version}
+BuildRequires:	ppp-plugin-devel >= 3:2.4.5
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires:	NetworkManager >= 2:0.9.4.0
 Requires:	dbus-glib >= 0.74
-Requires:	ppp = 3:%{ppp_version}
+Requires:	ppp
 Requires:	pptp
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -50,7 +47,7 @@
 %{__automake}
 %configure \
 	--disable-static \
-	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version}
+	--with-pppd-plugin-dir=%{_libdir}/pppd/plugins
 %{__make}
 
 %install
@@ -73,7 +70,7 @@
 %attr(755,root,root) %{_libdir}/NetworkManager/libnm-pptp-properties.so
 %attr(755,root,root) %{_libdir}/nm-pptp-auth-dialog
 %attr(755,root,root) %{_libdir}/nm-pptp-service
-%attr(755,root,root) %{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/nm-pptp-pppd-plugin.so
 %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-pptp-service.conf
 %{_datadir}/gnome-vpn-properties/pptp
@@ -84,6 +81,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2012/04/02 09:40:16  glen
+- use unversioned ppp plugins dir
+
 Revision 1.14  2012/03/24 11:22:32  megabajt
 - updated to 0.9.4.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/NetworkManager-pptp/NetworkManager-pptp.spec?r1=1.14&r2=1.15