[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-ha-dev
Subject:    Re: [Linux-ha-dev] Patch: Change from hg to git in
From:       Dejan Muhamedagic <dejanmm () fastmail ! fm>
Date:       2011-03-14 17:05:36
Message-ID: 20110314170536.GE3517 () squib
[Download RAW message or body]

Hi Holger,

On Mon, Mar 14, 2011 at 05:06:19PM +0100, Holger Teutsch wrote:
> On Sun, 2011-03-13 at 14:03 +0100, Holger Teutsch wrote:
> > Hi,
> > rpms could no longer be built from the new git repository
> > 
> > - holger
> > 
> Related: The spec file did no longer work.
> - holger

Many thanks for the patches.

Cheers,

Dejan

> commit 5e845734ca77336881b361b622ea8ae86cb092c4
> Author: Holger Teutsch <holger.teutsch@web.de>
> Date:   Mon Mar 14 17:00:27 2011 +0100
> 
>     build: resource-agents.spec: Make spec file work again
> 
> diff --git a/resource-agents.spec b/resource-agents.spec
> index 5f20d91..00072a5 100644
> --- a/resource-agents.spec
> +++ b/resource-agents.spec
> @@ -53,7 +53,12 @@ BuildRequires:  autoconf automake glib2-devel pkgconfig python-devel
>  BuildRequires:  help2man
>  
>  %if 0%{?suse_version}  
> -BuildRequires:  libnet libglue-devel
> +%if 0%{?suse_version} >= 1140
> +BuildRequires:  libnet1
> +%else
> +BuildRequires:  libnet
> +%endif
> +BuildRequires:  libglue-devel
>  BuildRequires:  libxslt docbook_4 docbook-xsl-stylesheets
>  %endif
>  
> @@ -104,12 +109,14 @@ export CFLAGS
>  ./autogen.sh
>  %if 0%{?suse_version} >= 1020 || 0%{?fedora} >= 11 || 0%{?centos_version} > 5 || 0%{?rhel} > 5
>  %configure \
> +    --with-ras-set=linux-ha \
>      --enable-fatal-warnings=yes \
>      --with-package-name=%{name} \
>      --docdir=%{agents_docdir}
>  %else
>  export docdir=%{agents_docdir}
>  %configure \
> +    --with-ras-set=linux-ha \
>      --enable-fatal-warnings=yes \
>      --with-package-name=%{name}
>  %endif

> _______________________________________________________
> Linux-HA-Dev: Linux-HA-Dev@lists.linux-ha.org
> http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
> Home Page: http://linux-ha.org/

_______________________________________________________
Linux-HA-Dev: Linux-HA-Dev@lists.linux-ha.org
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
[prev in list] [next in list] [prev in thread] [next in thread]