-diff -urN NetworkManager-0.8.2/configure.ac NetworkManager-0.8.2.new//configure.ac
---- NetworkManager-0.8.2/configure.ac 2010-11-03 21:10:45.000000000 +0100
-+++ NetworkManager-0.8.2.new//configure.ac 2010-11-04 23:08:43.530778095 +0100
-@@ -84,7 +84,7 @@
- dnl
- AC_C_BIGENDIAN
-
--AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus or linexa]))
-+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus, linexa or pld]))
- if test "z$with_distro" = "z"; then
- AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
- AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
-@@ -97,6 +97,7 @@
- AC_CHECK_FILE(/etc/mandriva-release,with_distro="mandriva")
- AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
- AC_CHECK_FILE(/etc/linexa-release,with_distro="linexa")
-+ AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
- if test "z$with_distro" = "z"; then
- with_distro=`lsb_release -is`
- fi
-@@ -108,7 +109,7 @@
- exit 1
- else
- case $with_distro in
-- redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa) ;;
-+ redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|pld) ;;
- *)
- echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)"
- exit 1
-@@ -171,6 +172,11 @@
- AC_DEFINE(TARGET_LINEXA, 1, [Define if you have linexa])
- fi
-
-+AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
-+if test x"$with_distro" = xpld; then
-+ AC_DEFINE(TARGET_PLD, 1, [Define if you have PLD])
-+fi
-+
- dnl
- dnl Distribution version string
- dnl
-@@ -549,6 +555,8 @@
- initscript/paldo/NetworkManager
- initscript/Mandriva/Makefile
- initscript/Mandriva/networkmanager
-+initscript/PLD/Makefile
-+initscript/PLD/NetworkManager
- initscript/linexa/Makefile
- initscript/linexa/networkmanager
- introspection/Makefile
diff -urN NetworkManager-0.8.2/initscript/Makefile.am NetworkManager-0.8.2.new//initscript/Makefile.am
--- NetworkManager-0.8.2/initscript/Makefile.am 2010-10-19 01:44:05.000000000 +0200
+++ NetworkManager-0.8.2.new//initscript/Makefile.am 2010-11-04 23:09:47.487444761 +0100
diff -urN NetworkManager-0.8.2/initscript/PLD/NetworkManager.in NetworkManager-0.8.2.new//initscript/PLD/NetworkManager.in
--- NetworkManager-0.8.2/initscript/PLD/NetworkManager.in 1970-01-01 01:00:00.000000000 +0100
+++ NetworkManager-0.8.2.new//initscript/PLD/NetworkManager.in 2010-11-04 21:54:27.000000000 +0100
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,75 @@
+#!/bin/sh
+#
+# NetworkManager NetworkManager daemon
+ fi
+}
+
-+RETVAL=0
++upstart_controlled
+
++RETVAL=0
+case "$1" in
+ start)
+ start
+esac
+
+exit $RETVAL
-diff -urN NetworkManager-0.8.2/src/backends/Makefile.am NetworkManager-0.8.2.new//src/backends/Makefile.am
---- NetworkManager-0.8.2/src/backends/Makefile.am 2010-10-19 01:44:05.000000000 +0200
-+++ NetworkManager-0.8.2.new//src/backends/Makefile.am 2010-11-04 23:10:33.174111428 +0100
-@@ -57,6 +57,10 @@
- libnmbackend_la_SOURCES += NetworkManagerLinexa.c
- endif
-
-+if TARGET_PLD
-+libnmbackend_la_SOURCES += NetworkManagerPLD.c
-+endif
-+
- libnmbackend_la_LIBADD += \
- $(top_builddir)/src/logging/libnm-logging.la \
- $(DBUS_LIBS) \
diff -urN NetworkManager-0.8.2/src/backends/NetworkManagerPLD.c NetworkManager-0.8.2.new//src/backends/NetworkManagerPLD.c
--- NetworkManager-0.8.2/src/backends/NetworkManagerPLD.c 1970-01-01 01:00:00.000000000 +0100
+++ NetworkManager-0.8.2.new//src/backends/NetworkManagerPLD.c 2010-11-04 21:54:27.000000000 +0100
+ }
+}
+
-diff -urN NetworkManager-0.8.2/system-settings/plugins/Makefile.am NetworkManager-0.8.2.new//system-settings/plugins/Makefile.am
---- NetworkManager-0.8.2/system-settings/plugins/Makefile.am 2010-10-07 21:09:52.000000000 +0200
-+++ NetworkManager-0.8.2.new//system-settings/plugins/Makefile.am 2010-11-04 23:12:52.904111428 +0100
-@@ -1,5 +1,9 @@
- SUBDIRS=keyfile
+diff -urN NetworkManager-0.8.996/configure.ac NetworkManager-0.8.996.new//configure.ac
+--- NetworkManager-0.8.996/configure.ac 2011-03-10 07:44:53.000000000 +0000
++++ NetworkManager-0.8.996.new//configure.ac 2011-03-11 21:56:12.369999140 +0000
+@@ -95,7 +95,7 @@
+ dnl
+ AC_C_BIGENDIAN
+
+-AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus, linexa or exherbo]))
++AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, arch, slackware, paldo, mandriva, pardus, linexa, exherbo or pld]))
+ if test "z$with_distro" = "z"; then
+ AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat")
+ AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse")
+@@ -109,6 +109,7 @@
+ AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
+ AC_CHECK_FILE(/etc/linexa-release,with_distro="linexa")
+ AC_CHECK_FILE(/etc/exherbo-release,with_distro="exherbo")
++ AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
+ if test "z$with_distro" = "z"; then
+ with_distro=`lsb_release -is`
+ fi
+@@ -120,7 +121,7 @@
+ exit 1
+ else
+ case $with_distro in
+- redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo) ;;
++ redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|pardus|linexa|exherbo|pld) ;;
+ *)
+ echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)"
+ exit 1
+@@ -188,6 +189,11 @@
+ AC_DEFINE(TARGET_EXHERBO, 1, [Define if you have Exherbo])
+ fi
+
++AM_CONDITIONAL(TARGET_PLD, test x"$with_distro" = xpld)
++if test x"$with_distro" = xpld; then
++ AC_DEFINE(TARGET_PLD, 1, [Define if you have PLD])
++fi
++
+ dnl
+ dnl Distribution version string
+ dnl
+@@ -617,6 +623,8 @@
+ initscript/paldo/NetworkManager
+ initscript/Mandriva/Makefile
+ initscript/Mandriva/networkmanager
++initscript/PLD/Makefile
++initscript/PLD/NetworkManager
+ initscript/linexa/Makefile
+ initscript/linexa/networkmanager
+ introspection/Makefile
+diff -urN NetworkManager-0.8.996/src/backends/Makefile.am NetworkManager-0.8.996.new//src/backends/Makefile.am
+--- NetworkManager-0.8.996/src/backends/Makefile.am 2011-01-02 23:18:57.000000000 +0000
++++ NetworkManager-0.8.996.new//src/backends/Makefile.am 2011-03-11 21:57:30.163333077 +0000
+@@ -61,6 +61,10 @@
+ libnmbackend_la_SOURCES += NetworkManagerExherbo.c
+ endif
+if TARGET_PLD
-+SUBDIRS+=ifcfg-rh
++libnmbackend_la_SOURCES += NetworkManagerPLD.c
+endif
+
- if TARGET_REDHAT
+ libnmbackend_la_LIBADD += \
+ $(top_builddir)/src/logging/libnm-logging.la \
+ $(DBUS_LIBS) \
+diff -urN NetworkManager-0.8.996/src/settings/plugins/Makefile.am NetworkManager-0.8.996.new//src/settings/plugins/Makefile.am
+--- NetworkManager-0.8.996/src/settings/plugins/Makefile.am 2011-03-08 16:19:01.000000000 +0000
++++ NetworkManager-0.8.996.new//src/settings/plugins/Makefile.am 2011-03-11 21:59:26.183332964 +0000
+@@ -4,6 +4,10 @@
SUBDIRS+=ifcfg-rh
endif
+
++if TARGET_PLD
++SUBDIRS+=ifcfg-rh
++endif
++
+ if TARGET_SUSE
+ SUBDIRS+=ifcfg-suse
+ endif
+
+# Conditional build
+%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.8.2
-Release: 6
+Version: 0.8.998
+Release: 1
License: GPL v2+
Group: Networking/Admin
Source0: http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.8/%{name}-%{version}.tar.bz2
-# Source0-md5: 951158258544f761d9c09c052a7072e2
+# Source0-md5: 600a4b538456be6f622567a2711a1bf1
Source1: %{name}.conf
Patch0: %{name}-pld.patch
-Patch1: %{name}-compile.patch
-Patch2: upstart.patch
URL: http://projects.gnome.org/NetworkManager/
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake >= 1:1.9
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.10
BuildRequires: dbus-devel >= 1.1.0
BuildRequires: dbus-glib-devel >= 0.75
BuildRequires: docbook-dtd412-xml
-BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.18.0
+BuildRequires: gettext-devel >= 0.17
+BuildRequires: glib2-devel >= 1:2.24.0
+BuildRequires: gobject-introspection-devel >= 0.10.0
BuildRequires: gtk-doc
BuildRequires: gtk-doc-automake >= 1.0
-BuildRequires: intltool >= 0.35.5
+BuildRequires: intltool >= 0.40.0
BuildRequires: libiw-devel >= 1:28-0.pre9.1
BuildRequires: libnl1-devel >= 1.1
-BuildRequires: libtool
+BuildRequires: libtool >= 2.2
BuildRequires: libuuid-devel
BuildRequires: nss-devel >= 3.11
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.450
BuildRequires: sed >= 4.0
BuildRequires: udev-devel
-BuildRequires: udev-glib-devel
+BuildRequires: udev-glib-devel >= 147
+%{?with_wimax:BuildRequires: wimax-devel >= 1.5.1}
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-libs = %{version}-%{release}
+Requires: ConsoleKit
Requires: dhcp-client
Requires: filesystem >= 3.0-37
Requires: polkit
Requires: rc-scripts >= 0.4.3.0
-Requires: wpa_supplicant >= 0.6-2
+Requires: wpa_supplicant >= 0.7.3-4
Suggests: ModemManager
Suggests: mobile-broadband-provider-info
Obsoletes: dhcdbd < 3.0-1
Summary(pl.UTF-8): Biblioteki dzielone Network Managera
Group: Libraries
Requires: dbus-glib >= 0.75
-Requires: glib2 >= 1:2.18.0
+Requires: glib2 >= 1:2.24.0
Conflicts: NetworkManager < 0.6.4-0.2
%description libs
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: dbus-glib-devel >= 0.75
-Requires: glib2-devel >= 1:2.18.0
+Requires: glib2-devel >= 1:2.24.0
Requires: libuuid-devel
Requires: udev-glib-devel
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
%{__intltoolize}
%{__autoheader}
%{__automake}
%configure \
+ --disable-silent-rules \
--with-html-dir=%{_gtkdocdir} \
--with-distro=pld \
--enable-more-warnings=yes \
--with-system-ca-path=/etc/certs \
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
--with-dist-version=%{version}-%{release} \
- --with-docs
+ --with-docs \
+ %{__enable_disable wimax} \
+ --enable-static
%{__make}
cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
# 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}
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
+%attr(755,root,root) %{_bindir}/nm-online
%attr(755,root,root) %{_bindir}/nm-tool
%attr(755,root,root) %{_bindir}/nmcli
%attr(755,root,root) %{_sbindir}/NetworkManager
%dir %{_libdir}/NetworkManager
-%attr(755,root,root) %{_libdir}/NetworkManager/libnm-settings-plugin-keyfile.so
%attr(755,root,root) %{_libdir}/NetworkManager/libnm-settings-plugin-ifcfg-rh.so
%attr(755,root,root) %{_libexecdir}/nm-avahi-autoipd.action
%attr(755,root,root) %{_libexecdir}/nm-dhcp-client.action
%{_datadir}/%{name}/gdb-cmd
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
%{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.network-manager-settings.system.policy
/lib/udev/rules.d/77-nm-olpc-mesh.rules
%dir %{_sysconfdir}/%{name}/VPN
%dir %{_sysconfdir}/%{name}/system-connections
%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dispatcher.conf
%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-ifcfg-rh.conf
%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/NetworkManager.conf
-%dir /var/run/%{name}
+%attr(700,root,root) %dir /var/run/%{name}
+%attr(700,root,root) %dir /var/lib/%{name}
%{_mandir}/man1/nm-online.1*
%{_mandir}/man1/nm-tool.1*
%{_mandir}/man1/nmcli.1*
%files apidocs
%defattr(644,root,root,755)
+%{_gtkdocdir}/NetworkManager
%{_gtkdocdir}/libnm-glib
%{_gtkdocdir}/libnm-util
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libnm-util.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnm-util.so.1
+%attr(755,root,root) %ghost %{_libdir}/libnm-util.so.2
%attr(755,root,root) %{_libdir}/libnm-glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnm-glib.so.2
+%attr(755,root,root) %ghost %{_libdir}/libnm-glib.so.4
%attr(755,root,root) %{_libdir}/libnm-glib-vpn.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libnm-glib-vpn.so.1
+%{_libdir}/girepository-1.0/NMClient-1.0.typelib
+%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libnm-util.so
%attr(755,root,root) %{_libdir}/libnm-glib.so
%attr(755,root,root) %{_libdir}/libnm-glib-vpn.so
-%{_libdir}/libnm-util.la
-%{_libdir}/libnm-glib.la
-%{_libdir}/libnm-glib-vpn.la
%{_includedir}/NetworkManager
%{_includedir}/libnm-glib
%{_pkgconfigdir}/NetworkManager.pc
%{_pkgconfigdir}/libnm-util.pc
%{_pkgconfigdir}/libnm-glib-vpn.pc
%{_pkgconfigdir}/libnm-glib.pc
+%{_datadir}/gir-1.0/NMClient-1.0.gir
+%{_datadir}/gir-1.0/NetworkManager-1.0.gir
%files static
%defattr(644,root,root,755)
projects / packages / NetworkManager.git / commitdiff