From ba55277191eb80c67d38a631af8f9d2eb4019c8f957ec4f71f0ba0625eddb6d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Wed, 26 Mar 2014 16:08:38 +0000 Subject: [PATCH] - remove '.unknown' from reported version add drop-revision.patch OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=80 --- cfengine.changes | 6 ++++++ cfengine.spec | 5 +++++ drop-revision.patch | 12 ++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 drop-revision.patch diff --git a/cfengine.changes b/cfengine.changes index 602d28a..95fd356 100644 --- a/cfengine.changes +++ b/cfengine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 26 16:08:16 UTC 2014 - kkaempf@suse.com + +- remove '.unknown' from reported version + add drop-revision.patch + ------------------------------------------------------------------- Wed Mar 26 08:24:00 UTC 2014 - kkaempf@suse.com diff --git a/cfengine.spec b/cfengine.spec index 12ae35d..ef6716a 100644 --- a/cfengine.spec +++ b/cfengine.spec @@ -71,6 +71,10 @@ Patch1: libacl-headers.patch # SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de Patch2: remove-am_subst_notmake.patch +# drop revision from configure.ac, autotools will evaluate it as 'unkwown' +# kkaempf@suse.de +Patch3: drop-revision.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel @@ -193,6 +197,7 @@ This package contains the files of the cfengine server. %if 0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600 %patch2 -p1 %endif +%patch3 -p1 ##### rpmlint #### wrong-file-end-of-line-encoding diff --git a/drop-revision.patch b/drop-revision.patch new file mode 100644 index 0000000..7137105 --- /dev/null +++ b/drop-revision.patch @@ -0,0 +1,12 @@ +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-core-3.6.0b2/configure.ac ./configure.ac +--- ../orig-core-3.6.0b2/configure.ac 2014-03-17 17:37:49.000000000 +0100 ++++ ./configure.ac 2014-03-26 17:06:24.343406133 +0100 +@@ -25,7 +25,7 @@ + dnl + + _AM_SET_OPTION([tar-ustar]) +-AM_INIT_AUTOMAKE(cfengine, 3.6.0b2.revision) ++AM_INIT_AUTOMAKE(cfengine, 3.6.0b2) + AM_MAINTAINER_MODE([enable]) + + AC_DEFINE(BUILD_YEAR, esyscmd([date +%Y | tr -d '\n']), "Software build year")