packages: NetworkManager/NetworkManager.spec, ModemManager/ModemManager.spe...

[megabajt]

Author: megabajt                     Date: Fri May 28 19:37:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install pppd plugin to proper directory
- release 3

---- Files affected:
packages/NetworkManager:
   NetworkManager.spec (1.65 -> 1.66) 
packages/ModemManager:
   ModemManager.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/NetworkManager/NetworkManager.spec
diff -u packages/NetworkManager/NetworkManager.spec:1.65 packages/NetworkManager/NetworkManager.spec:1.66
--- packages/NetworkManager/NetworkManager.spec:1.65	Mon Apr 26 13:55:52 2010
+++ packages/NetworkManager/NetworkManager.spec	Fri May 28 21:37:53 2010
@@ -1,9 +1,12 @@
 # $Revision$, $Date$
+#
+%define		ppp_version	2.4.5
+#
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
 Version:	0.8
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Networking/Admin
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.8/%{name}-%{version}.tar.bz2
@@ -26,7 +29,7 @@
 BuildRequires:	nss-devel >= 3.11
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel
-BuildRequires:	ppp-plugin-devel >= 3:2.4.4-2
+BuildRequires:	ppp-plugin-devel >= 3:%{ppp_version}
 BuildRequires:	rpmbuild(macros) >= 1.450
 BuildRequires:	sed >= 4.0
 BuildRequires:	udev-devel
@@ -116,7 +119,8 @@
 	--with-distro=pld \
 	--with-dhcp-client=/sbin/dhclient \
 	--with-iptables=/usr/sbin/iptables \
-	--with-system-ca-path=/etc/certs
+	--with-system-ca-path=/etc/certs \
+	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version}
 
 %{__make}
 
@@ -131,7 +135,7 @@
 
 # Cleanup
 rm -f $RPM_BUILD_ROOT%{_libexecdir}/*.{a,la}
-rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.{a,la}
+rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/*.*.*/*.{a,la}
 
 %find_lang %{name}
 
@@ -162,7 +166,7 @@
 %attr(755,root,root) %{_sbindir}/NetworkManager
 %dir %{_libdir}/NetworkManager
 %attr(755,root,root) %{_libexecdir}/nm-crash-logger
-%attr(755,root,root) %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
+%attr(755,root,root) %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
 %attr(755,root,root) %{_libexecdir}/nm-avahi-autoipd.action
 %attr(755,root,root) %{_libexecdir}/nm-dhcp-client.action
 %attr(755,root,root) %{_libexecdir}/nm-dispatcher.action
@@ -227,6 +231,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2010/05/28 19:37:53  megabajt
+- install pppd plugin to proper directory
+- release 3
+
 Revision 1.65  2010/04/26 11:55:52  glen
 - release 2
 

================================================================
Index: packages/ModemManager/ModemManager.spec
diff -u packages/ModemManager/ModemManager.spec:1.2 packages/ModemManager/ModemManager.spec:1.3
--- packages/ModemManager/ModemManager.spec:1.2	Mon May 24 12:10:41 2010
+++ packages/ModemManager/ModemManager.spec	Fri May 28 21:37:54 2010
@@ -1,8 +1,11 @@
 # $Revision$, $Date$
+#
+%define		ppp_version	2.4.5
+#
 Summary:	Mobile broadband modem management service
 Name:		ModemManager
 Version:	0.3
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Networking
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/ModemManager/0.3/%{name}-%{version}.tar.bz2
@@ -14,7 +17,7 @@
 BuildRequires:	glib2-devel >= 1:2.18.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
-BuildRequires:	ppp-plugin-devel >= 3:2.4.4-2
+BuildRequires:	ppp-plugin-devel >= 3:%{ppp_version}
 BuildRequires:	udev-glib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -31,7 +34,8 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version}
 %{__make}
 
 %install
@@ -63,7 +67,7 @@
 %attr(755,root,root) %{_libdir}/ModemManager/libmm-plugin-option.so
 %attr(755,root,root) %{_libdir}/ModemManager/libmm-plugin-sierra.so
 %attr(755,root,root) %{_libdir}/ModemManager/libmm-plugin-zte.so
-%attr(755,root,root) %{_libdir}/pppd/*.*.*/mm-test-pppd-plugin.so
+%attr(755,root,root) %{_libdir}/pppd/%{ppp_version}/mm-test-pppd-plugin.so
 /lib/udev/rules.d/77-mm-ericsson-mbm.rules
 /lib/udev/rules.d/77-mm-longcheer-port-types.rules
 /lib/udev/rules.d/77-mm-zte-port-types.rules
@@ -76,6 +80,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/05/28 19:37:54  megabajt
+- install pppd plugin to proper directory
+- release 3
+
 Revision 1.2  2010/05/24 10:10:41  arekm
 - rel 2; rebuild with new pppd
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager/NetworkManager.spec?r1=1.65&r2=1.66&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ModemManager/ModemManager.spec?r1=1.2&r2=1.3&f=u