packages: NetworkManager-pptp/NetworkManager-pptp.spec - install pppd plugi...

[megabajt]

Author: megabajt                     Date: Sat May 29 10:27:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install pppd plugin to proper directory
- release 2

---- Files affected:
packages/NetworkManager-pptp:
   NetworkManager-pptp.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/NetworkManager-pptp/NetworkManager-pptp.spec
diff -u packages/NetworkManager-pptp/NetworkManager-pptp.spec:1.4 packages/NetworkManager-pptp/NetworkManager-pptp.spec:1.5
--- packages/NetworkManager-pptp/NetworkManager-pptp.spec:1.4	Sat Feb 20 18:14:33 2010
+++ packages/NetworkManager-pptp/NetworkManager-pptp.spec	Sat May 29 12:27:08 2010
@@ -1,9 +1,12 @@
 # $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.8
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.8/%{name}-%{version}.tar.bz2
@@ -21,9 +24,9 @@
 BuildRequires:	libglade2-devel >= 2.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-BuildRequires:	ppp-plugin-devel
+BuildRequires:	ppp-plugin-devel >= 3:%{ppp_version}
 Requires:	NetworkManager >= 0.8
-Requires:	ppp
+Requires:	ppp = 3:%{ppp_version}
 Requires:	pptp
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,7 +46,8 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version}
 %{__make}
 
 %install
@@ -53,7 +57,7 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.{a,la}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.{a,la}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pppd/*.*.*/*.{a,la}
 
 %find_lang %{name}
 
@@ -66,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/2.4.4/nm-pptp-pppd-plugin.so
+%attr(755,root,root) %{_libdir}/pppd/%{ppp_version}/nm-pptp-pppd-plugin.so
 %{_sysconfdir}/NetworkManager/VPN/nm-pptp-service.name
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/nm-pptp-service.conf
 %{_datadir}/gnome-vpn-properties/pptp
@@ -77,6 +81,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/05/29 10:27:08  megabajt
+- install pppd plugin to proper directory
+- release 2
+
 Revision 1.4  2010/02/20 17:14:33  megabajt
 - updated to 0.8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager-pptp/NetworkManager-pptp.spec?r1=1.4&r2=1.5&f=u