[PATCH] Enhance spec file

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Weird construct buildtrunk is gone. Instead of that, we use bcond
feature. Also buildtrunk is renamed to runautogen, because SVN era is
gone.

Signed-off-by: Jan Friesse <jfriesse@xxxxxxxxxx>
---
 corosync.spec.in |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/corosync.spec.in b/corosync.spec.in
index b494379..33e9ded 100644
--- a/corosync.spec.in
+++ b/corosync.spec.in
@@ -13,6 +13,7 @@
 %bcond_with rdma
 %bcond_with systemd
 %bcond_with xmlconf
+%bcond_with runautogen
 
 %global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}
 %global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
@@ -35,13 +36,10 @@ Conflicts: openais <= 0.89, openais-devel <= 0.89
 
 # Build bits
 
-%define buildtrunk 0
-%{?_with_buildtrunk: %define buildtrunk 1}
-
 BuildRequires: groff
 BuildRequires: libqb-devel
 BuildRequires: nss-devel
-%if %{buildtrunk}
+%if %{with runautogen}
 BuildRequires: autoconf automake
 %endif
 %if %{with monitoring}
@@ -69,7 +67,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 %setup -q -n %{name}-%{version}%{?gittarver}
 
 %build
-%if %{buildtrunk}
+%if %{with runautogen}
 ./autogen.sh
 %endif
 
-- 
1.7.1

_______________________________________________
discuss mailing list
discuss@xxxxxxxxxxxx
http://lists.corosync.org/mailman/listinfo/discuss


[Index of Archives]     [Linux Clusters]     [Corosync Project]     [Linux USB Devel]     [Linux Audio Users]     [Photo]     [Yosemite News]    [Yosemite Photos]    [Linux Kernel]     [Linux SCSI]     [X.Org]

  Powered by Linux