[PATCH 1/6] Revert "Use gettext to process glade files."

Vratislav Podzimek vpodzime at redhat.com
Mon May 25 08:58:04 UTC 2015


On Wed, 2015-05-20 at 10:43 -0400, Chris Lumens wrote:
> This reverts commit 78a3676e70550cc893238b5047023ea17668c466.  RHEL currently
> uses an older gettext than anaconda expects, so this patch needs to be
> reverted.
> 
> Related: rhbz#1196721
> ---
>  .gitignore       |  1 +
>  anaconda.spec.in |  5 ++---
>  configure.ac     |  3 +--
>  po/POTFILES.in   | 57 +++++++++++++++++++++++++++-----------------------------
>  po/Rules-extract | 15 +++++++++++++--
>  5 files changed, 44 insertions(+), 37 deletions(-)
> 
> diff --git a/.gitignore b/.gitignore
> index 1f46374..c52ae23 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -2,6 +2,7 @@
>  *.bak
>  *.desktop.in.h
>  *.gir
> +*.glade.h
>  *.la
>  *.lo
>  *.o
> diff --git a/anaconda.spec.in b/anaconda.spec.in
> index c483ec3..62652b8 100644
> --- a/anaconda.spec.in
> +++ b/anaconda.spec.in
> @@ -17,9 +17,8 @@ Source0: %{name}-%{version}.tar.bz2
>  
>  # Versions of required components (done so we make sure the buildrequires
>  # match the requires versions of things).
> -
> -# Also update in AM_GNU_GETTEXT_VERSION in configure.ac
> -%define gettextver 0.18.3
> +%define gettextver 0.18.1
> +%define gconfversion 2.28.1
The %gconfverison definition doesn't seem to be an intentional change.

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list