[NetworkManager/f20] update *spec file to make it more similar to the base template

thaller thaller at fedoraproject.org
Mon Feb 24 17:37:03 UTC 2014


commit 5fac6036b99bbac779df808486a9a0fd454c4992
Author: Thomas Haller <thaller at redhat.com>
Date:   Mon Feb 24 10:21:18 2014 +0100

    update *spec file to make it more similar to the base template

 NetworkManager.spec |   98 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 95 insertions(+), 3 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 4e74a1b..c6e0133 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -2,17 +2,40 @@
 %define dbus_glib_version 0.94
 
 %define glib2_version	2.24.0
+%define wireless_tools_version 1:28-0pre9
 %define libnl3_version 3.2.7
 %define ppp_version 2.4.5
 
 %define snapshot .git20131003
+%define git_sha .xxxxxxx
 %define realversion 0.9.9.0
 
+%global with_nmtui 0
+
+%if 0%{?fedora}
+%global regen_docs 1
+%else
+#%global regen_docs 0
+%global regen_docs 1
+%endif
+
 %global regen_docs 0
 
 %define systemd_dir %{_prefix}/lib/systemd/system
 %define udev_dir %{_prefix}/lib/udev
 
+%if ! 0%{?rhel} && (! 0%{?fedora} || 0%{?fedora} < 20)
+%ifnarch s390 s390x
+# No wimax or bluetooth on s390
+%global with_wimax 1
+%endif
+%endif
+
+%if 0%{?rhel} || (0%{?fedora} > 19)
+%global with_teamctl 1
+%endif
+
+
 %global _hardened_build 1
 
 Name: NetworkManager
@@ -27,6 +50,7 @@ URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{realversion}%{snapshot}.tar.bz2
 Source1: NetworkManager.conf
 Source2: 00-server.conf
+
 Patch1: 0001-explain-dns1-dns2.patch
 Patch2: rh1023571-fix-crash-ifcfg-rh-reload.patch
 Patch3: rh1021112-fix-crash-never-default.patch 
@@ -76,6 +100,10 @@ Patch46: 0046-suppress-invalid-warnings.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} && 0%{?fedora} < 20
+Requires(post): chkconfig
+Requires(preun): chkconfig
+%endif
 Requires(post): systemd-sysv
 Requires(post): systemd
 Requires(preun): systemd
@@ -105,7 +133,7 @@ Conflicts: kde-plasma-networkmanagement < 1:0.9-0.49.20110527git.nm09
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 %if 0%{?fedora}
-BuildRequires: wireless-tools-devel >= 1:28-0pre9
+BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
 %endif
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gobject-introspection-devel >= 0.10.3
@@ -129,10 +157,22 @@ BuildRequires: libuuid-devel
 BuildRequires: libgudev1-devel >= 143
 BuildRequires: vala-tools
 BuildRequires: iptables
+%if 0%{?with_wimax}
+BuildRequires: wimax-devel
+%endif
 BuildRequires: systemd >= 200-3 systemd-devel
 BuildRequires: libsoup-devel
 BuildRequires: libndp-devel >= 1.0
+%if 0%{?rhel} || (0%{?fedora} && 0%{?fedora} > 19)
 BuildRequires: ModemManager-glib-devel >= 1.0
+%endif
+%if 0%{?with_nmtui}
+BuildRequires: newt-devel
+%endif
+%if 0%{?with_teamctl}
+BuildRequires: teamd-devel
+%endif
+
 
 %description
 NetworkManager is a system network service that manages your network devices
@@ -141,6 +181,19 @@ It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE devices, and
 provides VPN integration with a variety of different VPN services.
 
 
+%if 0%{?with_wimax}
+%package wimax
+Summary: Intel WiMAX device support for NetworkManager
+Group: System Environment/Base
+Requires: wimax
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description wimax
+This package contains NetworkManager support for Intel WiMAX mobile broadband
+devices.
+%endif
+
+
 %package devel
 Summary: Libraries and headers for adding NetworkManager support to applications
 Group: Development/Libraries
@@ -193,6 +246,19 @@ ethernet devices with no carrier.
 This package is intended to be installed by default for server
 deployments.
 
+%if 0%{with_nmtui}
+%package tui
+Summary: NetworkManager curses-based UI
+Group: System Environment/Base
+Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: %{name}-glib%{?_isa} = %{epoch}:%{version}-%{release}
+
+%description tui
+This adds a curses-based "TUI" (Text User Interface) to
+NetworkManager, to allow performing some of the operations supported
+by nm-connection-editor and nm-applet in a non-graphical environment.
+%endif
+
 %prep
 %setup -q -n NetworkManager-%{realversion}
 
@@ -260,11 +326,18 @@ deployments.
 	--with-crypto=nss \
 	--enable-more-warnings=error \
 	--enable-ppp=yes \
+%if 0%{?rhel} || (0%{?fedora} > 19)
 	--with-modem-manager-1=yes \
-	--enable-bluez4=no \
+%else
+	--with-modem-manager-1=no \
+%endif
+%if 0%{?with_wimax}
+	--enable-wimax=yes \
+%else
 	--enable-wimax=no \
+%endif
 	--enable-vala=yes \
-%if %{regen_docs}
+%if 0%{?regen_docs}
 	--enable-gtk-doc \
 %endif
 %if 0%{?fedora}
@@ -272,6 +345,11 @@ deployments.
 %else
 	--with-wext=no \
 %endif
+%if 0%{?with_teamctl}
+	--enable-teamctl=yes \
+%else
+	--enable-teamctl=no \
+%endif
 	--enable-polkit=yes \
 	--enable-modify-system=yes \
 	--enable-concheck \
@@ -393,6 +471,12 @@ fi
 %{systemd_dir}/network-online.target.wants/NetworkManager-wait-online.service
 %{_datadir}/doc/NetworkManager/examples/server.conf
 
+%if 0%{?with_wimax}
+%files wimax
+%defattr(-,root,root,0755)
+%{_libdir}/%{name}/libnm-device-plugin-wimax.so
+%endif
+
 %files devel
 %defattr(-,root,root,0755)
 %doc ChangeLog docs/api/html/*
@@ -439,6 +523,14 @@ fi
 %defattr(-,root,root,0755)
 %config %{_sysconfdir}/%{name}/conf.d/00-server.conf
 
+%if 0%{?with_nmtui}
+%files tui
+%{_bindir}/nmtui
+%{_bindir}/nmtui-edit
+%{_bindir}/nmtui-connect
+%{_bindir}/nmtui-hostname
+%endif
+
 %changelog
 * Sun Feb 16 2014 Thomas Haller <thaller at redhat.com> - 0.9.9.0-30.git20131003
 - revert previous snapshot release 0.9.9.0-29.git20140131, instead based on 0.9.9.0-28.git20131003


More information about the scm-commits mailing list