From 37a1217e12e3153c7143de9163543d502260bc74191e62f6d2bb2c73695c9e3f Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 26 Apr 2018 15:31:12 +0000 Subject: [PATCH] Accepting request 535018 from home:jayvdb:gettext - Disable debug packages on RHEL and derived distributions - Replace deprecated PreReq: with Requires(post): and Requires(preun): - Disable debug packages on RHEL and derived distributions - Ignore Recommends: on non-SUSE distributions - Explicitly remove %{_infodir}/dir before creating package to allow builds on RHEL and derived Linux distributions - Ignore Recommends: on non-SUSE distributions - Explicitly remove %{_infodir}/dir before creating package to allow builds on RHEL and derived Linux distributions OBS-URL: https://build.opensuse.org/request/show/535018 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=138 --- gettext-csharp.changes | 5 +++++ gettext-csharp.spec | 4 ++++ gettext-java.changes | 6 ++++++ gettext-java.spec | 8 ++++++-- gettext-runtime-mini.changes | 7 +++++++ gettext-runtime-mini.spec | 3 +++ gettext-runtime.changes | 7 +++++++ gettext-runtime.spec | 3 +++ 8 files changed, 41 insertions(+), 2 deletions(-) diff --git a/gettext-csharp.changes b/gettext-csharp.changes index 688f585..9030552 100644 --- a/gettext-csharp.changes +++ b/gettext-csharp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 18 17:30:16 UTC 2017 - jayvdb@gmail.com + +- Disable debug packages on RHEL and derived distributions + ------------------------------------------------------------------- Sun Jun 19 15:42:15 UTC 2016 - astieger@suse.com diff --git a/gettext-csharp.spec b/gettext-csharp.spec index 01d2e4d..36b14b1 100644 --- a/gettext-csharp.spec +++ b/gettext-csharp.spec @@ -48,6 +48,10 @@ Patch4: gettext-po-mode.diff Patch5: gettext-initialize_vars.patch Patch9: gettext-needlessly_init_vars.patch +%if 0%{?fedora_version} || 0%{?centos_version} <= 600 || 0%{?scilin_version} <= 600 || 0%{?rhel_version} <= 600 +%global debug_package %{nil} +%endif + %description Mono with its 'resgen' program uses a design that Microsoft created and that gives the power to the software vendor and not to the user: it diff --git a/gettext-java.changes b/gettext-java.changes index 9abe32d..6054d34 100644 --- a/gettext-java.changes +++ b/gettext-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 18 17:30:16 UTC 2017 - jayvdb@gmail.com + +- Replace deprecated PreReq: with Requires(post): and Requires(preun): +- Disable debug packages on RHEL and derived distributions + ------------------------------------------------------------------- Tue Oct 3 10:12:03 UTC 2017 - fstrba@suse.com diff --git a/gettext-java.spec b/gettext-java.spec index b5593a8..beda965 100644 --- a/gettext-java.spec +++ b/gettext-java.spec @@ -45,8 +45,12 @@ BuildRequires: libxml2-devel BuildRequires: perl-libintl-perl BuildRequires: tcl BuildRequires: xz -# FIXME: use proper Requires(pre/post/preun/...) -PreReq: %{install_info_prereq} +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} +%endif %description This package includes the tools needed to support message catalogs in diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index 59fc42f..1c1667a 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 18 17:30:16 UTC 2017 - jayvdb@gmail.com + +- Ignore Recommends: on non-SUSE distributions +- Explicitly remove %{_infodir}/dir before creating package to + allow builds on RHEL and derived Linux distributions + ------------------------------------------------------------------- Mon Jul 17 11:52:13 UTC 2017 - dimstar@opensuse.org diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index 5106290..bf329c3 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -106,7 +106,9 @@ Conflicts: gettext-runtime-mini Provides: gettext-tools = %{version} %endif # Several tools use bison-runtime text domain: +%if 0%{?suse_version} Recommends: bison-lang +%endif %description -n gettext-tools%{?with_mini:-mini} This package contains the `intl' library as well as tools that ease the @@ -180,6 +182,7 @@ sh %{SOURCE3} # moved to gettext-java and gettext-csharp: rm -rf *csharp* *java* ../javadoc* ../csharpdoc* rm -f %{buildroot}%{_defaultdocdir}/%name/README.woe32 +rm -f %{buildroot}%{_infodir}/dir cd %{buildroot}/%{_mandir}/man3 echo ".so man3/dngettext.3" > dcngettext.3 echo ".so man3/dgettext.3" > dcgettext.3 diff --git a/gettext-runtime.changes b/gettext-runtime.changes index 59fc42f..1c1667a 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Oct 18 17:30:16 UTC 2017 - jayvdb@gmail.com + +- Ignore Recommends: on non-SUSE distributions +- Explicitly remove %{_infodir}/dir before creating package to + allow builds on RHEL and derived Linux distributions + ------------------------------------------------------------------- Mon Jul 17 11:52:13 UTC 2017 - dimstar@opensuse.org diff --git a/gettext-runtime.spec b/gettext-runtime.spec index 1338c47..71d5153 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -106,7 +106,9 @@ Conflicts: gettext-runtime-mini Provides: gettext-tools = %{version} %endif # Several tools use bison-runtime text domain: +%if 0%{?suse_version} Recommends: bison-lang +%endif %description -n gettext-tools%{?with_mini:-mini} This package contains the `intl' library as well as tools that ease the @@ -180,6 +182,7 @@ sh %{SOURCE3} # moved to gettext-java and gettext-csharp: rm -rf *csharp* *java* ../javadoc* ../csharpdoc* rm -f %{buildroot}%{_defaultdocdir}/%name/README.woe32 +rm -f %{buildroot}%{_infodir}/dir cd %{buildroot}/%{_mandir}/man3 echo ".so man3/dngettext.3" > dcngettext.3 echo ".so man3/dgettext.3" > dcgettext.3