1
0

Accepting request 607329 from home:1Antoine1:branches:Base:System

- gettext-csharp + gettext-java:
  * Remove prereq on info: No info page installed.

- gettext-runtime(-mini)-tools
  * Fix %install_info_delete usage:
    + It has to be performed in %preun, not %postun.
    + This fixes warning messages upon package removal.

OBS-URL: https://build.opensuse.org/request/show/607329
OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=140
This commit is contained in:
Dirk Mueller 2018-05-16 06:56:01 +00:00 committed by Git OBS Bridge
parent 37a1217e12
commit fa01b5ac43
8 changed files with 42 additions and 21 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 14 19:56:58 UTC 2018 - antoine.belvire@opensuse.org
- Remove prereq on info: No info page installed.
-------------------------------------------------------------------
Wed Oct 18 17:30:16 UTC 2017 - jayvdb@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package gettext-csharp
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -32,9 +32,8 @@ Url: http://www.gnu.org/software/gettext/
Version: 0.19.8.1
Release: 0
Summary: Native Language Support (NLS) for C#
License: LGPL-2.1+
License: LGPL-2.1-or-later
Group: Development/Tools/Other
PreReq: %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
Source1: gettext-rpmlintrc

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 14 19:45:56 UTC 2018 - antoine.belvire@opensuse.org
- Remove prereq on info: No info page installed.
-------------------------------------------------------------------
Wed Oct 18 17:30:16 UTC 2017 - jayvdb@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package gettext-java
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@ Name: gettext-java
Version: 0.19.8.1
Release: 0
Summary: Java Support for Native Language Support (NLS)
License: LGPL-2.1+
License: LGPL-2.1-or-later
Group: Development/Tools/Other
Url: http://www.gnu.org/software/gettext/
Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
@ -45,8 +45,6 @@ BuildRequires: libxml2-devel
BuildRequires: perl-libintl-perl
BuildRequires: tcl
BuildRequires: xz
Requires(post): %install_info_prereq
Requires(preun): %install_info_prereq
%if 0%{?fedora_version} || 0%{?centos_version} <= 600 || 0%{?scilin_version} <= 600 || 0%{?rhel_version} <= 600
%global debug_package %{nil}

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 14 19:39:40 UTC 2018 - antoine.belvire@opensuse.org
- Fix %install_info_delete usage:
* It has to be performed in %preun, not %postun.
* This fixes warning messages upon package removal.
-------------------------------------------------------------------
Wed Oct 18 17:30:16 UTC 2017 - jayvdb@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package gettext-runtime-mini
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -52,10 +52,9 @@ Provides: gettext-runtime = %{version}
#!BuildIgnore: gettext-tools
%endif
Summary: Tools for Native Language Support (NLS)
License: GPL-3.0+ and LGPL-2.0+
License: GPL-3.0-or-later AND LGPL-2.0-or-later
Group: Development/Tools/Other
Url: http://www.gnu.org/software/gettext/
PreReq: %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
Source1: gettext-rpmlintrc
@ -87,10 +86,11 @@ binary catalogs.
%package -n gettext-tools%{?with_mini:-mini}
Summary: Tools for Native Language Support (NLS)
License: LGPL-2.1+
License: LGPL-2.1-or-later
Group: Development/Tools/Other
Requires: %{name} = %{version}
PreReq: info
Requires(post): info
Requires(preun): info
Provides: gettext-devel = %{version}
%if %{without mini}
# bug437293
@ -120,7 +120,7 @@ binary catalogs.
%package tools-doc
Summary: HTML documentation and examples for gettext-runtime
License: GPL-3.0+ and LGPL-2.0+
License: GPL-3.0-or-later AND LGPL-2.0-or-later
Group: Documentation/HTML
BuildArch: noarch
@ -220,7 +220,7 @@ rm -rf %{buildroot}
%install_info --info-dir=%{_infodir} %{_infodir}/gettext.info.gz
%install_info --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz
%postun -n gettext-tools%{?with_mini:-mini}
%preun -n gettext-tools%{?with_mini:-mini}
%install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 14 19:39:40 UTC 2018 - antoine.belvire@opensuse.org
- Fix %install_info_delete usage:
* It has to be performed in %preun, not %postun.
* This fixes warning messages upon package removal.
-------------------------------------------------------------------
Wed Oct 18 17:30:16 UTC 2017 - jayvdb@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package gettext-runtime
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -52,10 +52,9 @@ Provides: gettext-runtime = %{version}
#!BuildIgnore: gettext-tools
%endif
Summary: Tools for Native Language Support (NLS)
License: GPL-3.0+ and LGPL-2.0+
License: GPL-3.0-or-later AND LGPL-2.0-or-later
Group: Development/Tools/Other
Url: http://www.gnu.org/software/gettext/
PreReq: %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
Source1: gettext-rpmlintrc
@ -87,10 +86,11 @@ binary catalogs.
%package -n gettext-tools%{?with_mini:-mini}
Summary: Tools for Native Language Support (NLS)
License: LGPL-2.1+
License: LGPL-2.1-or-later
Group: Development/Tools/Other
Requires: %{name} = %{version}
PreReq: info
Requires(post): info
Requires(preun): info
Provides: gettext-devel = %{version}
%if %{without mini}
# bug437293
@ -120,7 +120,7 @@ binary catalogs.
%package tools-doc
Summary: HTML documentation and examples for gettext-runtime
License: GPL-3.0+ and LGPL-2.0+
License: GPL-3.0-or-later AND LGPL-2.0-or-later
Group: Documentation/HTML
BuildArch: noarch
@ -220,7 +220,7 @@ rm -rf %{buildroot}
%install_info --info-dir=%{_infodir} %{_infodir}/gettext.info.gz
%install_info --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz
%postun -n gettext-tools%{?with_mini:-mini}
%preun -n gettext-tools%{?with_mini:-mini}
%install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz