From e7b485fe3471680a8f64f5cbf57ea1877b3c0a46b2d9643e69fe1dc11bb5155a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 11 Oct 2023 13:20:09 +0000 Subject: [PATCH] Accepting request 1116916 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/1116916 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/intltool?expand=0&rev=43 --- intltool-perl-5.22.patch | 6 +++--- intltool.changes | 8 ++++++++ intltool.spec | 17 +++++++---------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/intltool-perl-5.22.patch b/intltool-perl-5.22.patch index 089eeeb..0c8d38a 100644 --- a/intltool-perl-5.22.patch +++ b/intltool-perl-5.22.patch @@ -1,7 +1,7 @@ -Index: intltool-update.in +Index: intltool-0.51.0/intltool-update.in =================================================================== ---- intltool-update.in.orig -+++ intltool-update.in +--- intltool-0.51.0.orig/intltool-update.in ++++ intltool-0.51.0/intltool-update.in @@ -1062,13 +1062,13 @@ sub SubstituteVariable } } diff --git a/intltool.changes b/intltool.changes index a9c272d..9c142aa 100644 --- a/intltool.changes +++ b/intltool.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Oct 8 11:38:19 UTC 2023 - Bjørn Lie + +- Rebase intltool-perl-5.22.patch, use autosetup and make_build + macros. +- Replace perl-XML-Parser with perl(XML::Parser) + BuildRequires/Requires: Be explicit about the symbol we need. + ------------------------------------------------------------------- Sun May 13 19:47:44 UTC 2018 - bjorn.lie@gmail.com diff --git a/intltool.spec b/intltool.spec index d7580fb..29c875f 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ # # spec file for package intltool # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -30,9 +30,9 @@ Patch0: intltool-perl-5.22.patch Patch1: fixrace.patch # PATCH-FIX-UPSTREAM intltool-no-guess-builddir.patch lp#1117944 -- Fix out of tree builds with automake 1.15 Patch2: intltool-no-guess-builddir.patch -BuildRequires: perl-XML-Parser +BuildRequires: perl(XML::Parser) Requires: gettext-tools -Requires: perl-XML-Parser +Requires: perl(XML::Parser) Provides: xml-i18n-tools Obsoletes: xml-i18n-tools BuildArch: noarch @@ -44,17 +44,14 @@ more) can be extracted into PO files. After translation, the new information is written back into the XML files. %prep -%setup -q -%patch0 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build %configure -make %{?_smp_mflags} +%make_build %check -make %{?_smp_mflags} check +%make_build check %install %make_install