- remove '.unknown' from reported version

add drop-revision.patch

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=80
This commit is contained in:
Klaus Kämpf 2014-03-26 16:08:38 +00:00 committed by Git OBS Bridge
parent 9f14356207
commit ba55277191
3 changed files with 23 additions and 0 deletions

View File

@ -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 Wed Mar 26 08:24:00 UTC 2014 - kkaempf@suse.com

View File

@ -71,6 +71,10 @@ Patch1: libacl-headers.patch
# SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de # SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de
Patch2: remove-am_subst_notmake.patch 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison BuildRequires: bison
BuildRequires: db-devel 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 %if 0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600
%patch2 -p1 %patch2 -p1
%endif %endif
%patch3 -p1
##### rpmlint ##### rpmlint
#### wrong-file-end-of-line-encoding #### wrong-file-end-of-line-encoding

12
drop-revision.patch Normal file
View File

@ -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")