packages: NetworkManager/NetworkManager.spec - use unversioned ppp plugins dir

[glen]

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

---- Files affected:
packages/NetworkManager:
   NetworkManager.spec (1.108 -> 1.109) 

---- Diffs:

================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.108 packages/NetworkManager/NetworkManager.spec:1.109
--- packages/NetworkManager/NetworkManager.spec:1.108	Sun Apr  1 14:17:53 2012
+++ packages/NetworkManager/NetworkManager.spec	Mon Apr  2 11:39:17 2012
@@ -3,14 +3,12 @@
 # Conditional build
 %bcond_without	systemd # use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
 %bcond_with	wimax	# enable wimax support
-#
-%define		ppp_version	2.4.5
 
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
 Version:	0.9.4.0
-Release:	2
+Release:	3
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Admin
@@ -42,7 +40,7 @@
 BuildRequires:	nss-devel >= 3.11
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel >= 0.97
-BuildRequires:	ppp-plugin-devel >= 3:%{ppp_version}
+BuildRequires:	ppp-plugin-devel >= 3:2.4.5
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.629
 BuildRequires:	sed >= 4.0
@@ -158,7 +156,7 @@
 	--with-system-ca-path=/etc/certs \
 	--with-systemdsystemunitdir=%{systemdunitdir} \
 	--with-session-tracking=%{?with_systemd:systemd}%{!?with_systemd:ck} \
-	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
+	--with-pppd-plugin-dir=%{_libdir}/pppd/plugins \
 	--with-dist-version=%{version}-%{release} \
 	--with-docs \
 	%{__enable_disable wimax} \
@@ -184,7 +182,7 @@
 # Cleanup
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.{a,la}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/%{ppp_version}/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.{a,la}
 
 %find_lang %{name}
 
@@ -240,7 +238,7 @@
 %attr(755,root,root) %{_libexecdir}/nm-dhcp-client.action
 %attr(755,root,root) %{_libexecdir}/nm-dispatcher.action
 %attr(755,root,root) %{_libexecdir}/nm-crash-logger
-%attr(755,root,root) %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
+%attr(755,root,root) %{_libdir}/pppd/plugins/nm-pppd-plugin.so
 %attr(754,root,root) /etc/rc.d/init.d/NetworkManager
 %config(noreplace) %verify(not md5 mtime size) /etc/init/NetworkManager.conf
 %{systemdunitdir}/NetworkManager.service
@@ -313,6 +311,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.109  2012/04/02 09:39:17  glen
+- use unversioned ppp plugins dir
+
 Revision 1.108  2012/04/01 12:17:53  glen
 - do not bcond patch sources
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/NetworkManager/NetworkManager.spec?r1=1.108&r2=1.109