build: merge branch 'lkundrak/lr-rpm-build' (bgo#738507)

https://bugzilla.gnome.org/show_bug.cgi?id=738507

Signed-off-by: Thomas Haller <thaller@redhat.com>

3 files changed, 10 insertions, 19 deletions

diff --git a/callouts/Makefile.am b/callouts/Makefile.am
index 1c5f39566d..2f725b0705 100644
--- a/callouts/Makefile.am
+++ b/callouts/Makefile.am
@@ -53,7 +53,7 @@ nm_dispatcher_LDADD = \
 
 noinst_LTLIBRARIES += libnmdbus-dispatcher.la
 
-libnmdbus_dispatcher_la_SOURCES = \
+nodist_libnmdbus_dispatcher_la_SOURCES = \
 	nmdbus-dispatcher.c \
 	nmdbus-dispatcher.h
 
@@ -69,10 +69,6 @@ nmdbus-dispatcher.h: nm-dispatcher.xml
 nmdbus-dispatcher.c: nmdbus-dispatcher.h
 	@true
 
-BUILT_SOURCES = \
-	nmdbus-dispatcher.c \
-	nmdbus-dispatcher.h
-
 ###########################################
 # dispatcher envp
 ###########################################
@@ -113,7 +109,7 @@ install-data-hook:
 	   $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-down.d
 	   $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-up.d
 
-CLEANFILES = $(BUILT_SOURCES) $(dbusactivation_DATA)
+CLEANFILES = $(nodist_libnmdbus_dispatcher_la_SOURCES) $(dbusactivation_DATA)
 
 EXTRA_DIST = \
 	$(dbusservice_DATA) \
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index be95bfc8ca..4ee0a3eb4d 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -47,6 +47,12 @@
 %global with_wimax 1
 %endif
 
+# ModemManager on Fedora < 20 too old for Bluetooth && wwan
+%if (0%{?fedora} && 0%{?fedora} < 20)
+%global with_bluetooth 0
+%global with_wwan 0
+%endif
+
 # Bluetooth requires the WWAN plugin
 %if 0%{?with_bluetooth}
 %global with_wwan 1
@@ -154,7 +160,7 @@ BuildRequires: wimax-devel
 BuildRequires: systemd >= 200-3 systemd-devel
 BuildRequires: libsoup-devel
 BuildRequires: libndp-devel >= 1.0
-%if 0%{?with_wwan} && (0%{?rhel} || (0%{?fedora} && 0%{?fedora} > 19))
+%if 0%{?with_bluetooth} || (0%{?with_wwan} && (0%{?rhel} || (0%{?fedora} && 0%{?fedora} > 19)))
 BuildRequires: ModemManager-glib-devel >= 1.0
 %endif
 %if 0%{?with_nmtui}
@@ -528,16 +534,12 @@ fi
 %files adsl
 %defattr(-,root,root,0755)
 %{_libdir}/%{name}/libnm-device-plugin-adsl.so
-%else
-%exclude %{_libdir}/%{name}/libnm-device-plugin-adsl.so
 %endif
 
 %if 0%{?with_bluetooth}
 %files bluetooth
 %defattr(-,root,root,0755)
 %{_libdir}/%{name}/libnm-device-plugin-bluetooth.so
-%else
-%exclude %{_libdir}/%{name}/libnm-device-plugin-bluetooth.so
 %endif
 
 %if 0%{?with_team}
@@ -550,8 +552,6 @@ fi
 %files wifi
 %defattr(-,root,root,0755)
 %{_libdir}/%{name}/libnm-device-plugin-wifi.so
-%else
-%exclude %{_libdir}/%{name}/libnm-device-plugin-wifi.so
 %endif
 
 %if 0%{?with_wwan}
@@ -559,17 +559,12 @@ fi
 %defattr(-,root,root,0755)
 %{_libdir}/%{name}/libnm-device-plugin-wwan.so
 %{_libdir}/%{name}/libnm-wwan.so
-%else
-%exclude %{_libdir}/%{name}/libnm-device-plugin-wwan.so
-%exclude %{_libdir}/%{name}/libnm-wwan.so
 %endif
 
 %if 0%{?with_wimax}
 %files wimax
 %defattr(-,root,root,0755)
 %{_libdir}/%{name}/libnm-device-plugin-wimax.so
-%else
-%exclude %{_libdir}/%{name}/libnm-device-plugin-wimax.so
 %endif
 
 %files devel
diff --git a/contrib/fedora/rpm/build.sh b/contrib/fedora/rpm/build.sh
index 6b648f3db4..e70eb21491 100755
--- a/contrib/fedora/rpm/build.sh
+++ b/contrib/fedora/rpm/build.sh
@@ -62,7 +62,7 @@ exec > >(tee "$BUILDLOG")
 exec 2>&1
 
 UUID=`uuidgen`
-RELEASE_VERSION="${RELEASE_VERSION:-$(git rev-list --first-parent HEAD | wc -l)}"
+RELEASE_VERSION="${RELEASE_VERSION:-$(git rev-list HEAD | wc -l)}"
 VERSION="${VERSION:-$(get_version || die "Could not read $VERSION")}"
 COMMIT_FULL="${COMMIT_FULL:-$(git rev-parse --verify HEAD || die "Error reading HEAD revision")}"
 COMMIT="${COMMIT:-$(git rev-parse --verify HEAD | sed 's/^\(.\{10\}\).*/\1/' || die "Error reading HEAD revision")}"