From 092202dbba996a9d9e47bd57c631bc0e1b8d3c44 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 10 May 2017 16:47:24 +0200 Subject: [PATCH] contrib/rpm: reorder variables in spec file (cherry picked from commit 1975d6fa7581db71f66e44be69eca1ad21e322ae) --- contrib/fedora/rpm/NetworkManager.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index a43b314a24..14fedd2449 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -15,13 +15,12 @@ %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) -%global snapshot %{nil} -%global git_sha __COMMIT__ - +%global epoch_version 1 %global rpm_version __VERSION__ %global real_version __VERSION__ %global release_version __RELEASE_VERSION__ -%global epoch_version 1 +%global snapshot %{nil} +%global git_sha __COMMIT__ %global obsoletes_device_plugins 1:0.9.9.95-1 %global obsoletes_ppp_plugin 1:1.5.3