- do not bcond patch sources

[packages/NetworkManager.git] / NetworkManager.spec

diff --git a/NetworkManager.spec b/NetworkManager.spec
index da1d10222401619c4abfbf4ad127d8f691673aa4..569ac73bf6235d9ceff79bdea6823d1602c9a1e7 100644 (file)
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -1,5 +1,6 @@
 #
 # 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
@@ -7,18 +8,19 @@
 Summary:       Network Manager for GNOME
 Summary(pl.UTF-8):     Zarządca sieci dla GNOME
 Name:          NetworkManager
-Version:       0.9.2.0
-Release:       5
+Version:       0.9.4.0
+Release:       2
 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: d7dce01e97758253bc4ed81d7b86045f
+# Source0-md5: 66a54b51a4998c484613911b72a7e6ff
 Source1:       %{name}.conf
 Source2:       %{name}.upstart
 Source3:       %{name}.tmpfiles
 Patch0:                %{name}-pld.patch
 Patch1:                ifcfg-path.patch
+Patch2:                systemd-fallback.patch
 URL:           http://projects.gnome.org/NetworkManager/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.10
@@ -33,6 +35,7 @@ BuildRequires:        gtk-doc-automake >= 1.0
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libiw-devel >= 1:28-0.pre9.1
 BuildRequires: libnl-devel >= 3.0
+BuildRequires: libsoup-devel >= 2.26.0
 BuildRequires: libtool >= 2:2.2
 BuildRequires: libuuid-devel
 BuildRequires: nss-devel >= 3.11
@@ -42,9 +45,10 @@ BuildRequires:       ppp-plugin-devel >= 3:%{ppp_version}
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.629
 BuildRequires: sed >= 4.0
+%{?with_systemd:BuildRequires: systemd-devel}
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-devel
-BuildRequires: udev-glib-devel >= 147
+BuildRequires: udev-glib-devel >= 1:147
 %{?with_wimax:BuildRequires:   wimax-devel >= 1.5.1}
 BuildRequires: xz
 Requires(post,preun):  /sbin/chkconfig
@@ -58,8 +62,8 @@ Requires:     systemd-units >= 37-0.10
 Requires:      wpa_supplicant >= 0.7.3-4
 Suggests:      ModemManager
 Suggests:      mobile-broadband-provider-info
-Obsoletes:     dhcdbd < 3.0-1
 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)
@@ -91,7 +95,7 @@ Group:                Libraries
 Requires:      dbus-glib >= 0.75
 Requires:      glib2 >= 1:2.24.0
 Requires:      nss >= 3.11
-Requires:      udev-glib >= 147
+Requires:      udev-glib >= 1:147
 Conflicts:     NetworkManager < 0.6.4-0.2
 
 %description libs
@@ -109,7 +113,7 @@ Requires:   dbus-glib-devel >= 0.75
 Requires:      glib2-devel >= 1:2.24.0
 Requires:      libuuid-devel
 Requires:      nss-devel >= 3.11
-Requires:      udev-glib-devel >= 147
+Requires:      udev-glib-devel >= 1:147
 
 %description devel
 Network Manager includes and more.
@@ -133,6 +137,7 @@ Statyczne biblioteki Network Managera.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%{?with_systemd:%patch2 -p1}
 
 %build
 %{__gtkdocize}
@@ -151,6 +156,7 @@ Statyczne biblioteki Network Managera.
        --with-iptables=/usr/sbin/iptables \
        --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-dist-version=%{version}-%{release} \
        --with-docs \
@@ -161,7 +167,7 @@ Statyczne biblioteki Network Managera.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/var/run/%{name},/usr/lib/tmpfiles.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 \
@@ -172,7 +178,7 @@ 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 %{SOURCE3} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
 # Cleanup
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -239,7 +245,7 @@ exit 0
 %{systemdunitdir}/NetworkManager.service
 %{systemdunitdir}/NetworkManager-wait-online.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
-/usr/lib/tmpfiles.d/%{name}.conf
+%{systemdtmpfilesdir}/%{name}.conf
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/gdb-cmd
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
@@ -252,7 +258,7 @@ exit 0
 %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/NetworkManager.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*