X-Git-Url: http://git.pld-linux.org/?p=packages%2FNetworkManager.git;a=blobdiff_plain;f=NetworkManager.spec;h=d82e0ffd1d5f02aa7d6e6e42de8a9a309ae69d1f;hp=fd9fe5b14f8b7458a0989e0dfe850164fb3e88c0;hb=a4213d7ea7128996ac8c0e8a8fa4187b7ac48769;hpb=608476ba629a14ee4e90382d4aa2a1a3e3e8ef10

diff --git a/NetworkManager.spec b/NetworkManager.spec
index fd9fe5b..d82e0ff 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -1,55 +1,111 @@
-# TODO:
-# - add a working(!) pld backend... (it work's 4 me as it is now - czarny)
+#
+# Conditional build
+%bcond_without	systemd # use systemd for session tracking instead of ConsoleKit (fallback to ConsoleKit on runtime)
+%bcond_without	vala	# Vala API
+%bcond_with	wimax	# enable wimax support
 #
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
-Version:	0.6.6
-Release:	4
-License:	GPL v2
-Group:		X11/Applications
-Source0:	http://people.redhat.com/dcbw/NetworkManager/0.6.6/%{name}-%{version}.tar.gz
-# Source0-md5:	412ed4db5d2db04285799c4303ddeeed
-Source1:	%{name}.init
-Source2:	%{name}Dispatcher.init
-Patch0:		%{name}-pld.patch
-BuildRequires:	GConf2-devel >= 2.20.0
-BuildRequires:	autoconf >= 2.52
-BuildRequires:	automake
-BuildRequires:	dbus-glib-devel >= 0.74
-BuildRequires:	gettext-devel
-BuildRequires:	gnome-keyring-devel >= 2.20.0
-BuildRequires:	gtk+2-devel >= 2:2.12.0
-BuildRequires:	hal-devel >= 0.5.9
-BuildRequires:	intltool >= 0.36.0
-BuildRequires:	libgcrypt-devel
-BuildRequires:	libgnomeui-devel >= 2.20.0
-BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libiw-devel >= 1:28
-BuildRequires:	libnl-devel >= 1:1.1
-BuildRequires:	libtool
+Version:	0.9.8.8
+Release:	3
+Epoch:		2
+License:	GPL v2+
+Group:		Networking/Admin
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/%{name}-%{version}.tar.xz
+# Source0-md5:	bad2486578aa9f4d2f5c1c1446e8daf4
+Source1:	%{name}.conf
+Source2:	%{name}.upstart
+Source3:	%{name}.tmpfiles
+Source4:	%{name}.init
+Patch0:		ifcfg-path.patch
+Patch1:		systemd-fallback.patch
+Patch2:		llh340.patch
+URL:		http://projects.gnome.org/NetworkManager/
+BuildRequires:	ModemManager-devel >= 1.0.0
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	dbus-devel >= 1.1.0
+BuildRequires:	dbus-glib-devel >= 0.94
+BuildRequires:	docbook-dtd412-xml
+BuildRequires:	gettext-devel >= 0.17
+BuildRequires:	glib2-devel >= 1:2.24.0
+BuildRequires:	gobject-introspection-devel >= 0.10.0
+BuildRequires:	gtk-doc >= 1.0
+BuildRequires:	gtk-doc-automake >= 1.0
+BuildRequires:	intltool >= 0.40.0
+BuildRequires:	libiw-devel >= 1:28-0.pre9.1
+BuildRequires:	libnl-devel >= 3.2.7
+BuildRequires:	libsoup-devel >= 2.26.0
+BuildRequires:	libtool >= 2:2.2
+BuildRequires:	libuuid-devel
+BuildRequires:	nss-devel >= 3.11
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.450
+BuildRequires:	polkit-devel >= 0.97
+BuildRequires:	ppp-plugin-devel >= 3:2.4.6
+BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.629
+BuildRequires:	sed >= 4.0
+%{?with_systemd:BuildRequires:	systemd-devel >= 183}
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	udev-devel
+BuildRequires:	udev-glib-devel >= 1:165
+%{?with_vala:BuildRequires:	vala >= 2:0.17.1.24}
+%{?with_wimax:BuildRequires:	wimax-devel >= 1.5.1}
+BuildRequires:	xz
 Requires(post,preun):	/sbin/chkconfig
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	dhcdbd
-Requires:	libnl >= 1:1.1
-Requires:	rc-scripts
-Requires:	wpa_supplicant
+Requires(post,preun,postun):	systemd-units >= 38
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+%if %{with systemd}
+Suggests:	ConsoleKit-x11
+%else
+Requires:	ConsoleKit-x11
+%endif
+Requires:	dhcp-client
+Requires:	filesystem >= 3.0-37
+Requires:	libnl >= 3.2.7
+Requires:	polkit >= 0.97
+Requires:	libsoup >= 2.26.0
+Requires:	rc-scripts >= 0.4.3.0
+Requires:	systemd-units >= 38
+Requires:	wpa_supplicant >= 0.7.3-4
+Suggests:	ModemManager >= 1.0.0
+Suggests:	mobile-broadband-provider-info
+Suggests:	resolvconf
+Obsoletes:	NetworkManager-systemd
+Obsoletes:	dhcdbd < 3.0-1
 # sr@Latn vs. sr@latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_libexecdir	%{_libdir}/%{name}
+
 %description
 Network Manager for GNOME.
 
 %description -l pl.UTF-8
 Zarządca sieci dla GNOME.
 
+%package apidocs
+Summary:	libnm-glib library API documentation
+Summary(pl.UTF-8):	Dokumentacja API biblioteki libnm-glib
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+libnm-glib library API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki libnm-glib.
+
 %package libs
 Summary:	Network Manager shared libraries
 Summary(pl.UTF-8):	Biblioteki dzielone Network Managera
-Group:		X11/Libraries
+Group:		Libraries
+Requires:	dbus-glib >= 0.94
+Requires:	glib2 >= 1:2.24.0
+Requires:	nss >= 3.11
+Requires:	udev-glib >= 1:165
 Conflicts:	NetworkManager < 0.6.4-0.2
 
 %description libs
@@ -61,10 +117,13 @@ Biblioteki dzielone Network Managera.
 %package devel
 Summary:	Network Manager includes and more
 Summary(pl.UTF-8):	Pliki nagłówkowe Network Managera
-Group:		X11/Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	dbus-glib-devel >= 0.72
-Requires:	libgcrypt-devel
+Group:		Development/Libraries
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	dbus-glib-devel >= 0.94
+Requires:	glib2-devel >= 1:2.24.0
+Requires:	libuuid-devel
+Requires:	nss-devel >= 3.11
+Requires:	udev-glib-devel >= 1:165
 
 %description devel
 Network Manager includes and more.
@@ -75,8 +134,8 @@ Pliki nagłówkowe Network Manager.
 %package static
 Summary:	Network Manager static libraries
 Summary(pl.UTF-8):	Statyczne biblioteki Network Managera
-Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Network Manager static libraries.
@@ -84,59 +143,129 @@ Network Manager static libraries.
 %description static -l pl.UTF-8
 Statyczne biblioteki Network Managera.
 
+%package -n vala-NetworkManager
+Summary:	Vala API for NetworkManager libraries
+Summary(pl.UTF-8):	API języka Vala do bibliotek NetworkManagera
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Requires:	vala >= 2:0.17.1.24
+
+%description -n vala-NetworkManager
+Vala API for NetworkManager libraries.
+
+%description -n vala-NetworkManager -l pl.UTF-8
+API języka Vala do bibliotek NetworkManagera.
+
+%package -n bash-completion-NetworkManager
+Summary:	Bash completion for NetworkManager command (nmcli)
+Summary(pl.UTF-8):	Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli)
+Group:		Applications/Shells
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	bash-completion >= 2.0
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description -n bash-completion-NetworkManager
+Bash completion for NetworkManager command (nmcli).
+
+%description -n bash-completion-NetworkManager -l pl.UTF-8
+Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
+
 %prep
 %setup -q
 %patch0 -p1
+%{?with_systemd:%patch1 -p1}
+%patch2 -p1
 
 %build
-%{__glib_gettextize}
+%{__gtkdocize}
 %{__intltoolize}
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
-	--with-distro=pld \
-	--without-gnome \
-	--with-dhcdbd=%{_sbindir}/dhcdbd \
-	--with-wpa_supplicant=%{_sbindir}/wpa_supplicant
+	--disable-silent-rules \
+	--with-html-dir=%{_gtkdocdir} \
+	--enable-ifcfg-rh \
+	--enable-more-warnings=yes \
+	--with-dhclient=/sbin/dhclient \
+	--with-iptables=/usr/sbin/iptables \
+	--with-system-ca-path=/etc/certs \
+	--with-systemdsystemunitdir=%{systemdunitdir} \
+	--with-session-tracking=%{?with_systemd:systemd}%{!?with_systemd:ck} \
+	--with-suspend-resume=%{?with_systemd:systemd}%{!?with_systemd:upower} \
+	--with-pppd-plugin-dir=%{_libdir}/pppd/plugins \
+	--with-resolvconf=/sbin/resolvconf \
+	--with-dist-version=%{version}-%{release} \
+	--with-docs \
+	%{__enable_disable wimax} \
+	--enable-static \
+	%{!?with_vala:--disable-vala}
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{_sysconfdir}/%{name}/dispatcher.d}
+install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},%{systemdtmpfilesdir}} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{VPN,dispatcher.d,system-connections}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_bindir}
-install test/nm-tool $RPM_BUILD_ROOT%{_bindir}/nm-tool
+install -p %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+
+install -d $RPM_BUILD_ROOT/etc/init
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/init/NetworkManager.conf
 
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/NetworkManager
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/NetworkManagerDispatcher
+install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
+# Cleanup
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/pppd/plugins/*.{a,la}
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr@latin ] || \
-	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
 %find_lang %{name}
 
+# examples
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+find $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -name 'Makefile*' | xargs rm
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add NetworkManager
-/sbin/chkconfig --add NetworkManagerDispatcher
 %service -n NetworkManager restart "NetworkManager daemon"
-%service -n NetworkManagerDispatcher restart "NetworkManagerDispatcher daemon"
+%systemd_post NetworkManager.service NetworkManager-wait-online.service
 
 %preun
 if [ "$1" = "0" ]; then
 	%service NetworkManager stop
-	%service NetworkManagerDispatcher stop
 	/sbin/chkconfig --del NetworkManager
-	/sbin/chkconfig --del NetworkManagerDispatcher
 fi
+%systemd_preun NetworkManager.service NetworkManager-wait-online.service
+
+%postun
+%systemd_reload
+
+%triggerpostun -- NetworkManager < 2:0.9.2.0-5
+%systemd_trigger NetworkManager.service NetworkManager-wait-online.service
+
+%triggerun -- NetworkManager < 0.7.0-0.svn4027.1
+%service -q NetworkManagerDispatcher stop
+/sbin/chkconfig --del NetworkManagerDispatcher
+
+%triggerun -- NetworkManager < 0.8.9997-5
+# move network interfaces description files to new location
+mv -f /etc/sysconfig/network-scripts/ifcfg-* /etc/sysconfig/interfaces
+mv -f /etc/sysconfig/network-scripts/keys-* /etc/sysconfig/interfaces
+exit 0
 
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
@@ -144,43 +273,91 @@ fi
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-#%attr(755,root,root) %{_bindir}/nm-vpn-properties
+%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
-%attr(755,root,root) %{_sbindir}/NetworkManagerDispatcher
-%attr(755,root,root) %{_libdir}/nm-crash-logger
+%dir %{_libdir}/NetworkManager
+%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
+%attr(755,root,root) %{_libexecdir}/nm-dispatcher.action
+%attr(755,root,root) %{_libdir}/pppd/plugins/nm-pppd-plugin.so
 %attr(754,root,root) /etc/rc.d/init.d/NetworkManager
-%attr(754,root,root) /etc/rc.d/init.d/NetworkManagerDispatcher
-%dir %{_sysconfdir}/NetworkManager
-%dir %{_sysconfdir}/NetworkManager/dispatcher.d
-%dir %{_datadir}/%{name}
-%dir /var/run/%{name}
-#%{_datadir}/gnome-vpn-properties
-%{_datadir}/%{name}/gdb-cmd
-%{_mandir}/man8/NetworkManager.8*
-%{_mandir}/man8/NetworkManagerDispatcher.8*
+%config(noreplace) %verify(not md5 mtime size) /etc/init/NetworkManager.conf
+%{systemdunitdir}/NetworkManager.service
+%{systemdunitdir}/NetworkManager-dispatcher.service
+%{systemdunitdir}/NetworkManager-wait-online.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
+%{systemdtmpfilesdir}/%{name}.conf
+%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
+%{_datadir}/polkit-1/actions/org.freedesktop.NetworkManager.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) %{_sysconfdir}/%{name}/%{name}.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-dhcp-client.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-avahi-autoipd.conf
+%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/org.freedesktop.NetworkManager.conf
+%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*
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
+%{_mandir}/man1/nmcli.1*
+%{_mandir}/man5/nm-settings.5*
+%{_mandir}/man5/nm-system-settings.conf.5*
+%{_mandir}/man5/NetworkManager.conf.5*
+%{_mandir}/man8/NetworkManager.8*
+%{_examplesdir}/%{name}-%{version}
+
+%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.0
-%attr(755,root,root) %{_libdir}/libnm_glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnm_glib.so.0
+%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.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
-%{_libdir}/libnm-util.la
-%{_libdir}/libnm_glib.la
+%attr(755,root,root) %{_libdir}/libnm-glib.so
+%attr(755,root,root) %{_libdir}/libnm-glib-vpn.so
 %{_includedir}/NetworkManager
+%{_includedir}/libnm-glib
 %{_pkgconfigdir}/NetworkManager.pc
 %{_pkgconfigdir}/libnm-util.pc
-%{_pkgconfigdir}/libnm_glib.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)
 %{_libdir}/libnm-util.a
-%{_libdir}/libnm_glib.a
+%{_libdir}/libnm-glib.a
+%{_libdir}/libnm-glib-vpn.a
+
+%if %{with vala}
+%files -n vala-NetworkManager
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/libnm-glib.deps
+%{_datadir}/vala/vapi/libnm-glib.vapi
+%{_datadir}/vala/vapi/libnm-util.deps
+%{_datadir}/vala/vapi/libnm-util.vapi
+%endif
+
+%files -n bash-completion-NetworkManager
+%defattr(644,root,root,755)
+%{_datadir}/bash-completion/completions/nmcli