From a4814fa8e678141bbdeb73c273babb73784bdcd2 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 04:53:03 +0000 Subject: [PATCH 01/92] Initialize branch F-7 for intltool --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From e40bd930f34b85eb8405f554fa49afb1d4fb5969 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 29 Jul 2007 01:05:42 +0000 Subject: [PATCH 02/92] don't produce debuginfo --- intltool.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 64f7b54..3912c8e 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,10 @@ +# debuginfo not needed +%define debug_package %{nil} + Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.35.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Development/Tools Source: http://ftp.gnome.org/pub/gnome/sources/intltool/0.35/%{name}-%{version}.tar.bz2 @@ -49,6 +52,9 @@ make %{_mandir}/man*/* %changelog +* Sat Jul 28 2007 Matthias Clasen - 0.35.5-4 +- Don't produce useless debuginfo (#249969) + * Wed Mar 21 2007 Ray Strode - 0.35.5-3 - don't store a translation if it is equal to the original string From ddc7e452e6091fdda713720119e875729d929bce Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Tue, 31 Jul 2007 22:30:17 +0000 Subject: [PATCH 03/92] - Add support for PolicyKit .policy files (b.g.o #462312) --- intltool-0.35.5-polkit.patch | 32 ++++++++++++++++++++++++++++++++ intltool.spec | 8 +++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 intltool-0.35.5-polkit.patch diff --git a/intltool-0.35.5-polkit.patch b/intltool-0.35.5-polkit.patch new file mode 100644 index 0000000..2d89fbe --- /dev/null +++ b/intltool-0.35.5-polkit.patch @@ -0,0 +1,32 @@ +diff -up intltool-0.35.5/intltool.m4.polkit intltool-0.35.5/intltool.m4 +--- intltool-0.35.5/intltool.m4.polkit 2007-07-31 17:23:52.000000000 -0400 ++++ intltool-0.35.5/intltool.m4 2007-07-31 17:24:20.000000000 -0400 +@@ -65,6 +65,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %. + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + + AC_SUBST(INTLTOOL_DESKTOP_RULE) + AC_SUBST(INTLTOOL_DIRECTORY_RULE) +@@ -84,6 +85,7 @@ AC_SUBST(INTLTOOL_CAVES_RULE) + AC_SUBST(INTLTOOL_SCHEMAS_RULE) + AC_SUBST(INTLTOOL_THEME_RULE) + AC_SUBST(INTLTOOL_SERVICE_RULE) ++AC_SUBST(INTLTOOL_POLICY_RULE) + + # Use the tools built into the package, not the ones that are installed. + AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') +diff -up intltool-0.35.5/intltool-update.in.in.polkit intltool-0.35.5/intltool-update.in.in +--- intltool-0.35.5/intltool-update.in.in.polkit 2007-07-31 17:10:52.000000000 -0400 ++++ intltool-0.35.5/intltool-update.in.in 2007-07-31 17:21:45.000000000 -0400 +@@ -71,7 +71,8 @@ my $xml_support = + "sheet(?:\\.in)+|". # ? + "schemas(?:\\.in)+|". # GConf specific + "pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer. +-"kbd(?:\\.in)+"; # GOK specific. ++"kbd(?:\\.in)+|". # GOK specific. ++"policy(?:\\.in)+"; # PolicyKit files + + my $ini_support = + "icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec diff --git a/intltool.spec b/intltool.spec index 3912c8e..95777a1 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.35.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Development/Tools Source: http://ftp.gnome.org/pub/gnome/sources/intltool/0.35/%{name}-%{version}.tar.bz2 @@ -19,6 +19,8 @@ BuildRequires: gettext Patch0: intltool-0.35.5-path.patch Patch1: intltool-0.35.5-dont-duplicate-msgid.patch +# Submitted upstream: http://bugzilla.gnome.org/show_bug.cgi?id=462312 +Patch2: intltool-0.35.5-polkit.patch %description This tool automatically extracts translatable strings from oaf, glade, @@ -29,6 +31,7 @@ them in the po files. %setup -q %patch0 -p1 -b .path %patch1 -p1 -b .dont-duplicate-msgid +%patch2 -p1 -b .polkit %build %configure @@ -52,6 +55,9 @@ make %{_mandir}/man*/* %changelog +* Tue Jul 31 2007 David Zeuthen - 0.35.5-5 +- Add support for PolicyKit .policy files (b.g.o #462312) + * Sat Jul 28 2007 Matthias Clasen - 0.35.5-4 - Don't produce useless debuginfo (#249969) From 85746e819b0c7bdfd2868e2f06824dc310f3e18d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 3 Aug 2007 17:27:23 +0000 Subject: [PATCH 04/92] 0.36.0 --- .cvsignore | 2 +- intltool.spec | 16 ++++++---------- sources | 2 +- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index 80cca5c..2ca0a1b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.35.5.tar.bz2 +intltool-0.36.0.tar.bz2 diff --git a/intltool.spec b/intltool.spec index 95777a1..d394b28 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,8 +3,8 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.35.5 -Release: 5%{?dist} +Version: 0.36.0 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://ftp.gnome.org/pub/gnome/sources/intltool/0.35/%{name}-%{version}.tar.bz2 @@ -17,11 +17,6 @@ Requires: perl(XML::Parser) BuildRequires: perl(XML::Parser) BuildRequires: gettext -Patch0: intltool-0.35.5-path.patch -Patch1: intltool-0.35.5-dont-duplicate-msgid.patch -# Submitted upstream: http://bugzilla.gnome.org/show_bug.cgi?id=462312 -Patch2: intltool-0.35.5-polkit.patch - %description This tool automatically extracts translatable strings from oaf, glade, bonobo ui, nautilus theme, .desktop, and other data files and puts @@ -29,9 +24,6 @@ them in the po files. %prep %setup -q -%patch0 -p1 -b .path -%patch1 -p1 -b .dont-duplicate-msgid -%patch2 -p1 -b .polkit %build %configure @@ -55,6 +47,10 @@ make %{_mandir}/man*/* %changelog +* Fri Aug 3 2007 Matthias Clasen - 0.36.0-1 +- Update to 0.36.0 +- Drop patch rejected, obsolete and upstreamed patches + * Tue Jul 31 2007 David Zeuthen - 0.35.5-5 - Add support for PolicyKit .policy files (b.g.o #462312) diff --git a/sources b/sources index 2ec669e..3cde087 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f52d5fa7f128db94e884cd21dd45d2e2 intltool-0.35.5.tar.bz2 +401e2fadc7cac3474c9bdb39d6bc356c intltool-0.36.0.tar.bz2 From d26d83c484cee5d26e9cb83d43ccda25d44e6e37 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 3 Aug 2007 17:37:21 +0000 Subject: [PATCH 05/92] misc updates --- intltool.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/intltool.spec b/intltool.spec index d394b28..6cf98f5 100644 --- a/intltool.spec +++ b/intltool.spec @@ -5,12 +5,14 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.36.0 Release: 1%{?dist} -License: GPL +License: GPLv2 with exception Group: Development/Tools Source: http://ftp.gnome.org/pub/gnome/sources/intltool/0.35/%{name}-%{version}.tar.bz2 URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: patch +# for /usr/share/aclocal +Requires: automake Obsoletes: xml-i18n-tools Provides: xml-i18n-tools = 0.11 Requires: perl(XML::Parser) @@ -31,16 +33,16 @@ them in the po files. make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README +%doc AUTHORS COPYING NEWS README %{_bindir}/* %{_datadir}/intltool %{_datadir}/aclocal/* @@ -49,7 +51,10 @@ make %changelog * Fri Aug 3 2007 Matthias Clasen - 0.36.0-1 - Update to 0.36.0 +- Update license field - Drop patch rejected, obsolete and upstreamed patches +- Some spec file cleanups +- Require automake * Tue Jul 31 2007 David Zeuthen - 0.35.5-5 - Add support for PolicyKit .policy files (b.g.o #462312) From 736cd50fc2aa863cd425c1dbc02a659f830a4a4a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 13 Aug 2007 22:27:22 +0000 Subject: [PATCH 06/92] 0.36.1 --- .cvsignore | 2 +- intltool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2ca0a1b..61b66e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.36.0.tar.bz2 +intltool-0.36.1.tar.bz2 diff --git a/intltool.spec b/intltool.spec index 6cf98f5..c664117 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,7 +3,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.36.0 +Version: 0.36.1 Release: 1%{?dist} License: GPLv2 with exception Group: Development/Tools @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Mon Aug 13 2007 Matthias Clasen - 0.36.1-1 +- Update to 0.36.1 + * Fri Aug 3 2007 Matthias Clasen - 0.36.0-1 - Update to 0.36.0 - Update license field diff --git a/sources b/sources index 3cde087..5446e89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -401e2fadc7cac3474c9bdb39d6bc356c intltool-0.36.0.tar.bz2 +1822943ce6745596b2510d2b425cb90d intltool-0.36.1.tar.bz2 From 7da658bdfbcfe5c9ec54641866eef9d500ffe677 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 17 Sep 2007 01:13:51 +0000 Subject: [PATCH 07/92] 0.36.2 --- .cvsignore | 2 +- intltool.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 61b66e1..db5b354 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.36.1.tar.bz2 +intltool-0.36.2.tar.bz2 diff --git a/intltool.spec b/intltool.spec index c664117..fcedefa 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,7 +3,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.36.1 +Version: 0.36.2 Release: 1%{?dist} License: GPLv2 with exception Group: Development/Tools @@ -30,7 +30,7 @@ them in the po files. %build %configure -make +make %install rm -rf $RPM_BUILD_ROOT @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Sun Sep 16 2007 Matthias Clasen - 0.36.2-1 +- Update to 0.36.2 + * Mon Aug 13 2007 Matthias Clasen - 0.36.1-1 - Update to 0.36.1 diff --git a/sources b/sources index 5446e89..d069308 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1822943ce6745596b2510d2b425cb90d intltool-0.36.1.tar.bz2 +e41b8d791775fbd683784408f0e336a4 intltool-0.36.2.tar.bz2 From a98846699543d3929d39fb9d9d96b3aa5c14db4b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 15 Oct 2007 18:53:06 +0000 Subject: [PATCH 08/92] makefile update to properly grab makefile.common --- Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a3ab0df..d0673ed 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,21 @@ # Makefile for source rpm: intltool -# $Id$ +# $Id: Makefile,v 1.1 2004/09/09 06:17:57 cvsdist Exp $ NAME := intltool SPECFILE = $(firstword $(wildcard *.spec)) -include ../common/Makefile.common +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attempt a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) From b9e4a24e31502157fb82860e0e6a1efdbc568073 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 20 Oct 2007 02:19:50 +0000 Subject: [PATCH 09/92] fix source url --- intltool.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index fcedefa..dd265c9 100644 --- a/intltool.spec +++ b/intltool.spec @@ -7,7 +7,7 @@ Version: 0.36.2 Release: 1%{?dist} License: GPLv2 with exception Group: Development/Tools -Source: http://ftp.gnome.org/pub/gnome/sources/intltool/0.35/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/intltool/0.36/%{name}-%{version}.tar.bz2 URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: patch From 7129a716ab2b3a42ff1fd98be230085b73a59c3d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 14 Dec 2007 04:42:48 +0000 Subject: [PATCH 10/92] 0.36.3 --- .cvsignore | 2 +- intltool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index db5b354..288683a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.36.2.tar.bz2 +intltool-0.36.3.tar.bz2 diff --git a/intltool.spec b/intltool.spec index dd265c9..b700166 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,7 +3,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.36.2 +Version: 0.36.3 Release: 1%{?dist} License: GPLv2 with exception Group: Development/Tools @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Thu Dec 13 2007 Matthias Clasen - 0.36.3-1 +- Update to 0.36.3 + * Sun Sep 16 2007 Matthias Clasen - 0.36.2-1 - Update to 0.36.2 diff --git a/sources b/sources index d069308..4684e7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e41b8d791775fbd683784408f0e336a4 intltool-0.36.2.tar.bz2 +4a4428eedf69ac2717f2353b742fe42e intltool-0.36.3.tar.bz2 From 293f56b0fa4c1e84593cffcc38a62201fe2f8ac9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 17 Dec 2007 05:08:15 +0000 Subject: [PATCH 11/92] 0.37.0 --- .cvsignore | 2 +- intltool.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 288683a..626f610 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.36.3.tar.bz2 +intltool-0.37.0.tar.bz2 diff --git a/intltool.spec b/intltool.spec index b700166..c766113 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,11 +3,11 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.36.3 +Version: 0.37.0 Release: 1%{?dist} License: GPLv2 with exception Group: Development/Tools -Source: http://download.gnome.org/sources/intltool/0.36/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/intltool/0.37/%{name}-%{version}.tar.bz2 URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: patch @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Mon Dec 17 2007 Matthias Clasen - 0.37.0-1 +- Update to 0.37.0 + * Thu Dec 13 2007 Matthias Clasen - 0.36.3-1 - Update to 0.36.3 diff --git a/sources b/sources index 4684e7a..46e824d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a4428eedf69ac2717f2353b742fe42e intltool-0.36.3.tar.bz2 +deb32596fa653cd646cd489631641ca4 intltool-0.37.0.tar.bz2 From af63c0038171e7b5a46c0ce6a3b31b115196dfdd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 15 Jan 2008 15:35:25 +0000 Subject: [PATCH 12/92] require gettext --- intltool.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index c766113..b51f13d 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.37.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exception Group: Development/Tools Source: http://download.gnome.org/sources/intltool/0.37/%{name}-%{version}.tar.bz2 @@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: patch # for /usr/share/aclocal Requires: automake +Requires: gettext Obsoletes: xml-i18n-tools Provides: xml-i18n-tools = 0.11 Requires: perl(XML::Parser) @@ -49,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Tue Jan 15 2008 Matthias Clasen - 0.37.0-2 +- Require gettext + * Mon Dec 17 2007 Matthias Clasen - 0.37.0-1 - Update to 0.37.0 From e9ddf7833ee8d35791026e68c0710d4197c5383f Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 13:18:59 +0000 Subject: [PATCH 13/92] - Autorebuild for GCC 4.3 --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index b51f13d..7fe7477 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.37.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 with exception Group: Development/Tools Source: http://download.gnome.org/sources/intltool/0.37/%{name}-%{version}.tar.bz2 @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.37.0-3 +- Autorebuild for GCC 4.3 + * Tue Jan 15 2008 Matthias Clasen - 0.37.0-2 - Require gettext From 95dd05528b08f88307ca61fc42ed47dbe7394140 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 25 Feb 2008 05:10:07 +0000 Subject: [PATCH 14/92] 0.37.1 --- .cvsignore | 2 +- intltool.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 626f610..ad3a87b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.37.0.tar.bz2 +intltool-0.37.1.tar.bz2 diff --git a/intltool.spec b/intltool.spec index 7fe7477..0b7216d 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,8 +3,8 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.37.0 -Release: 3%{?dist} +Version: 0.37.1 +Release: 1%{?dist} License: GPLv2 with exception Group: Development/Tools Source: http://download.gnome.org/sources/intltool/0.37/%{name}-%{version}.tar.bz2 @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Mon Feb 25 2008 Matthias Clasen - 0.37.1-1 +- Update to 0.37.1 + * Tue Feb 19 2008 Fedora Release Engineering - 0.37.0-3 - Autorebuild for GCC 4.3 diff --git a/sources b/sources index 46e824d..1084569 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -deb32596fa653cd646cd489631641ca4 intltool-0.37.0.tar.bz2 +860d392f04299c2740d0752501639c3b intltool-0.37.1.tar.bz2 From 37e58cf5291d5a3ded4b213b69c23f0c987134a6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 3 Jun 2008 21:01:58 +0000 Subject: [PATCH 15/92] 0.40.0 --- .cvsignore | 2 +- intltool.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index ad3a87b..bf9d380 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.37.1.tar.bz2 +intltool-0.40.0.tar.bz2 diff --git a/intltool.spec b/intltool.spec index 0b7216d..7f7d2c9 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,11 +3,11 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.37.1 +Version: 0.40.0 Release: 1%{?dist} License: GPLv2 with exception Group: Development/Tools -Source: http://download.gnome.org/sources/intltool/0.37/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2 URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: patch @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Tue Jun 3 2008 Matthias Clasen - 0.40.0-1 +- Update to 0.40.0 + * Mon Feb 25 2008 Matthias Clasen - 0.37.1-1 - Update to 0.37.1 diff --git a/sources b/sources index 1084569..b51d720 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -860d392f04299c2740d0752501639c3b intltool-0.37.1.tar.bz2 +a51faa2b0e543714f34f05d99a643443 intltool-0.40.0.tar.bz2 From 5d322bcb709a1848612c5b99788fc06e0b850383 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 22 Jul 2008 03:56:50 +0000 Subject: [PATCH 16/92] 0.40.1 --- .cvsignore | 2 +- intltool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index bf9d380..289455e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.40.0.tar.bz2 +intltool-0.40.1.tar.bz2 diff --git a/intltool.spec b/intltool.spec index 7f7d2c9..9cea8d0 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,7 +3,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.40.0 +Version: 0.40.1 Release: 1%{?dist} License: GPLv2 with exception Group: Development/Tools @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Mon Jul 21 2008 Matthias Clasen - 0.40.1-1 +- Update to 0.40.1 + * Tue Jun 3 2008 Matthias Clasen - 0.40.0-1 - Update to 0.40.0 diff --git a/sources b/sources index b51d720..66c970e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a51faa2b0e543714f34f05d99a643443 intltool-0.40.0.tar.bz2 +18a75ec5ff9d049c3ef148f1d7b03929 intltool-0.40.1.tar.bz2 From a30f72ebd16648c3de1b3a6ef8c699235d9ff2ed Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 25 Jul 2008 21:11:39 +0000 Subject: [PATCH 17/92] 0.40.3 --- .cvsignore | 2 +- intltool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 289455e..1f24e17 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.40.1.tar.bz2 +intltool-0.40.3.tar.bz2 diff --git a/intltool.spec b/intltool.spec index 9cea8d0..6a30fea 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,7 +3,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.40.1 +Version: 0.40.3 Release: 1%{?dist} License: GPLv2 with exception Group: Development/Tools @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Fri Jul 25 2008 Matthias Clasen - 0.40.3-1 +- Update to 0.40.3 + * Mon Jul 21 2008 Matthias Clasen - 0.40.1-1 - Update to 0.40.1 diff --git a/sources b/sources index 66c970e..02ad3e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -18a75ec5ff9d049c3ef148f1d7b03929 intltool-0.40.1.tar.bz2 +7adee54938b22d32c63ecb5223fd4249 intltool-0.40.3.tar.bz2 From b1ec5fc438a5c13155baf27e6e3a9ab7d5f64449 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 31 Jul 2008 20:29:24 +0000 Subject: [PATCH 18/92] fix license tag --- intltool.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/intltool.spec b/intltool.spec index 6a30fea..d4d3ca4 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,8 +4,8 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.40.3 -Release: 1%{?dist} -License: GPLv2 with exception +Release: 2%{?dist} +License: GPLv2 with exceptions Group: Development/Tools Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2 URL: http://www.gnome.org @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Thu Jul 31 2008 Tom "spot" Callaway - 0.40.3-2 +- fix license tag + * Fri Jul 25 2008 Matthias Clasen - 0.40.3-1 - Update to 0.40.3 From b5cc8a4b99ad0b027c371c05aa39f73836cffde3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 6 Aug 2008 05:01:57 +0000 Subject: [PATCH 19/92] Require gettext-devel --- intltool.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/intltool.spec b/intltool.spec index d4d3ca4..ab4cbc9 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.40.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 with exceptions Group: Development/Tools Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2 @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: patch # for /usr/share/aclocal Requires: automake -Requires: gettext +Requires: gettext-devel Obsoletes: xml-i18n-tools Provides: xml-i18n-tools = 0.11 Requires: perl(XML::Parser) @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Wed Aug 6 2008 Matthias Clasen - 0.40.3-3 +- Require gettext-devel + * Thu Jul 31 2008 Tom "spot" Callaway - 0.40.3-2 - fix license tag From a36aa96d6b51649dae98ce6178abbe0c1b9b162e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 22 Sep 2008 01:52:35 +0000 Subject: [PATCH 20/92] 0.40.4 --- .cvsignore | 2 +- intltool.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1f24e17..af93886 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.40.3.tar.bz2 +intltool-0.40.4.tar.bz2 diff --git a/intltool.spec b/intltool.spec index ab4cbc9..f47b19c 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,8 +3,8 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.40.3 -Release: 3%{?dist} +Version: 0.40.4 +Release: 1%{?dist} License: GPLv2 with exceptions Group: Development/Tools Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2 @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Sun Sep 21 2008 Matthias Clasen - 0.40.4-1 +- Update to 0.40.4 + * Wed Aug 6 2008 Matthias Clasen - 0.40.3-3 - Require gettext-devel diff --git a/sources b/sources index 02ad3e9..7a9e947 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7adee54938b22d32c63ecb5223fd4249 intltool-0.40.3.tar.bz2 +585a134f8e0ab0f5cad31cc586d3fa6d intltool-0.40.4.tar.bz2 From 4b3b04a18810c1c32893f76021195c4d84675500 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 19 Oct 2008 14:05:06 +0000 Subject: [PATCH 21/92] 0.40.5 --- .cvsignore | 2 +- intltool.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index af93886..83f51c1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.40.4.tar.bz2 +intltool-0.40.5.tar.bz2 diff --git a/intltool.spec b/intltool.spec index f47b19c..6ad7fde 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,7 +3,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.40.4 +Version: 0.40.5 Release: 1%{?dist} License: GPLv2 with exceptions Group: Development/Tools @@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Sun Oct 19 2008 Matthias Clasen - 0.40.5-1 +- Update to 0.40.5 + * Sun Sep 21 2008 Matthias Clasen - 0.40.4-1 - Update to 0.40.4 diff --git a/sources b/sources index 7a9e947..f0ef486 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -585a134f8e0ab0f5cad31cc586d3fa6d intltool-0.40.4.tar.bz2 +3e7ded6f50d88cf8b8bb505eaf591775 intltool-0.40.5.tar.bz2 From 826ae26bc0e7e56ff034ec2a3d7dbeb93f871613 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 12 Feb 2009 23:41:02 +0000 Subject: [PATCH 22/92] turn noarch` --- intltool.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 6ad7fde..b50a4b6 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,12 +4,13 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.40.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: Development/Tools Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2 URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch Requires: patch # for /usr/share/aclocal Requires: automake @@ -50,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Thu Feb 12 2009 Matthias Clasen - 0.40.5-2 +- turn noarch + * Sun Oct 19 2008 Matthias Clasen - 0.40.5-1 - Update to 0.40.5 From 6e8adae7b1ab5a3b6042d3f35466db4af5b5c712 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 07:32:58 +0000 Subject: [PATCH 23/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index b50a4b6..9d37753 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.40.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 with exceptions Group: Development/Tools Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2 @@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 0.40.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Thu Feb 12 2009 Matthias Clasen - 0.40.5-2 - turn noarch From 65fc15feb600f8ead412f570bcacd2945259b99d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 16 Mar 2009 04:07:00 +0000 Subject: [PATCH 24/92] 0.40.6 --- .cvsignore | 2 +- intltool.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 83f51c1..a6c88f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.40.5.tar.bz2 +intltool-0.40.6.tar.bz2 diff --git a/intltool.spec b/intltool.spec index 9d37753..5b80f05 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,13 +3,13 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.40.5 -Release: 3%{?dist} +Version: 0.40.6 +Release: 1%{?dist} License: GPLv2 with exceptions Group: Development/Tools Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2 URL: http://www.gnome.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: patch # for /usr/share/aclocal @@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Mon Mar 16 2009 Matthias Clasen - 0.40.6-1 +- Update to 0.40.6 + * Tue Feb 24 2009 Fedora Release Engineering - 0.40.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index f0ef486..bd1a124 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e7ded6f50d88cf8b8bb505eaf591775 intltool-0.40.5.tar.bz2 +69bc0353323112f42ad4f9cf351bc3e5 intltool-0.40.6.tar.bz2 From e696ee55a9d4b21f940b720d5ca6325d0d1e788b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 27 Apr 2009 17:10:31 +0000 Subject: [PATCH 25/92] Don't merge translations back into GConf schemas --- intltool.spec | 10 ++- schemas-merge.patch | 153 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 schemas-merge.patch diff --git a/intltool.spec b/intltool.spec index 5b80f05..c833291 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.40.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: Development/Tools Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2 @@ -20,6 +20,8 @@ Provides: xml-i18n-tools = 0.11 Requires: perl(XML::Parser) BuildRequires: perl(XML::Parser) BuildRequires: gettext +# http://bugzilla.gnome.org/show_bug.cgi?id=568845 +Patch0: schemas-merge.patch %description This tool automatically extracts translatable strings from oaf, glade, @@ -28,11 +30,12 @@ them in the po files. %prep %setup -q +%patch0 -p1 -b .schemas-merge %build %configure -make +make %install rm -rf $RPM_BUILD_ROOT @@ -51,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Mon Apr 27 2009 Matthias Clasen - 0.40.6-2 +- Don't merge translations back into GConf schemas + * Mon Mar 16 2009 Matthias Clasen - 0.40.6-1 - Update to 0.40.6 diff --git a/schemas-merge.patch b/schemas-merge.patch new file mode 100644 index 0000000..caa1e3c --- /dev/null +++ b/schemas-merge.patch @@ -0,0 +1,153 @@ +diff -up intltool-0.40.6/intltool-merge.in.schemas intltool-0.40.6/intltool-merge.in +--- intltool-0.40.6/intltool-merge.in.schemas 2009-02-14 17:12:28.000000000 -0500 ++++ intltool-0.40.6/intltool-merge.in 2009-04-27 01:41:11.099450891 -0400 +@@ -38,8 +38,9 @@ my $PACKAGE = "@PACKAGE@"; + my $VERSION = "@VERSION@"; + + ## Loaded modules +-use strict; ++use strict; + use Getopt::Long; ++use Cwd; + use Text::Wrap; + use File::Basename; + use Encode; +@@ -68,6 +69,9 @@ my $PASS_THROUGH_ARG = 0; + my $UTF8_ARG = 0; + my $MULTIPLE_OUTPUT = 0; + my $cache_file; ++my $GETTEXT_PACKAGE = ""; ++my %varhash = (); ++my $SRCDIR = $ENV{"srcdir"} || "."; + + ## Handle options + GetOptions +@@ -87,7 +91,8 @@ GetOptions + "pass-through|p" => \$PASS_THROUGH_ARG, + "utf8|u" => \$UTF8_ARG, + "multiple-output|m" => \$MULTIPLE_OUTPUT, +- "cache|c=s" => \$cache_file ++ "cache|c=s" => \$cache_file, ++ "gettext-package|g=s" => \$GETTEXT_PACKAGE + ) or &error; + + my $PO_DIR; +@@ -103,6 +108,8 @@ my $w = "[-A-Za-z0-9._:]"; + # XML quoted string contents + my $q = "[^\\\"]*"; + ++my $MODULE = $GETTEXT_PACKAGE || FindPackageName() || "unknown"; ++ + ## Check for options. + + if ($VERSION_ARG) +@@ -216,6 +223,8 @@ Other options: + a single file containing all localized elements + -c, --cache=FILE specify cache file name + (usually \$top_builddir/po/.intltool-merge-cache) ++ -g, --gettext-package=NAME ++ specify gettext domain, needed for --schemas-style + -q, --quiet suppress most messages + --help display this help and exit + --version output version information and exit +@@ -241,6 +250,25 @@ sub print_message + } + + ++sub FindPackageName ++{ ++ my $name = ""; ++ ++ my $conf_source; { ++ local (*IN); ++ open (IN, "; ++ close IN; ++ } ++ ++ $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE = \[?([^\n\]]+)/m; ++ ++ return $name if $name; ++} ++ ++ + sub preparation + { + $PO_DIR = $ARGV[0]; +@@ -1246,50 +1274,41 @@ sub schemas_merge_translations + my $short_string = $9 ? $9 : ''; + my $long_string = $12 ? $12 : ''; + +- print OUTPUT "$locale_start_spaces$c_default_block"; +- + $default_string =~ s/\s+/ /g; +- $default_string = entity_decode($default_string); + $short_string =~ s/\s+/ /g; +- $short_string = entity_decode($short_string); + $long_string =~ s/\s+/ /g; +- $long_string = entity_decode($long_string); + +- for my $lang (sort keys %po_files_by_lang) +- { +- my $default_translation = $translations{$lang, $default_string}; +- my $short_translation = $translations{$lang, $short_string}; +- my $long_translation = $translations{$lang, $long_string}; +- +- next if (!$default_translation && !$short_translation && +- !$long_translation); +- +- print OUTPUT "\n$locale_start_spaces"; ++ print OUTPUT "$locale_start_spaces$MODULE"; + ++ print OUTPUT "$locale_start_spaces"; + print OUTPUT "$default_spaces"; +- +- if ($default_translation) +- { +- $default_translation = entity_encode($default_translation); +- print OUTPUT "$default_translation"; ++ if ($default_string) { ++ print OUTPUT "$default_string"; + } ++ print OUTPUT "$short_spaces"; ++ if ($short_string) { ++ print OUTPUT "$short_string"; ++ } ++ print OUTPUT "$long_spaces"; ++ if ($long_string) { ++ print OUTPUT "$long_string"; ++ } ++ print OUTPUT "$locale_end_spaces"; + +- print OUTPUT "$short_spaces"; ++ $default_string = entity_decode($default_string); ++ $short_string = entity_decode($short_string); ++ $long_string = entity_decode($long_string); + +- if ($short_translation) +- { +- $short_translation = entity_encode($short_translation); +- print OUTPUT "$short_translation"; +- } ++ for my $lang (sort keys %po_files_by_lang) ++ { ++ my $default_translation = $translations{$lang, $default_string}; + +- print OUTPUT "$long_spaces"; ++ next if (!$default_translation || ($default_translation eq $default_string)); + +- if ($long_translation) +- { +- $long_translation = entity_encode($long_translation); +- print OUTPUT "$long_translation"; +- } ++ $default_translation = entity_encode($default_translation); + ++ print OUTPUT "\n$locale_start_spaces"; ++ print OUTPUT "$default_spaces$default_translation"; + print OUTPUT "$locale_end_spaces"; + } + } +diff -up intltool-0.40.6/tests/results/test.schemas intltool-0.40.6/tests/results/test From 1c7c1e6257be2eda471de57dd4a451b200c6c0ba Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 03:27:46 +0000 Subject: [PATCH 26/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index c833291..2a5a37a 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.40.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 with exceptions Group: Development/Tools Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2 @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.40.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Apr 27 2009 Matthias Clasen - 0.40.6-2 - Don't merge translations back into GConf schemas From 776c32caf3088b61a0ce5f8db404c10b7f1cfb59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 10 Aug 2009 08:46:37 +0000 Subject: [PATCH 27/92] - Convert specfile to UTF-8. --- intltool.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/intltool.spec b/intltool.spec index 2a5a37a..9a75776 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.40.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 with exceptions Group: Development/Tools Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2 @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Mon Aug 10 2009 Ville Skyttä - 0.40.6-4 +- Convert specfile to UTF-8. + * Fri Jul 24 2009 Fedora Release Engineering - 0.40.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild @@ -279,7 +282,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Aug 8 2001 Jonathan Blandford - Fix bug #45699 and #50634 by upgrading version. -* Mon Jul 16 2001 Trond Eivind Glomsrød +* Mon Jul 16 2001 Trond Eivind Glomsrød - s/Copyright/License/ - Shorter summary - Remove empty post/postun scripts From 6ded7c26a931c0e867d2dfa04be1c3c994f299a0 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 12 Aug 2009 14:30:36 +0000 Subject: [PATCH 28/92] 0.41.0 --- .cvsignore | 2 +- intltool.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index a6c88f7..22e6cec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.40.6.tar.bz2 +intltool-0.41.0.tar.gz diff --git a/intltool.spec b/intltool.spec index 9a75776..80706c4 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,11 +3,11 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.40.6 -Release: 4%{?dist} +Version: 0.41.0 +Release: 1%{?dist} License: GPLv2 with exceptions Group: Development/Tools -Source: http://download.gnome.org/sources/intltool/0.40/%{name}-%{version}.tar.bz2 +Source: http://edge.launchpad.net/intltool/trunk/0.41.0/+download/intltool-%{version}.tar.gz URL: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Wed Aug 12 2009 Matthias Clasen - 0.41.0-1 +- Update to 0.41.0 + * Mon Aug 10 2009 Ville Skyttä - 0.40.6-4 - Convert specfile to UTF-8. diff --git a/sources b/sources index bd1a124..3c5cfea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69bc0353323112f42ad4f9cf351bc3e5 intltool-0.40.6.tar.bz2 +8a6e4afd3fc93637dcd70e36ab899364 intltool-0.41.0.tar.gz From 711198187ea91b347d7fc37694dbfeac339e5aab Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 12 Aug 2009 14:44:56 +0000 Subject: [PATCH 29/92] Fix file list --- intltool.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 80706c4..1d33177 100644 --- a/intltool.spec +++ b/intltool.spec @@ -47,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc AUTHORS COPYING NEWS README +%doc AUTHORS COPYING README %{_bindir}/* %{_datadir}/intltool %{_datadir}/aclocal/* From c96a2834a878ee561b40563ec3d2bf642accf78b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:40:39 +0000 Subject: [PATCH 30/92] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d0673ed..5c84add 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: intltool -# $Id: Makefile,v 1.1 2004/09/09 06:17:57 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:53:06 notting Exp $ NAME := intltool SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 501a9101e46b6ec6247e26af4e91e397ce059885 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 29 Mar 2010 00:48:10 +0000 Subject: [PATCH 31/92] 0.41.1 --- .cvsignore | 2 +- intltool.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 22e6cec..7d02837 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -intltool-0.41.0.tar.gz +intltool-0.41.1.tar.gz diff --git a/intltool.spec b/intltool.spec index 1d33177..728a083 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,13 +3,13 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.41.0 +Version: 0.41.1 Release: 1%{?dist} License: GPLv2 with exceptions Group: Development/Tools -Source: http://edge.launchpad.net/intltool/trunk/0.41.0/+download/intltool-%{version}.tar.gz +#VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk +Source: http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-%{version}.tar.gz URL: http://www.gnome.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: patch # for /usr/share/aclocal @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Sun Mar 28 2010 Matthias Clasen - 0.41.1-1 +- Update to 0.41.1 + * Wed Aug 12 2009 Matthias Clasen - 0.41.0-1 - Update to 0.41.0 diff --git a/sources b/sources index 3c5cfea..0b472ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a6e4afd3fc93637dcd70e36ab899364 intltool-0.41.0.tar.gz +d6c91bf06681919ccfdf3624035b75dc intltool-0.41.1.tar.gz From 17532f457a195ac624b65a515a77ddaf6f9eafae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:20:20 +0000 Subject: [PATCH 32/92] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 6 ------ branch | 1 - 3 files changed, 7 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a3ab0df..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Makefile for source rpm: intltool -# $Id$ -NAME := intltool -SPECFILE = $(firstword $(wildcard *.spec)) - -include ../common/Makefile.common diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7 From 0db2eae7eac38ae3ac06f27447cbe02aedb3cff3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:20:30 +0000 Subject: [PATCH 33/92] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 5c84add..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: intltool -# $Id: Makefile,v 1.2 2007/10/15 18:53:06 notting Exp $ -NAME := intltool -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 343f998aa737cb74e1be30a5f64e9f12596f7a99 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 06:47:04 -0600 Subject: [PATCH 34/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 728a083..acaaef4 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.41.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 0.41.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Mar 28 2010 Matthias Clasen - 0.41.1-1 - Update to 0.41.1 From 4a6c5276b861ec9ac4403945ad5c87b33089cdfd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 20 Dec 2011 12:43:54 -0500 Subject: [PATCH 35/92] 0.50.0 --- .gitignore | 1 + intltool.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7d02837..fcc2faf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ intltool-0.41.1.tar.gz +/intltool-0.50.0.tar.gz diff --git a/intltool.spec b/intltool.spec index acaaef4..18aef4a 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,12 +3,12 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.41.1 -Release: 2%{?dist} +Version: 0.50.0 +Release: 1%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk -Source: http://edge.launchpad.net/intltool/trunk/0.41.1/+download/intltool-%{version}.tar.gz +Source: http://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz URL: http://www.gnome.org BuildArch: noarch Requires: patch @@ -21,7 +21,10 @@ Requires: perl(XML::Parser) BuildRequires: perl(XML::Parser) BuildRequires: gettext # http://bugzilla.gnome.org/show_bug.cgi?id=568845 -Patch0: schemas-merge.patch +# Dropping this patch per the last comment on that thread: +# Martin Pitt: As the reporter of the bug I close this, as the new API du jour is gsettings, +# which has a sensible gettext integration. +#Patch0: schemas-merge.patch %description This tool automatically extracts translatable strings from oaf, glade, @@ -30,7 +33,6 @@ them in the po files. %prep %setup -q -%patch0 -p1 -b .schemas-merge %build %configure @@ -54,6 +56,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Tue Dec 20 2011 Alon Levy +- Update to 0.50.0 +- Drop patch carried for bz#568845 (schemas-merge) per last comment + in that bug. + * Wed Feb 09 2011 Fedora Release Engineering - 0.41.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 0b472ee..ac04b34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d6c91bf06681919ccfdf3624035b75dc intltool-0.41.1.tar.gz +0da9847a60391ca653df35123b1f7cc0 intltool-0.50.0.tar.gz From 04ddc6b422752937ea95a9dca1409bb8ae4c2ddb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 23:54:23 -0600 Subject: [PATCH 36/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 18aef4a..91ca0b9 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.50.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.50.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Dec 20 2011 Alon Levy - Update to 0.50.0 - Drop patch carried for bz#568845 (schemas-merge) per last comment From e6493f503005cc55d69e010d86c93ec4eee3dda4 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 6 Apr 2012 07:14:27 -0500 Subject: [PATCH 37/92] Update, review fixes. --- intltool.spec | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/intltool.spec b/intltool.spec index 91ca0b9..c7876b3 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,8 +3,8 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.50.0 -Release: 2%{?dist} +Version: 0.50.2 +Release: 1%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -14,12 +14,12 @@ BuildArch: noarch Requires: patch # for /usr/share/aclocal Requires: automake -Requires: gettext-devel -Obsoletes: xml-i18n-tools -Provides: xml-i18n-tools = 0.11 +Requires: gettext +#Obsoletes: xml-i18n-tools +#Provides: xml-i18n-tools = 0.11 Requires: perl(XML::Parser) BuildRequires: perl(XML::Parser) -BuildRequires: gettext +BuildRequires: gettext-devel # http://bugzilla.gnome.org/show_bug.cgi?id=568845 # Dropping this patch per the last comment on that thread: # Martin Pitt: As the reporter of the bug I close this, as the new API du jour is gsettings, @@ -47,6 +47,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT +%check +make check + %files %defattr(-,root,root) %doc AUTHORS COPYING README @@ -56,6 +59,13 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man*/* %changelog +* Fri Apr 06 2012 Jon Ciesla - 0.50.2-1 +- Latest stable release. +- Merge review BZ 225902 fixes: +- Removed Obsoletes/Provides for xml-i18n-tools. +- Swapped gettext/gettext-devel Requires, BuildRequires. +- Added %%check section. + * Fri Jan 13 2012 Fedora Release Engineering - 0.50.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From e275dfa4dfe67517d8afb4d174d515cca0cdfa2f Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 6 Apr 2012 07:14:59 -0500 Subject: [PATCH 38/92] Update, review fixes. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fcc2faf..0c97d8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ intltool-0.41.1.tar.gz /intltool-0.50.0.tar.gz +/intltool-0.50.2.tar.gz diff --git a/sources b/sources index ac04b34..aedd2f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0da9847a60391ca653df35123b1f7cc0 intltool-0.50.0.tar.gz +23fbd879118253cb99aeac067da5f591 intltool-0.50.2.tar.gz From b813c08aef46049d492bdc4e8c631ac789cebf2b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 16 Apr 2012 22:43:51 +0300 Subject: [PATCH 39/92] Clean up previous change and fix Requires/BuildRequires (#225902) --- intltool.spec | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/intltool.spec b/intltool.spec index c7876b3..498be61 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.50.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -14,12 +14,10 @@ BuildArch: noarch Requires: patch # for /usr/share/aclocal Requires: automake -Requires: gettext -#Obsoletes: xml-i18n-tools -#Provides: xml-i18n-tools = 0.11 +Requires: gettext-devel Requires: perl(XML::Parser) BuildRequires: perl(XML::Parser) -BuildRequires: gettext-devel +BuildRequires: gettext # http://bugzilla.gnome.org/show_bug.cgi?id=568845 # Dropping this patch per the last comment on that thread: # Martin Pitt: As the reporter of the bug I close this, as the new API du jour is gsettings, @@ -40,18 +38,12 @@ them in the po files. make %install -rm -rf $RPM_BUILD_ROOT - make install DESTDIR=$RPM_BUILD_ROOT -%clean -rm -rf $RPM_BUILD_ROOT - %check make check %files -%defattr(-,root,root) %doc AUTHORS COPYING README %{_bindir}/* %{_datadir}/intltool @@ -59,6 +51,9 @@ make check %{_mandir}/man*/* %changelog +* Tue Apr 17 2012 Kalev Lember - 0.50.2-2 +- Clean up previous change and fix Requires/BuildRequires (#225902) + * Fri Apr 06 2012 Jon Ciesla - 0.50.2-1 - Latest stable release. - Merge review BZ 225902 fixes: From d873b095e1d2c4344ee348ef7beb79c261594c45 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 09:55:51 -0500 Subject: [PATCH 40/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 498be61..54b155d 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.50.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -51,6 +51,9 @@ make check %{_mandir}/man*/* %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 0.50.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Apr 17 2012 Kalev Lember - 0.50.2-2 - Clean up previous change and fix Requires/BuildRequires (#225902) From b7869ac3e863ea81803e46547f1af8b29009148a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 21 Oct 2012 14:54:07 -0400 Subject: [PATCH 41/92] rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 54b155d..1a869b9 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.50.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -51,6 +51,9 @@ make check %{_mandir}/man*/* %changelog +* Sun Oct 21 2012 Matthias Clasen - 0.50.2-3 +- Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 0.50.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 00c25514bd6b16441f7ac071624d2efd05fd6f71 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 8 Feb 2013 18:18:03 -0500 Subject: [PATCH 42/92] Update url --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 1a869b9..91d0356 100644 --- a/intltool.spec +++ b/intltool.spec @@ -9,7 +9,7 @@ License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: http://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz -URL: http://www.gnome.org +URL: https://launchpad.net/intltool BuildArch: noarch Requires: patch # for /usr/share/aclocal @@ -51,6 +51,9 @@ make check %{_mandir}/man*/* %changelog +* FRi Feb 8 2013 Matthias Clasen - 0.50.2-4 +- Update url (#908562) + * Sun Oct 21 2012 Matthias Clasen - 0.50.2-3 - Rebuild From f51b44cfbebd5552dda3b8d66d0a67a683622d78 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 8 Feb 2013 18:20:36 -0500 Subject: [PATCH 43/92] fix spec --- intltool.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 91d0356..fe6b531 100644 --- a/intltool.spec +++ b/intltool.spec @@ -51,7 +51,7 @@ make check %{_mandir}/man*/* %changelog -* FRi Feb 8 2013 Matthias Clasen - 0.50.2-4 +* Fri Feb 8 2013 Matthias Clasen - 0.50.2-4 - Update url (#908562) * Sun Oct 21 2012 Matthias Clasen - 0.50.2-3 From e7a6957a6b688dd81db23acb0bb993cd9984c0aa Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 8 Feb 2013 18:23:49 -0500 Subject: [PATCH 44/92] bump rev --- intltool.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/intltool.spec b/intltool.spec index fe6b531..7739854 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.50.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -51,7 +51,7 @@ make check %{_mandir}/man*/* %changelog -* Fri Feb 8 2013 Matthias Clasen - 0.50.2-4 +* Fri Feb 8 2013 Matthias Clasen - 0.50.2-5 - Update url (#908562) * Sun Oct 21 2012 Matthias Clasen - 0.50.2-3 From 53c3db3434141307bdad07e1a93672a30afb541a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 24 Jul 2013 11:25:12 +0200 Subject: [PATCH 45/92] Perl 5.18 rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 7739854..95084dc 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.50.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -51,6 +51,9 @@ make check %{_mandir}/man*/* %changelog +* Wed Jul 24 2013 Petr Pisar - 0.50.2-6 +- Perl 5.18 rebuild + * Fri Feb 8 2013 Matthias Clasen - 0.50.2-5 - Update url (#908562) From 1d3e1bd3af795f95734e346971984a84004f4705 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 14:43:53 -0500 Subject: [PATCH 46/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 95084dc..fff2be0 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.50.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -51,6 +51,9 @@ make check %{_mandir}/man*/* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.50.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jul 24 2013 Petr Pisar - 0.50.2-6 - Perl 5.18 rebuild From b6db3477bff59a2f6944bce78948e2266b16bd2e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 17:28:02 -0500 Subject: [PATCH 47/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index fff2be0..06ce739 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.50.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -51,6 +51,9 @@ make check %{_mandir}/man*/* %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 0.50.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 0.50.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 4f50e1926849e8bc7a3ba64cfebe3cd7c3a11294 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 9 Mar 2015 07:46:40 +0000 Subject: [PATCH 48/92] Update to 0.51.0 --- .gitignore | 1 + intltool.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0c97d8b..a6219e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ intltool-0.41.1.tar.gz /intltool-0.50.0.tar.gz /intltool-0.50.2.tar.gz +/intltool-0.51.0.tar.gz diff --git a/intltool.spec b/intltool.spec index 06ce739..5d6fce4 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,8 +3,8 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files -Version: 0.50.2 -Release: 8%{?dist} +Version: 0.51.0 +Release: 1%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -51,6 +51,9 @@ make check %{_mandir}/man*/* %changelog +* Mon Mar 09 2015 David King - 0.51.0-1 +- Update to 0.51.0 + * Sat Jun 07 2014 Fedora Release Engineering - 0.50.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index aedd2f6..147eda4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23fbd879118253cb99aeac067da5f591 intltool-0.50.2.tar.gz +12e517cac2b57a0121cda351570f1e63 intltool-0.51.0.tar.gz From a09bce0041f162825ccb58ea2114af366b846c93 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 9 Mar 2015 07:47:20 +0000 Subject: [PATCH 49/92] Use license macro for COPYING https://fedoraproject.org/wiki/Packaging:LicensingGuidelines#License_Text --- intltool.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 5d6fce4..50ec79b 100644 --- a/intltool.spec +++ b/intltool.spec @@ -44,7 +44,8 @@ make install DESTDIR=$RPM_BUILD_ROOT make check %files -%doc AUTHORS COPYING README +%doc AUTHORS README +%license COPYING %{_bindir}/* %{_datadir}/intltool %{_datadir}/aclocal/* @@ -53,6 +54,7 @@ make check %changelog * Mon Mar 09 2015 David King - 0.51.0-1 - Update to 0.51.0 +- Use license macro for COPYING * Sat Jun 07 2014 Fedora Release Engineering - 0.50.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 67ddffdeae8748d5199fef6c4243e82ad6e9a53f Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 9 Mar 2015 07:51:16 +0000 Subject: [PATCH 50/92] Preserve timestamps during install https://fedoraproject.org/wiki/Packaging:Guidelines#Timestamps --- intltool.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 50ec79b..92d91dc 100644 --- a/intltool.spec +++ b/intltool.spec @@ -38,7 +38,7 @@ them in the po files. make %install -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %check make check @@ -55,6 +55,7 @@ make check * Mon Mar 09 2015 David King - 0.51.0-1 - Update to 0.51.0 - Use license macro for COPYING +- Preserve timestamps during install * Sat Jun 07 2014 Fedora Release Engineering - 0.50.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 4da29b5efc3dd9f3b8eec55efdfed59bde65e8cb Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 9 Mar 2015 07:53:53 +0000 Subject: [PATCH 51/92] Use parallel make flags https://fedoraproject.org/wiki/Packaging:Guidelines#Parallel_make --- intltool.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 92d91dc..ec73c34 100644 --- a/intltool.spec +++ b/intltool.spec @@ -35,7 +35,7 @@ them in the po files. %build %configure -make +make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" @@ -56,6 +56,7 @@ make check - Update to 0.51.0 - Use license macro for COPYING - Preserve timestamps during install +- Use parallel make flags * Sat Jun 07 2014 Fedora Release Engineering - 0.50.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From a7003b6b6e41868e2c9ecd8a041b8891c6715921 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 9 Mar 2015 07:55:52 +0000 Subject: [PATCH 52/92] Update man page glob in files section Additionally, be more specific with other globs. https://fedoraproject.org/wiki/Packaging:Guidelines#Manpages --- intltool.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/intltool.spec b/intltool.spec index ec73c34..dc4ae32 100644 --- a/intltool.spec +++ b/intltool.spec @@ -46,10 +46,10 @@ make check %files %doc AUTHORS README %license COPYING -%{_bindir}/* +%{_bindir}/intltool* %{_datadir}/intltool -%{_datadir}/aclocal/* -%{_mandir}/man*/* +%{_datadir}/aclocal/intltool.m4 +%{_mandir}/man8/intltool*.8* %changelog * Mon Mar 09 2015 David King - 0.51.0-1 @@ -57,6 +57,7 @@ make check - Use license macro for COPYING - Preserve timestamps during install - Use parallel make flags +- Update man page glob in files section * Sat Jun 07 2014 Fedora Release Engineering - 0.50.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 741ed7a488651fe9d02e97fae55bd251417a7fa3 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 9 Mar 2015 08:07:39 +0000 Subject: [PATCH 53/92] Fix bogus dates in changelog --- intltool.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/intltool.spec b/intltool.spec index dc4ae32..0899b95 100644 --- a/intltool.spec +++ b/intltool.spec @@ -345,8 +345,8 @@ make check * Tue Apr 17 2001 Jonathan Blandford - Cleaned up spec file a little for Red Hat. -* Mon Mar 01 2001 Maciej Stachowiak +* Thu Mar 01 2001 Maciej Stachowiak - removed devel subpackage -* Thu Jan 04 2000 Robin * Slomkowski +* Tue Jan 04 2000 Robin * Slomkowski - created this thing From a91a69c37dcbcef2d6fc812e0238f65f355dcf05 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 11:27:21 +0000 Subject: [PATCH 54/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 0899b95..b29d32d 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -52,6 +52,9 @@ make check %{_mandir}/man8/intltool*.8* %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.51.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Mar 09 2015 David King - 0.51.0-1 - Update to 0.51.0 - Use license macro for COPYING From 151857f77eadb7294d82729af3aa15b9123b5718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Mon, 13 Jul 2015 17:05:03 +0200 Subject: [PATCH 55/92] Add intltool-0.51.0-perl-5.22.patch (Address RHBZ#1233444) - Remove unnecessary %debug_package. --- intltool-0.51.0-perl-5.22.patch | 44 +++++++++++++++++++++++++++++++++ intltool.spec | 11 ++++++--- 2 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 intltool-0.51.0-perl-5.22.patch diff --git a/intltool-0.51.0-perl-5.22.patch b/intltool-0.51.0-perl-5.22.patch new file mode 100644 index 0000000..be672d0 --- /dev/null +++ b/intltool-0.51.0-perl-5.22.patch @@ -0,0 +1,44 @@ +diff -Naur intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in +--- intltool-0.51.0.orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100 ++++ intltool-0.51.0/intltool-update.in 2015-06-19 01:52:07.171228154 +0200 +@@ -1062,7 +1062,7 @@ + } + } + +- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; +@@ -1190,10 +1190,10 @@ + $name =~ s/\(+$//g; + $version =~ s/\(+$//g; + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); + } + + if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m) +@@ -1219,11 +1219,11 @@ + $version =~ s/\(+$//g; + $bugurl =~ s/\(+$//g if (defined $bugurl); + +- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/); +- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/); +- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/); +- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/); +- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/); ++ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/); ++ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/); ++ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/); ++ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/); ++ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/); + } + + # \s makes this not work, why? diff --git a/intltool.spec b/intltool.spec index b29d32d..f989993 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,10 +1,7 @@ -# debuginfo not needed -%define debug_package %{nil} - Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -23,6 +20,7 @@ BuildRequires: gettext # Martin Pitt: As the reporter of the bug I close this, as the new API du jour is gsettings, # which has a sensible gettext integration. #Patch0: schemas-merge.patch +Patch1: intltool-0.51.0-perl-5.22.patch %description This tool automatically extracts translatable strings from oaf, glade, @@ -31,6 +29,7 @@ them in the po files. %prep %setup -q +%patch1 -p1 %build %configure @@ -52,6 +51,10 @@ make check %{_mandir}/man8/intltool*.8* %changelog +* Mon Jul 13 2015 Ralf Corsépius - 0.51.0-3 +- Add intltool-0.51.0-perl-5.22.patch (Address RHBZ#1233444) +- Remove unnecessary %%debug_package. + * Wed Jun 17 2015 Fedora Release Engineering - 0.51.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From f0b91355afb6b9d0bdc52c489b8b6a1ce4e78ab4 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 12 Oct 2015 10:43:51 -0400 Subject: [PATCH 56/92] Add patch to hopefully close race condition in systemd builds - Related to https://bugzilla.redhat.com/show_bug.cgi?id=1249051 --- ...l-merge-Create-cache-file-atomically.patch | 38 +++++++++++++++++++ intltool.spec | 10 ++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 intltool-merge-Create-cache-file-atomically.patch diff --git a/intltool-merge-Create-cache-file-atomically.patch b/intltool-merge-Create-cache-file-atomically.patch new file mode 100644 index 0000000..677ea45 --- /dev/null +++ b/intltool-merge-Create-cache-file-atomically.patch @@ -0,0 +1,38 @@ +From d328542bea50b9445c63cdf2454052392282a1ce Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Thu, 8 Oct 2015 16:25:47 -0400 +Subject: [PATCH] intltool-merge: Create cache file atomically + +It's going to be relatively common for build systems operating in +parallel to run multiple copies of `intltool-merge`, yet the cache +file is not created atomically (i.e. with the "open .tmp file and +rename()" dance). + +I suspect (but have not yet determined conclusively) this is the cause +of some systemd build issues where translations don't appear in the +merged file. + +Regardless, this patch can't hurt. +--- + intltool-merge.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/intltool-merge.in b/intltool-merge.in +index 1afa2a4..d1eba8f 100644 +--- a/intltool-merge.in ++++ b/intltool-merge.in +@@ -371,9 +371,10 @@ sub create_cache + + &create_translation_database; + +- open CACHE, ">$cache_file" || die; ++ open CACHE, ">$cache_file" . ".tmp" || die; + print CACHE join "\x01", %translations; + close CACHE; ++ rename("$cache_file" . ".tmp", "$cache_file"); + } + + sub load_cache +-- +1.8.3.1 + diff --git a/intltool.spec b/intltool.spec index f989993..7a7b189 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -21,6 +21,9 @@ BuildRequires: gettext # which has a sensible gettext integration. #Patch0: schemas-merge.patch Patch1: intltool-0.51.0-perl-5.22.patch +# https://bugs.launchpad.net/intltool/+bug/1505260 +# https://bugzilla.redhat.com/show_bug.cgi?id=1249051 +Patch2: intltool-merge-Create-cache-file-atomically.patch %description This tool automatically extracts translatable strings from oaf, glade, @@ -30,6 +33,7 @@ them in the po files. %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %configure @@ -51,6 +55,10 @@ make check %{_mandir}/man8/intltool*.8* %changelog +* Mon Oct 12 2015 Colin Walters - 0.51.0-4 +- Add patch to hopefully close race condition in systemd builds +- Related to https://bugzilla.redhat.com/show_bug.cgi?id=1249051 + * Mon Jul 13 2015 Ralf Corsépius - 0.51.0-3 - Add intltool-0.51.0-perl-5.22.patch (Address RHBZ#1233444) - Remove unnecessary %%debug_package. From 6261eafeb9344f3725ee899dd49578bebcffc0c7 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 12 Oct 2015 10:57:13 -0400 Subject: [PATCH 57/92] Add patch to hopefully close race condition in systemd builds - Related to https://bugzilla.redhat.com/show_bug.cgi?id=1249051 - And the test suite is failing but the logs are hidden under test-suite.log, so copy some code I had in dbus.spec to cat them. --- intltool.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 7a7b189..ab5c6d1 100644 --- a/intltool.spec +++ b/intltool.spec @@ -44,7 +44,13 @@ make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %check -make check +if ! make check; then + find . -type f -name 'test-suite.log' | while read trs; do + echo "BEGIN " ${trs}; cat ${trs} 1>&2; + done + echo "Exiting abnormally due to make check failure above" 1>&2 + exit 1 +fi %files %doc AUTHORS README @@ -58,6 +64,8 @@ make check * Mon Oct 12 2015 Colin Walters - 0.51.0-4 - Add patch to hopefully close race condition in systemd builds - Related to https://bugzilla.redhat.com/show_bug.cgi?id=1249051 +- And the test suite is failing but the logs are hidden under + test-suite.log, so copy some code I had in dbus.spec to cat them. * Mon Jul 13 2015 Ralf Corsépius - 0.51.0-3 - Add intltool-0.51.0-perl-5.22.patch (Address RHBZ#1233444) From 3e410e54fa6297ed977e3972ef988e499f9af99c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 00:34:07 +0000 Subject: [PATCH 58/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index ab5c6d1..d215e39 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -61,6 +61,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.51.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Oct 12 2015 Colin Walters - 0.51.0-4 - Add patch to hopefully close race condition in systemd builds - Related to https://bugzilla.redhat.com/show_bug.cgi?id=1249051 From 9fb2fcc791c748f036d6e21bfb2737dea68d40f9 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 16 Feb 2016 11:44:23 -0600 Subject: [PATCH 59/92] Depend on perl(Getopt::Long) (#1307638) --- intltool.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index d215e39..ca9a50d 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -12,7 +12,9 @@ Requires: patch # for /usr/share/aclocal Requires: automake Requires: gettext-devel +Requires: perl(Getopt::Long) Requires: perl(XML::Parser) +BuildRequires: perl(Getopt::Long) BuildRequires: perl(XML::Parser) BuildRequires: gettext # http://bugzilla.gnome.org/show_bug.cgi?id=568845 @@ -61,6 +63,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Tue Feb 16 2016 Yaakov Selkowitz - 0.51.0-6 +- Depend on perl(Getopt::Long) (#1307638) + * Thu Feb 04 2016 Fedora Release Engineering - 0.51.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 4f34106a98789ee18472dfe9915311e3417687f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 10:30:02 +0200 Subject: [PATCH 60/92] Mandatory Perl build-requires added --- intltool.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/intltool.spec b/intltool.spec index ca9a50d..9854204 100644 --- a/intltool.spec +++ b/intltool.spec @@ -14,6 +14,7 @@ Requires: automake Requires: gettext-devel Requires: perl(Getopt::Long) Requires: perl(XML::Parser) +BuildRequires: perl-generators BuildRequires: perl(Getopt::Long) BuildRequires: perl(XML::Parser) BuildRequires: gettext From 6c129f09a92cbfed0d449cfb30882ed7cad0aa9b Mon Sep 17 00:00:00 2001 From: raveit65 Date: Fri, 29 Jul 2016 14:22:30 +0200 Subject: [PATCH 61/92] fix usage of distcheck for some packages rhbz (#1318674) --- intltool.spec | 8 +++++++- intltool_distcheck-fix.patch | 30 ++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 intltool_distcheck-fix.patch diff --git a/intltool.spec b/intltool.spec index 9854204..aef01de 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -27,6 +27,8 @@ Patch1: intltool-0.51.0-perl-5.22.patch # https://bugs.launchpad.net/intltool/+bug/1505260 # https://bugzilla.redhat.com/show_bug.cgi?id=1249051 Patch2: intltool-merge-Create-cache-file-atomically.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1318674 +Patch3: intltool_distcheck-fix.patch %description This tool automatically extracts translatable strings from oaf, glade, @@ -37,6 +39,7 @@ them in the po files. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure @@ -64,6 +67,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Fri Jul 29 2016 Wolfgang Ulbrich - 0.51.0-7 +- fix usage of distcheck for some packages rhbz (#1318674) + * Tue Feb 16 2016 Yaakov Selkowitz - 0.51.0-6 - Depend on perl(Getopt::Long) (#1307638) diff --git a/intltool_distcheck-fix.patch b/intltool_distcheck-fix.patch new file mode 100644 index 0000000..6e7f198 --- /dev/null +++ b/intltool_distcheck-fix.patch @@ -0,0 +1,30 @@ +diff -upr intltool-0.51.0-orig/intltool-update.in intltool-0.51.0/intltool-update.in +--- intltool-0.51.0-orig/intltool-update.in 2016-07-29 14:08:06.276987000 +0200 ++++ intltool-0.51.0/intltool-update.in 2016-07-29 14:11:09.562126918 +0200 +@@ -620,6 +620,14 @@ sub FindLeftoutFiles + + my @result; + ++ # If the builddir is a subdir of srcdir, the list of files found will be prefixed with ++ # an additional prefix (e.g. "_build/sub" for automake 1.15 make distcheck). Try to ++ # handle that, by removing those matches as well. ++ my $absbuilddir = Cwd::abs_path("..\/"); ++ my $abssrcdir = Cwd::abs_path("$SRCDIR/.."); ++ # Check if builddir is a subdir of srcdir ++ my ($abspath,$relpath) = split /\s*$abssrcdir\/\s*/, $absbuilddir, 2; ++ + foreach (@buf_allfiles_sorted) + { + my $dummy = $_; +@@ -628,7 +636,10 @@ sub FindLeftoutFiles + $srcdir =~ s#^../##; + $dummy =~ s#^$srcdir/../##; + $dummy =~ s#^$srcdir/##; +- $dummy =~ s#_build/##; ++ if ($relpath) ++ { ++ $dummy =~ s#^$relpath/##; ++ } + if (!exists($in2{$dummy})) + { + push @result, $dummy From 3a547f2885fd2b206c284d16be458837886ab3dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 16:28:24 +0000 Subject: [PATCH 62/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index aef01de..9250bf4 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -67,6 +67,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.51.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jul 29 2016 Wolfgang Ulbrich - 0.51.0-7 - fix usage of distcheck for some packages rhbz (#1318674) From c9d01655e9749b1b307e37250c6472829b37f10c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 13:36:23 +0000 Subject: [PATCH 63/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 9250bf4..432ac5e 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -67,6 +67,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.51.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 0.51.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From f38d92c429e3360d2963ffe59ed82fa5be9a7724 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 8 Aug 2017 13:02:51 +0200 Subject: [PATCH 64/92] Fix intltool-update to work with perl 5.26 Patch taken from Debian's intltool_0.51.0-4.debian.tar.xz https://bugzilla.redhat.com/show_bug.cgi?id=1462217 --- ...tch => intltool-perl5.26-regex-fixes.patch | 23 +++++++++++++++---- intltool.spec | 9 ++++++-- 2 files changed, 26 insertions(+), 6 deletions(-) rename intltool-0.51.0-perl-5.22.patch => intltool-perl5.26-regex-fixes.patch (66%) diff --git a/intltool-0.51.0-perl-5.22.patch b/intltool-perl5.26-regex-fixes.patch similarity index 66% rename from intltool-0.51.0-perl-5.22.patch rename to intltool-perl5.26-regex-fixes.patch index be672d0..234b82b 100644 --- a/intltool-0.51.0-perl-5.22.patch +++ b/intltool-perl5.26-regex-fixes.patch @@ -1,7 +1,15 @@ -diff -Naur intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in ---- intltool-0.51.0.orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100 -+++ intltool-0.51.0/intltool-update.in 2015-06-19 01:52:07.171228154 +0200 -@@ -1062,7 +1062,7 @@ +Description: Escape "{", to prevent complaints from perl 5.22 and 5.26 +Author: Roderich Schupp +Author: gregor herrmann +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788705 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=826471 +Bug-Upstream: https://bugs.launchpad.net/intltool/+bug/1490906 + +Index: intltool-0.51.0/intltool-update.in +=================================================================== +--- intltool-0.51.0.orig/intltool-update.in 2017-07-23 17:24:35.113169465 +0200 ++++ intltool-0.51.0/intltool-update.in 2017-07-23 17:24:35.109169052 +0200 +@@ -1062,13 +1062,13 @@ } } @@ -10,6 +18,13 @@ diff -Naur intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-upda { my $rest = $3; my $untouched = $1; + my $sub = ""; + # Ignore recursive definitions of variables +- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; ++ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/; + + return SubstituteVariable ("$untouched$sub$rest"); + } @@ -1190,10 +1190,10 @@ $name =~ s/\(+$//g; $version =~ s/\(+$//g; diff --git a/intltool.spec b/intltool.spec index 432ac5e..742ad53 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -23,7 +23,9 @@ BuildRequires: gettext # Martin Pitt: As the reporter of the bug I close this, as the new API du jour is gsettings, # which has a sensible gettext integration. #Patch0: schemas-merge.patch -Patch1: intltool-0.51.0-perl-5.22.patch +# Fix intltool-update to work with perl 5.26. Patch taken from +# Debian's intltool_0.51.0-4.debian.tar.xz +Patch1: intltool-perl5.26-regex-fixes.patch # https://bugs.launchpad.net/intltool/+bug/1505260 # https://bugzilla.redhat.com/show_bug.cgi?id=1249051 Patch2: intltool-merge-Create-cache-file-atomically.patch @@ -67,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Tue Aug 08 2017 Kalev Lember - 0.51.0-10 +- Fix intltool-update to work with perl 5.26 (#1462217) + * Wed Jul 26 2017 Fedora Release Engineering - 0.51.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From b892cd3d88c51205bbdd5b2f7ca6959c8d8e7f71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 17:32:11 +0000 Subject: [PATCH 65/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 742ad53..4ca9459 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.51.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Aug 08 2017 Kalev Lember - 0.51.0-10 - Fix intltool-update to work with perl 5.26 (#1462217) From 172e37f706fce416eb87767f56f2e27cc48a8392 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 29 Jun 2018 21:56:47 +0200 Subject: [PATCH 66/92] Perl 5.28 rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 4ca9459..8f5c597 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Fri Jun 29 2018 Jitka Plesnikova - 0.51.0-12 +- Perl 5.28 rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0.51.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From be3bab15dd9c939173acbe7b2f8d2b4a167a831f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 05:45:48 +0000 Subject: [PATCH 67/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 8f5c597..5d07855 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 with exceptions Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.51.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jun 29 2018 Jitka Plesnikova - 0.51.0-12 - Perl 5.28 rebuild From f9a9df7bb7a20b80fb320bccd755132e89a01fcb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:48 +0100 Subject: [PATCH 68/92] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- intltool.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 5d07855..071ab4b 100644 --- a/intltool.spec +++ b/intltool.spec @@ -3,7 +3,6 @@ Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 Release: 13%{?dist} License: GPLv2 with exceptions -Group: Development/Tools #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: http://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz URL: https://launchpad.net/intltool From 65c3401b0a4ff48210394996dea1f7e83b8e57c3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 03:25:56 +0000 Subject: [PATCH 69/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 071ab4b..c79145a 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2 with exceptions #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: http://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -68,6 +68,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.51.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 0.51.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 9bb4acbf17ad85585909eeb2447c4b9b6420b691 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 09:35:31 +0000 Subject: [PATCH 70/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index c79145a..9fc35a1 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2 with exceptions #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: http://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -68,6 +68,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0.51.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0.51.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d8d2ef29fb122a42a6b6678eb1ec97ae56902af2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 05:31:42 +0000 Subject: [PATCH 71/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 9fc35a1..3417c54 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2 with exceptions #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: http://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -68,6 +68,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.51.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 0.51.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 0d47a194dee1f115055287e6463cd0832aabb130 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 01:51:54 +0000 Subject: [PATCH 72/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 3417c54..78043f9 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2 with exceptions #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: http://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -68,6 +68,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.51.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 0.51.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From d8a1f04c3ee8c9a47a2ffec0e3da051f2a16f199 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 19 Dec 2020 00:51:17 +0000 Subject: [PATCH 73/92] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- intltool.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/intltool.spec b/intltool.spec index 78043f9..e8d746c 100644 --- a/intltool.spec +++ b/intltool.spec @@ -17,6 +17,7 @@ BuildRequires: perl-generators BuildRequires: perl(Getopt::Long) BuildRequires: perl(XML::Parser) BuildRequires: gettext +BuildRequires: make # http://bugzilla.gnome.org/show_bug.cgi?id=568845 # Dropping this patch per the last comment on that thread: # Martin Pitt: As the reporter of the bug I close this, as the new API du jour is gsettings, From eb882acfaa9077239303d13fdbd67d436b355a87 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 18 Jan 2021 20:09:43 +0100 Subject: [PATCH 74/92] Spec file cleanup --- intltool.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/intltool.spec b/intltool.spec index e8d746c..fb5b2a7 100644 --- a/intltool.spec +++ b/intltool.spec @@ -4,7 +4,7 @@ Version: 0.51.0 Release: 17%{?dist} License: GPLv2 with exceptions #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk -Source: http://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz +Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz URL: https://launchpad.net/intltool BuildArch: noarch Requires: patch @@ -46,10 +46,10 @@ them in the po files. %build %configure -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install %check if ! make check; then From 7b47346107c5e5ae65e17e1d94287c77d2e3d2b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 14:24:33 +0000 Subject: [PATCH 75/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index fb5b2a7..b7bab7d 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2 with exceptions #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.51.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0.51.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 4e9ae7794881ba270b8b3b56274dc25c06eab1e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 08:38:27 +0000 Subject: [PATCH 76/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index b7bab7d..222a12e 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2 with exceptions #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.51.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.51.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 0225e5122dc979bf031f7bbb575463e013414629 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:21:30 +0000 Subject: [PATCH 77/92] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 222a12e..3552338 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2 with exceptions #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.51.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.51.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f6976018ba2ed945d3cabb5d74de36fa97ca0346 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 14:44:52 +0000 Subject: [PATCH 78/92] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 3552338..30e1645 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2 with exceptions #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.51.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.51.0-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From bf7de626091f68f852f4955ab8dcd37ae0691a78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:14:56 +0000 Subject: [PATCH 79/92] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 30e1645..cefd615 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2 with exceptions #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.51.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0.51.0-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 439bcd68ddcc08e3bb5046444c952a510c1297d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 07:30:59 +0000 Subject: [PATCH 80/92] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index cefd615..74fa25e 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2 with exceptions #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.51.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 0.51.0-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f4fddfbf1a2ae1bfb19f0669ab138c2defa6de7e Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 21 Sep 2023 14:05:26 +0800 Subject: [PATCH 81/92] SPDX migration of license tag --- intltool.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/intltool.spec b/intltool.spec index 74fa25e..593d73c 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,8 +1,8 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 23%{?dist} -License: GPLv2 with exceptions +Release: 24%{?dist} +License: GPL-2.0-or-later WITH Autoconf-exception-generic #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz URL: https://launchpad.net/intltool @@ -39,9 +39,9 @@ them in the po files. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch 1 -p1 +%patch 2 -p1 +%patch 3 -p1 %build %configure @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Thu Sep 21 2023 Jens Petersen - 0.51.0-24 +- SPDX migration of license tag + * Thu Jul 20 2023 Fedora Release Engineering - 0.51.0-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d70d2f0d3d8d9fa2d35c63693c716c92b85edd02 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:11:03 +0000 Subject: [PATCH 82/92] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 593d73c..6130baa 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 24%{?dist} +Release: 25%{?dist} License: GPL-2.0-or-later WITH Autoconf-exception-generic #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 0.51.0-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Sep 21 2023 Jens Petersen - 0.51.0-24 - SPDX migration of license tag From 996a698eb0ea3e9dbb6be78d6db265a656ed66bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 22:49:35 +0000 Subject: [PATCH 83/92] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index 6130baa..c48ac3d 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 25%{?dist} +Release: 26%{?dist} License: GPL-2.0-or-later WITH Autoconf-exception-generic #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 0.51.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 0.51.0-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f8d4ee02723e10aabddbd8b0e19eb48d9b803baf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:28:59 +0000 Subject: [PATCH 84/92] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index c48ac3d..890a13a 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 26%{?dist} +Release: 27%{?dist} License: GPL-2.0-or-later WITH Autoconf-exception-generic #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.51.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 0.51.0-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 1abb9454897a2c4dc76be7d8d677dc406b3f20a5 Mon Sep 17 00:00:00 2001 From: matiwari Date: Tue, 6 Aug 2024 23:45:01 +0530 Subject: [PATCH 85/92] CI gating tests migration to tmt --- .fmf/version | 1 + intltool.spec | 5 +- plans/basic.fmf | 5 ++ tests/cases/context.xml | 19 ++++++ tests/cases/context.xml.in | 17 +++++ tests/cases/context.xml.in.h | 7 +++ tests/intltool_tests.py | 109 +++++++++++++++++++++++++++++++++ tests/main.fmf | 6 ++ tests/results/context.xml | 19 ++++++ tests/results/context.xml.in.h | 7 +++ tests/test.sh | 25 ++++++++ 11 files changed, 219 insertions(+), 1 deletion(-) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/cases/context.xml create mode 100644 tests/cases/context.xml.in create mode 100644 tests/cases/context.xml.in.h create mode 100644 tests/intltool_tests.py create mode 100644 tests/main.fmf create mode 100644 tests/results/context.xml create mode 100644 tests/results/context.xml.in.h create mode 100755 tests/test.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/intltool.spec b/intltool.spec index 890a13a..b493bb0 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 27%{?dist} +Release: 28%{?dist} License: GPL-2.0-or-later WITH Autoconf-exception-generic #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Tue Aug 6 2024 Manish Tiwari - 0.51.0-28 +- CI gating tests migration to tmt + * Thu Jul 18 2024 Fedora Release Engineering - 0.51.0-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/cases/context.xml b/tests/cases/context.xml new file mode 100644 index 0000000..e21ad0e --- /dev/null +++ b/tests/cases/context.xml @@ -0,0 +1,19 @@ + + + <_name>Foo + + + + <_name msgctxt="1"> +Bar + + + + <_name msgctxt="2"> +Bar + + + + <_name>Baz + + diff --git a/tests/cases/context.xml.in b/tests/cases/context.xml.in new file mode 100644 index 0000000..4b58d97 --- /dev/null +++ b/tests/cases/context.xml.in @@ -0,0 +1,17 @@ + + + <_name>Foo + + + + <_name msgctxt="1">Bar + + + + <_name msgctxt="2">Bar + + + + <_name>Baz + + diff --git a/tests/cases/context.xml.in.h b/tests/cases/context.xml.in.h new file mode 100644 index 0000000..161a65b --- /dev/null +++ b/tests/cases/context.xml.in.h @@ -0,0 +1,7 @@ +char *s = N_("Foo"); +/* This is the comment on the first Bar */ +char *s = C_("1", "Bar"); +/* This is the comment on the second Bar */ +char *s = C_("2", "Bar"); +/* This is the comment on Baz */ +char *s = N_("Baz"); diff --git a/tests/intltool_tests.py b/tests/intltool_tests.py new file mode 100644 index 0000000..4a0ffa2 --- /dev/null +++ b/tests/intltool_tests.py @@ -0,0 +1,109 @@ +#!/usr/bin/python3 + +import logging +import subprocess +from difflib import Differ + +logging.basicConfig(level=logging.INFO) + + +COMMANDS = [ + "intltool-extract", + "intltool-merge" + ] +INPUT_FILE = "cases/context.xml.in" + + +def test_intltool_installation(cmd: str): + """ + Check if intltool is installed correctly + """ + try: + intltool_cmd = subprocess.Popen([cmd], stdout=subprocess.PIPE) + intltool_cmd_execution_response = intltool_cmd.communicate() + assert "Usage" in str(intltool_cmd_execution_response) + except FileNotFoundError: + logging.error(f"Either {cmd} is not installed or not accessible.") + except OSError: + logging.error(f"Some OSError occurred while executing {cmd}") + except AssertionError: + logging.error(f"[CMD] output does not include text: Usage.") + else: + logging.info(f"Execution of {cmd} succeed. Test Passed.") + + +def test_intltool_extract(cmd, input_file): + """ + Check intltool extract behavior + """ + try: + intltool_extract = subprocess.Popen( + [cmd, "--type=gettext/xml", input_file, "--update"], + stdout=subprocess.PIPE) + intltool_extract_execution_response = intltool_extract.communicate() + assert "Wrote" in str(intltool_extract_execution_response) + except AssertionError: + logging.error(f"Writing output file for {input_file} file failed.") + except Exception as e: + logging.error(e) + else: + logging.info(f"Writing output file for {input_file} succeed.") + + comparison_test_pass = True + with open("{}.h".format(input_file)) as output_file, open("results/{}.h".format("context.xml.in")) as refer_file: + differ = Differ() + for line in differ.compare(output_file.readlines(), refer_file.readlines()): + if line.startswith("+") or line.startswith("-"): + comparison_test_pass = False + + try: + assert comparison_test_pass + except AssertionError: + logging.error("Extracted file does NOT match with the result. Test failed.") + else: + logging.info("Extracted file does match with the result. Test passed.") + + +def test_intltool_merge(cmd, input_file): + """ + Check intltool merge behavior + """ + merged_file = "context.xml" + try: + intltool_merge = subprocess.Popen( + [cmd, "-o", "cases", input_file, "cases/{}".format(merged_file)], + stdout=subprocess.PIPE) + intltool_merge_execution_response = intltool_merge.communicate() + assert "Merging" in str(intltool_merge_execution_response) + except AssertionError: + logging.error(f"Writing output file for {input_file} file failed.") + except Exception as e: + logging.error(e) + else: + logging.info(f"Writing output file for {input_file} succeed.") + + comparison_test_pass = True + with open("cases/{}".format(merged_file)) as output_file, open("results/{}".format(merged_file)) as refer_file: + differ = Differ() + for line in differ.compare(output_file.readlines(), refer_file.readlines()): + if line.startswith("+") or line.startswith("-"): + comparison_test_pass = False + + try: + assert comparison_test_pass + except AssertionError: + logging.error("Merged file does NOT match with the result. Test failed.") + else: + logging.info("Merged file does match with the result. Test passed.") + + +if __name__ == "__main__": + """ + Executes test cases + """ + logging.info("Executing test cases for Intltool..") + for CMD in COMMANDS: + test_intltool_installation(CMD) + test_intltool_extract(COMMANDS[0], INPUT_FILE) + test_intltool_merge(COMMANDS[1], INPUT_FILE) + logging.info("Tests execution of Intltool completed!") diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..278bfa9 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,6 @@ +summary: Run intltool test +test: ./test.sh +framework: beakerlib +require: + - intltool + - python3 diff --git a/tests/results/context.xml b/tests/results/context.xml new file mode 100644 index 0000000..e21ad0e --- /dev/null +++ b/tests/results/context.xml @@ -0,0 +1,19 @@ + + + <_name>Foo + + + + <_name msgctxt="1"> +Bar + + + + <_name msgctxt="2"> +Bar + + + + <_name>Baz + + diff --git a/tests/results/context.xml.in.h b/tests/results/context.xml.in.h new file mode 100644 index 0000000..161a65b --- /dev/null +++ b/tests/results/context.xml.in.h @@ -0,0 +1,7 @@ +char *s = N_("Foo"); +/* This is the comment on the first Bar */ +char *s = C_("1", "Bar"); +/* This is the comment on the second Bar */ +char *s = C_("2", "Bar"); +/* This is the comment on Baz */ +char *s = N_("Baz"); diff --git a/tests/test.sh b/tests/test.sh new file mode 100755 index 0000000..35c7015 --- /dev/null +++ b/tests/test.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +PACKAGE="intltool" + +rlJournalStart + rlPhaseStartSetup + rlAssertRpm $PACKAGE + rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory" + rlRun "cp -r cases results intltool_tests.py $TmpDir" + rlRun "pushd $TmpDir" + rlPhaseEnd + + rlPhaseStartTest + rlLog "Run intltool_tests.py" + rlRun "python3 intltool_tests.py" + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $TmpDir" 0 "Removing tmp directory" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd From c582ed6f0315bae2df8b09d8a6af8aaa890e31f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:17:00 +0000 Subject: [PATCH 86/92] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- intltool.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/intltool.spec b/intltool.spec index b493bb0..4a4f73f 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 28%{?dist} +Release: 29%{?dist} License: GPL-2.0-or-later WITH Autoconf-exception-generic #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -69,6 +69,9 @@ fi %{_mandir}/man8/intltool*.8* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.51.0-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Aug 6 2024 Manish Tiwari - 0.51.0-28 - CI gating tests migration to tmt From bee4fe5f9fe407732bc86018baf9435e26e6c4ce Mon Sep 17 00:00:00 2001 From: raveit65 Date: Thu, 27 Feb 2025 23:14:26 +0100 Subject: [PATCH 87/92] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 386 +++++++++++++++++++++++++++++++++++++++++++++++++ intltool.spec | 389 +------------------------------------------------- 2 files changed, 388 insertions(+), 387 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..a9c4410 --- /dev/null +++ b/changelog @@ -0,0 +1,386 @@ +* Fri Jan 17 2025 Fedora Release Engineering - 0.51.0-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Aug 6 2024 Manish Tiwari - 0.51.0-28 +- CI gating tests migration to tmt + +* Thu Jul 18 2024 Fedora Release Engineering - 0.51.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 0.51.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 0.51.0-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Sep 21 2023 Jens Petersen - 0.51.0-24 +- SPDX migration of license tag + +* Thu Jul 20 2023 Fedora Release Engineering - 0.51.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 0.51.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.51.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.51.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.51.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.51.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.51.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.51.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0.51.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 0.51.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.51.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 29 2018 Jitka Plesnikova - 0.51.0-12 +- Perl 5.28 rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 0.51.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Tue Aug 08 2017 Kalev Lember - 0.51.0-10 +- Fix intltool-update to work with perl 5.26 (#1462217) + +* Wed Jul 26 2017 Fedora Release Engineering - 0.51.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0.51.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jul 29 2016 Wolfgang Ulbrich - 0.51.0-7 +- fix usage of distcheck for some packages rhbz (#1318674) + +* Tue Feb 16 2016 Yaakov Selkowitz - 0.51.0-6 +- Depend on perl(Getopt::Long) (#1307638) + +* Thu Feb 04 2016 Fedora Release Engineering - 0.51.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Oct 12 2015 Colin Walters - 0.51.0-4 +- Add patch to hopefully close race condition in systemd builds +- Related to https://bugzilla.redhat.com/show_bug.cgi?id=1249051 +- And the test suite is failing but the logs are hidden under + test-suite.log, so copy some code I had in dbus.spec to cat them. + +* Mon Jul 13 2015 Ralf Corsépius - 0.51.0-3 +- Add intltool-0.51.0-perl-5.22.patch (Address RHBZ#1233444) +- Remove unnecessary %%debug_package. + +* Wed Jun 17 2015 Fedora Release Engineering - 0.51.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Mar 09 2015 David King - 0.51.0-1 +- Update to 0.51.0 +- Use license macro for COPYING +- Preserve timestamps during install +- Use parallel make flags +- Update man page glob in files section + +* Sat Jun 07 2014 Fedora Release Engineering - 0.50.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 0.50.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 24 2013 Petr Pisar - 0.50.2-6 +- Perl 5.18 rebuild + +* Fri Feb 8 2013 Matthias Clasen - 0.50.2-5 +- Update url (#908562) + +* Sun Oct 21 2012 Matthias Clasen - 0.50.2-3 +- Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 0.50.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Apr 17 2012 Kalev Lember - 0.50.2-2 +- Clean up previous change and fix Requires/BuildRequires (#225902) + +* Fri Apr 06 2012 Jon Ciesla - 0.50.2-1 +- Latest stable release. +- Merge review BZ 225902 fixes: +- Removed Obsoletes/Provides for xml-i18n-tools. +- Swapped gettext/gettext-devel Requires, BuildRequires. +- Added %%check section. + +* Fri Jan 13 2012 Fedora Release Engineering - 0.50.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Dec 20 2011 Alon Levy +- Update to 0.50.0 +- Drop patch carried for bz#568845 (schemas-merge) per last comment + in that bug. + +* Wed Feb 09 2011 Fedora Release Engineering - 0.41.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun Mar 28 2010 Matthias Clasen - 0.41.1-1 +- Update to 0.41.1 + +* Wed Aug 12 2009 Matthias Clasen - 0.41.0-1 +- Update to 0.41.0 + +* Mon Aug 10 2009 Ville Skyttä - 0.40.6-4 +- Convert specfile to UTF-8. + +* Fri Jul 24 2009 Fedora Release Engineering - 0.40.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Apr 27 2009 Matthias Clasen - 0.40.6-2 +- Don't merge translations back into GConf schemas + +* Mon Mar 16 2009 Matthias Clasen - 0.40.6-1 +- Update to 0.40.6 + +* Tue Feb 24 2009 Fedora Release Engineering - 0.40.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Feb 12 2009 Matthias Clasen - 0.40.5-2 +- turn noarch + +* Sun Oct 19 2008 Matthias Clasen - 0.40.5-1 +- Update to 0.40.5 + +* Sun Sep 21 2008 Matthias Clasen - 0.40.4-1 +- Update to 0.40.4 + +* Wed Aug 6 2008 Matthias Clasen - 0.40.3-3 +- Require gettext-devel + +* Thu Jul 31 2008 Tom "spot" Callaway - 0.40.3-2 +- fix license tag + +* Fri Jul 25 2008 Matthias Clasen - 0.40.3-1 +- Update to 0.40.3 + +* Mon Jul 21 2008 Matthias Clasen - 0.40.1-1 +- Update to 0.40.1 + +* Tue Jun 3 2008 Matthias Clasen - 0.40.0-1 +- Update to 0.40.0 + +* Mon Feb 25 2008 Matthias Clasen - 0.37.1-1 +- Update to 0.37.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 0.37.0-3 +- Autorebuild for GCC 4.3 + +* Tue Jan 15 2008 Matthias Clasen - 0.37.0-2 +- Require gettext + +* Mon Dec 17 2007 Matthias Clasen - 0.37.0-1 +- Update to 0.37.0 + +* Thu Dec 13 2007 Matthias Clasen - 0.36.3-1 +- Update to 0.36.3 + +* Sun Sep 16 2007 Matthias Clasen - 0.36.2-1 +- Update to 0.36.2 + +* Mon Aug 13 2007 Matthias Clasen - 0.36.1-1 +- Update to 0.36.1 + +* Fri Aug 3 2007 Matthias Clasen - 0.36.0-1 +- Update to 0.36.0 +- Update license field +- Drop patch rejected, obsolete and upstreamed patches +- Some spec file cleanups +- Require automake + +* Tue Jul 31 2007 David Zeuthen - 0.35.5-5 +- Add support for PolicyKit .policy files (b.g.o #462312) + +* Sat Jul 28 2007 Matthias Clasen - 0.35.5-4 +- Don't produce useless debuginfo (#249969) + +* Wed Mar 21 2007 Ray Strode - 0.35.5-3 +- don't store a translation if it is equal to the original + string + +* Mon Mar 19 2007 Bill Nottingham - 0.35.5-2 +- add upstream changeset 674 (GNOME bz#413461 - fix intltool-extract path) + +* Sat Feb 24 2007 Matthias Clasen - 0.35.5-1 +- Update to 0.35.5 + +* Wed Jan 10 2007 Matthias Clasen - 0.35.4-1 +- Update to 0.35.4 + +* Thu Dec 21 2006 Matthias Clasen - 0.35.2-1 +- Update to 0.35.2 + +* Tue Aug 1 2006 Matthias Clasen - 0.35.0-2 +- Add a missing BuildRequires: gettext + +* Wed Jul 12 2006 Jesse Keating - 0.35.0-1.1 +- rebuild + +* Tue May 16 2006 Matthias Clasen 0.35.0-1 +- Update to 0.35.1 + +* Tue May 9 2006 Matthias Clasen 0.34.90.cvs20060509-1 +- Update to a cvs snapshot to allow building gnome 2.15 + +* Fri Feb 10 2006 Jesse Keating - 0.34.2-1.1 +- bump again for double-long bug on ppc(64) + +* Mon Feb 6 2006 Matthias Clasen 0.34.2-1 +- Update to 0.34.2 + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Thu Aug 4 2005 Matthias Clasen - 0.34.1-1 +- New upstream version + +* Wed Mar 2 2005 Matthias Clasen - 0.33-2 +- Rebuild with gcc4 + +* Wed Jan 26 2005 Matthias Clasen - 0.33-1 +- Upgrade to 0.33 + +* Thu Jan 13 2005 Jeremy Katz - 0.31.2-3 +- fix intltool local mode (upstream 163981) + +* Wed Nov 3 2004 - 0.31.2-1 +- add BuildRequires on perl-XML-Parser, #132622 + +* Thu Sep 23 2004 Jonathan Blandford 0.31.2-1 +- bump version + +* Tue Aug 3 2004 Owen Taylor - 0.31.1-1 +- Upgrade to 0.31.1 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Mar 12 2004 Alex Larsson 0.30-1 +- update to 0.30 + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Mon Jan 19 2004 Jonathan Blandford 0.29-1 +- new version + +* Mon Aug 25 2003 Alexander Larsson 0.27.2-1 +- update + +* Mon Aug 11 2003 Havoc Pennington 0.27-1 +- 0.27 + +* Wed Jul 30 2003 Havoc Pennington 0.26-1 +- rebuild + +* Wed Jul 9 2003 Havoc Pennington 0.26-1 +- 0.26 + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Jan 6 2003 Havoc Pennington +- 0.25 + +* Fri Nov 8 2002 Havoc Pennington +- 0.23 + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun Jun 09 2002 Havoc Pennington +- rebuild in different environment + +* Sun Jun 9 2002 Havoc Pennington +- 0.22 +- remove perl patch, perl is fixed + +* Thu Jun 6 2002 Nalin Dahyabhai +- tweak the perl5 check to not bomb with perl 5.8 + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Thu Apr 25 2002 Havoc Pennington +- rebuild in different environment + +* Thu Apr 4 2002 Jeremy Katz +- update to 0.18 + +* Thu Mar 14 2002 Jeremy Katz +- update to 0.17 + +* Thu Feb 21 2002 Jeremy Katz +- rebuild in new environment + +* Tue Feb 12 2002 Havoc Pennington +- 0.15 +- remove dbm patch, dbm no longer used upstream +- shorten summary line, #56739 + +* Wed Jan 30 2002 Owen Taylor +- Version 0.14 +- Try again on DBM fix +- Patch to use AnyDBM_File rather than NDBM_File for caching +- Version 0.14 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Wed Jan 2 2002 Havoc Pennington +- 0.12.90 cvs snap + +* Mon Nov 26 2001 Havoc Pennington +- 0.12 tarball + +* Sun Oct 28 2001 Havoc Pennington +- new cvs snap, no longer noarch + +* Fri Oct 5 2001 Havoc Pennington +- intltool specfile, based on xml-i18n-tools (but fixed up) +- obsolete/provide xml-i18n-tools + +* Tue Aug 14 2001 Alexander Larsson 0.9-2 +- Require patch + +* Wed Aug 8 2001 Jonathan Blandford +- Fix bug #45699 and #50634 by upgrading version. + +* Mon Jul 16 2001 Trond Eivind Glomsrød +- s/Copyright/License/ +- Shorter summary +- Remove empty post/postun scripts +- Don't define name and ver on the top and use this in the headers later + +* Tue Jul 10 2001 Tim Powers +- cleaned up files list so that there aren't non-standard dirs and so + that it owns the xml-i18n-tools dir + +* Tue Apr 17 2001 Jonathan Blandford +- Cleaned up spec file a little for Red Hat. + +* Thu Mar 01 2001 Maciej Stachowiak +- removed devel subpackage + +* Tue Jan 04 2000 Robin * Slomkowski +- created this thing diff --git a/intltool.spec b/intltool.spec index 4a4f73f..597af02 100644 --- a/intltool.spec +++ b/intltool.spec @@ -1,7 +1,7 @@ Name: intltool Summary: Utility for internationalizing various kinds of data files Version: 0.51.0 -Release: 29%{?dist} +Release: %autorelease License: GPL-2.0-or-later WITH Autoconf-exception-generic #VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk Source: https://edge.launchpad.net/intltool/trunk/%{version}/+download/intltool-%{version}.tar.gz @@ -69,389 +69,4 @@ fi %{_mandir}/man8/intltool*.8* %changelog -* Fri Jan 17 2025 Fedora Release Engineering - 0.51.0-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Aug 6 2024 Manish Tiwari - 0.51.0-28 -- CI gating tests migration to tmt - -* Thu Jul 18 2024 Fedora Release Engineering - 0.51.0-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 0.51.0-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 0.51.0-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Sep 21 2023 Jens Petersen - 0.51.0-24 -- SPDX migration of license tag - -* Thu Jul 20 2023 Fedora Release Engineering - 0.51.0-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 0.51.0-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 0.51.0-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.51.0-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0.51.0-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.51.0-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.51.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 0.51.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 0.51.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.51.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 0.51.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 29 2018 Jitka Plesnikova - 0.51.0-12 -- Perl 5.28 rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 0.51.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Aug 08 2017 Kalev Lember - 0.51.0-10 -- Fix intltool-update to work with perl 5.26 (#1462217) - -* Wed Jul 26 2017 Fedora Release Engineering - 0.51.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.51.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jul 29 2016 Wolfgang Ulbrich - 0.51.0-7 -- fix usage of distcheck for some packages rhbz (#1318674) - -* Tue Feb 16 2016 Yaakov Selkowitz - 0.51.0-6 -- Depend on perl(Getopt::Long) (#1307638) - -* Thu Feb 04 2016 Fedora Release Engineering - 0.51.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Oct 12 2015 Colin Walters - 0.51.0-4 -- Add patch to hopefully close race condition in systemd builds -- Related to https://bugzilla.redhat.com/show_bug.cgi?id=1249051 -- And the test suite is failing but the logs are hidden under - test-suite.log, so copy some code I had in dbus.spec to cat them. - -* Mon Jul 13 2015 Ralf Corsépius - 0.51.0-3 -- Add intltool-0.51.0-perl-5.22.patch (Address RHBZ#1233444) -- Remove unnecessary %%debug_package. - -* Wed Jun 17 2015 Fedora Release Engineering - 0.51.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Mar 09 2015 David King - 0.51.0-1 -- Update to 0.51.0 -- Use license macro for COPYING -- Preserve timestamps during install -- Use parallel make flags -- Update man page glob in files section - -* Sat Jun 07 2014 Fedora Release Engineering - 0.50.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 0.50.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jul 24 2013 Petr Pisar - 0.50.2-6 -- Perl 5.18 rebuild - -* Fri Feb 8 2013 Matthias Clasen - 0.50.2-5 -- Update url (#908562) - -* Sun Oct 21 2012 Matthias Clasen - 0.50.2-3 -- Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 0.50.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Apr 17 2012 Kalev Lember - 0.50.2-2 -- Clean up previous change and fix Requires/BuildRequires (#225902) - -* Fri Apr 06 2012 Jon Ciesla - 0.50.2-1 -- Latest stable release. -- Merge review BZ 225902 fixes: -- Removed Obsoletes/Provides for xml-i18n-tools. -- Swapped gettext/gettext-devel Requires, BuildRequires. -- Added %%check section. - -* Fri Jan 13 2012 Fedora Release Engineering - 0.50.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 20 2011 Alon Levy -- Update to 0.50.0 -- Drop patch carried for bz#568845 (schemas-merge) per last comment - in that bug. - -* Wed Feb 09 2011 Fedora Release Engineering - 0.41.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sun Mar 28 2010 Matthias Clasen - 0.41.1-1 -- Update to 0.41.1 - -* Wed Aug 12 2009 Matthias Clasen - 0.41.0-1 -- Update to 0.41.0 - -* Mon Aug 10 2009 Ville Skyttä - 0.40.6-4 -- Convert specfile to UTF-8. - -* Fri Jul 24 2009 Fedora Release Engineering - 0.40.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Apr 27 2009 Matthias Clasen - 0.40.6-2 -- Don't merge translations back into GConf schemas - -* Mon Mar 16 2009 Matthias Clasen - 0.40.6-1 -- Update to 0.40.6 - -* Tue Feb 24 2009 Fedora Release Engineering - 0.40.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Feb 12 2009 Matthias Clasen - 0.40.5-2 -- turn noarch - -* Sun Oct 19 2008 Matthias Clasen - 0.40.5-1 -- Update to 0.40.5 - -* Sun Sep 21 2008 Matthias Clasen - 0.40.4-1 -- Update to 0.40.4 - -* Wed Aug 6 2008 Matthias Clasen - 0.40.3-3 -- Require gettext-devel - -* Thu Jul 31 2008 Tom "spot" Callaway - 0.40.3-2 -- fix license tag - -* Fri Jul 25 2008 Matthias Clasen - 0.40.3-1 -- Update to 0.40.3 - -* Mon Jul 21 2008 Matthias Clasen - 0.40.1-1 -- Update to 0.40.1 - -* Tue Jun 3 2008 Matthias Clasen - 0.40.0-1 -- Update to 0.40.0 - -* Mon Feb 25 2008 Matthias Clasen - 0.37.1-1 -- Update to 0.37.1 - -* Tue Feb 19 2008 Fedora Release Engineering - 0.37.0-3 -- Autorebuild for GCC 4.3 - -* Tue Jan 15 2008 Matthias Clasen - 0.37.0-2 -- Require gettext - -* Mon Dec 17 2007 Matthias Clasen - 0.37.0-1 -- Update to 0.37.0 - -* Thu Dec 13 2007 Matthias Clasen - 0.36.3-1 -- Update to 0.36.3 - -* Sun Sep 16 2007 Matthias Clasen - 0.36.2-1 -- Update to 0.36.2 - -* Mon Aug 13 2007 Matthias Clasen - 0.36.1-1 -- Update to 0.36.1 - -* Fri Aug 3 2007 Matthias Clasen - 0.36.0-1 -- Update to 0.36.0 -- Update license field -- Drop patch rejected, obsolete and upstreamed patches -- Some spec file cleanups -- Require automake - -* Tue Jul 31 2007 David Zeuthen - 0.35.5-5 -- Add support for PolicyKit .policy files (b.g.o #462312) - -* Sat Jul 28 2007 Matthias Clasen - 0.35.5-4 -- Don't produce useless debuginfo (#249969) - -* Wed Mar 21 2007 Ray Strode - 0.35.5-3 -- don't store a translation if it is equal to the original - string - -* Mon Mar 19 2007 Bill Nottingham - 0.35.5-2 -- add upstream changeset 674 (GNOME bz#413461 - fix intltool-extract path) - -* Sat Feb 24 2007 Matthias Clasen - 0.35.5-1 -- Update to 0.35.5 - -* Wed Jan 10 2007 Matthias Clasen - 0.35.4-1 -- Update to 0.35.4 - -* Thu Dec 21 2006 Matthias Clasen - 0.35.2-1 -- Update to 0.35.2 - -* Tue Aug 1 2006 Matthias Clasen - 0.35.0-2 -- Add a missing BuildRequires: gettext - -* Wed Jul 12 2006 Jesse Keating - 0.35.0-1.1 -- rebuild - -* Tue May 16 2006 Matthias Clasen 0.35.0-1 -- Update to 0.35.1 - -* Tue May 9 2006 Matthias Clasen 0.34.90.cvs20060509-1 -- Update to a cvs snapshot to allow building gnome 2.15 - -* Fri Feb 10 2006 Jesse Keating - 0.34.2-1.1 -- bump again for double-long bug on ppc(64) - -* Mon Feb 6 2006 Matthias Clasen 0.34.2-1 -- Update to 0.34.2 - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Thu Aug 4 2005 Matthias Clasen - 0.34.1-1 -- New upstream version - -* Wed Mar 2 2005 Matthias Clasen - 0.33-2 -- Rebuild with gcc4 - -* Wed Jan 26 2005 Matthias Clasen - 0.33-1 -- Upgrade to 0.33 - -* Thu Jan 13 2005 Jeremy Katz - 0.31.2-3 -- fix intltool local mode (upstream 163981) - -* Wed Nov 3 2004 - 0.31.2-1 -- add BuildRequires on perl-XML-Parser, #132622 - -* Thu Sep 23 2004 Jonathan Blandford 0.31.2-1 -- bump version - -* Tue Aug 3 2004 Owen Taylor - 0.31.1-1 -- Upgrade to 0.31.1 - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Fri Mar 12 2004 Alex Larsson 0.30-1 -- update to 0.30 - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Mon Jan 19 2004 Jonathan Blandford 0.29-1 -- new version - -* Mon Aug 25 2003 Alexander Larsson 0.27.2-1 -- update - -* Mon Aug 11 2003 Havoc Pennington 0.27-1 -- 0.27 - -* Wed Jul 30 2003 Havoc Pennington 0.26-1 -- rebuild - -* Wed Jul 9 2003 Havoc Pennington 0.26-1 -- 0.26 - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Mon Jan 6 2003 Havoc Pennington -- 0.25 - -* Fri Nov 8 2002 Havoc Pennington -- 0.23 - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Sun Jun 09 2002 Havoc Pennington -- rebuild in different environment - -* Sun Jun 9 2002 Havoc Pennington -- 0.22 -- remove perl patch, perl is fixed - -* Thu Jun 6 2002 Nalin Dahyabhai -- tweak the perl5 check to not bomb with perl 5.8 - -* Thu May 23 2002 Tim Powers -- automated rebuild - -* Thu Apr 25 2002 Havoc Pennington -- rebuild in different environment - -* Thu Apr 4 2002 Jeremy Katz -- update to 0.18 - -* Thu Mar 14 2002 Jeremy Katz -- update to 0.17 - -* Thu Feb 21 2002 Jeremy Katz -- rebuild in new environment - -* Tue Feb 12 2002 Havoc Pennington -- 0.15 -- remove dbm patch, dbm no longer used upstream -- shorten summary line, #56739 - -* Wed Jan 30 2002 Owen Taylor -- Version 0.14 -- Try again on DBM fix -- Patch to use AnyDBM_File rather than NDBM_File for caching -- Version 0.14 - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Wed Jan 2 2002 Havoc Pennington -- 0.12.90 cvs snap - -* Mon Nov 26 2001 Havoc Pennington -- 0.12 tarball - -* Sun Oct 28 2001 Havoc Pennington -- new cvs snap, no longer noarch - -* Fri Oct 5 2001 Havoc Pennington -- intltool specfile, based on xml-i18n-tools (but fixed up) -- obsolete/provide xml-i18n-tools - -* Tue Aug 14 2001 Alexander Larsson 0.9-2 -- Require patch - -* Wed Aug 8 2001 Jonathan Blandford -- Fix bug #45699 and #50634 by upgrading version. - -* Mon Jul 16 2001 Trond Eivind Glomsrød -- s/Copyright/License/ -- Shorter summary -- Remove empty post/postun scripts -- Don't define name and ver on the top and use this in the headers later - -* Tue Jul 10 2001 Tim Powers -- cleaned up files list so that there aren't non-standard dirs and so - that it owns the xml-i18n-tools dir - -* Tue Apr 17 2001 Jonathan Blandford -- Cleaned up spec file a little for Red Hat. - -* Thu Mar 01 2001 Maciej Stachowiak -- removed devel subpackage - -* Tue Jan 04 2000 Robin * Slomkowski -- created this thing +%autochangelog From 85219b527e52973f83ac8246ba90973556807944 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:43:32 +0000 Subject: [PATCH 88/92] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 265871658f2f95a7c8cc5878428946b0dbd95e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 7 Mar 2024 21:51:04 +0100 Subject: [PATCH 89/92] Add patch to lock output file for writing The previous patch that we had, to use a temporary file, is useful: it prevents the situation where a half-written file is present on disk under the name that the readers expect. For example, this solves the scenario where the write is interrupted, and then the build process is restarted and something reads the partially written file. This could happen when using intltool-merge during development. Nevertheless, the existing patch doesn't actually solve the problem of concurrent writes: the name of the temporary file is fixed, so if two writers attempt to write the file, they may open the same temporary file and then finally rename the temporary file to destination. Readers will then read a corrupted file. This happens in https://bugzilla.redhat.com/show_bug.cgi?id=2268342, where we get a message that indicates the cache file is corrupted ("odd number of elements"), and a desktop file with some missing translations is written. Patch was verified by rebuilding xfce4-terminal 10 times with an inserted check that the two desktop files contain the expected number of elements. The patch was written by Bernhard Wiedemann and is available in the intltool repo on launchpad (but misattributed). --- intltool-cache-race.patch | 46 +++++++++++++++++++++++++++++++++++++++ intltool.spec | 8 +++---- 2 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 intltool-cache-race.patch diff --git a/intltool-cache-race.patch b/intltool-cache-race.patch new file mode 100644 index 0000000..e77abde --- /dev/null +++ b/intltool-cache-race.patch @@ -0,0 +1,46 @@ +From 7355bdbca18c95a2b99cb254434ad2c2248d6747 Mon Sep 17 00:00:00 2001 +From: Gianfranco Costamagna +Date: Wed, 2 Dec 2020 16:52:53 +0100 +Subject: [PATCH] [PATCH] Avoid a race where some processes try to use a + partial cache + +Gbp-Pq: 0001-Avoid-a-race-where-some-processes-try-to-use-a-parti.patch. +--- + intltool-merge.in | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/intltool-merge.in b/intltool-merge.in +index 05db7cf930..89923a7da1 100644 +--- a/intltool-merge.in ++++ b/intltool-merge.in +@@ -43,6 +43,7 @@ use Getopt::Long; + use Text::Wrap; + use File::Basename; + use Encode; ++use Fcntl qw(:flock); + + my $must_end_tag = -1; + my $last_depth = -1; +@@ -392,11 +393,14 @@ sub load_cache + + sub get_cached_translation_database + { ++ open(my $lockfh, ">", "$cache_file.lock") or die $!; ++ flock($lockfh, LOCK_EX) or die "Could not lock '$cache_file.lock' - $!"; + my $cache_file_age = -M $cache_file; + if (defined $cache_file_age) + { + if ($cache_file_age <= &get_newest_po_age) + { ++ close($lockfh); + &load_cache; + return; + } +@@ -404,6 +408,7 @@ sub get_cached_translation_database + } + + &create_cache; ++ close($lockfh); + } + + sub add_translation diff --git a/intltool.spec b/intltool.spec index 597af02..1fc42be 100644 --- a/intltool.spec +++ b/intltool.spec @@ -31,6 +31,9 @@ Patch1: intltool-perl5.26-regex-fixes.patch Patch2: intltool-merge-Create-cache-file-atomically.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1318674 Patch3: intltool_distcheck-fix.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2268342 +# https://bugs.launchpad.net/intltool/+bug/1687644 +Patch4: intltool-cache-race.patch %description This tool automatically extracts translatable strings from oaf, glade, @@ -38,10 +41,7 @@ bonobo ui, nautilus theme, .desktop, and other data files and puts them in the po files. %prep -%setup -q -%patch 1 -p1 -%patch 2 -p1 -%patch 3 -p1 +%autosetup -p1 %build %configure From 644271fd57b331ca2247d476b732b6e195fbac1c Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Mon, 25 Aug 2025 17:19:19 -0500 Subject: [PATCH 90/92] Drop unapplied patch This patch was dropped nearly 14 years ago, and we just never deleted it. --- intltool.spec | 14 ++-- schemas-merge.patch | 153 -------------------------------------------- 2 files changed, 5 insertions(+), 162 deletions(-) delete mode 100644 schemas-merge.patch diff --git a/intltool.spec b/intltool.spec index 1fc42be..36f5fc4 100644 --- a/intltool.spec +++ b/intltool.spec @@ -18,22 +18,18 @@ BuildRequires: perl(Getopt::Long) BuildRequires: perl(XML::Parser) BuildRequires: gettext BuildRequires: make -# http://bugzilla.gnome.org/show_bug.cgi?id=568845 -# Dropping this patch per the last comment on that thread: -# Martin Pitt: As the reporter of the bug I close this, as the new API du jour is gsettings, -# which has a sensible gettext integration. -#Patch0: schemas-merge.patch + # Fix intltool-update to work with perl 5.26. Patch taken from # Debian's intltool_0.51.0-4.debian.tar.xz -Patch1: intltool-perl5.26-regex-fixes.patch +Patch: intltool-perl5.26-regex-fixes.patch # https://bugs.launchpad.net/intltool/+bug/1505260 # https://bugzilla.redhat.com/show_bug.cgi?id=1249051 -Patch2: intltool-merge-Create-cache-file-atomically.patch +Patch: intltool-merge-Create-cache-file-atomically.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1318674 -Patch3: intltool_distcheck-fix.patch +Patch: intltool_distcheck-fix.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2268342 # https://bugs.launchpad.net/intltool/+bug/1687644 -Patch4: intltool-cache-race.patch +Patch: intltool-cache-race.patch %description This tool automatically extracts translatable strings from oaf, glade, diff --git a/schemas-merge.patch b/schemas-merge.patch deleted file mode 100644 index caa1e3c..0000000 --- a/schemas-merge.patch +++ /dev/null @@ -1,153 +0,0 @@ -diff -up intltool-0.40.6/intltool-merge.in.schemas intltool-0.40.6/intltool-merge.in ---- intltool-0.40.6/intltool-merge.in.schemas 2009-02-14 17:12:28.000000000 -0500 -+++ intltool-0.40.6/intltool-merge.in 2009-04-27 01:41:11.099450891 -0400 -@@ -38,8 +38,9 @@ my $PACKAGE = "@PACKAGE@"; - my $VERSION = "@VERSION@"; - - ## Loaded modules --use strict; -+use strict; - use Getopt::Long; -+use Cwd; - use Text::Wrap; - use File::Basename; - use Encode; -@@ -68,6 +69,9 @@ my $PASS_THROUGH_ARG = 0; - my $UTF8_ARG = 0; - my $MULTIPLE_OUTPUT = 0; - my $cache_file; -+my $GETTEXT_PACKAGE = ""; -+my %varhash = (); -+my $SRCDIR = $ENV{"srcdir"} || "."; - - ## Handle options - GetOptions -@@ -87,7 +91,8 @@ GetOptions - "pass-through|p" => \$PASS_THROUGH_ARG, - "utf8|u" => \$UTF8_ARG, - "multiple-output|m" => \$MULTIPLE_OUTPUT, -- "cache|c=s" => \$cache_file -+ "cache|c=s" => \$cache_file, -+ "gettext-package|g=s" => \$GETTEXT_PACKAGE - ) or &error; - - my $PO_DIR; -@@ -103,6 +108,8 @@ my $w = "[-A-Za-z0-9._:]"; - # XML quoted string contents - my $q = "[^\\\"]*"; - -+my $MODULE = $GETTEXT_PACKAGE || FindPackageName() || "unknown"; -+ - ## Check for options. - - if ($VERSION_ARG) -@@ -216,6 +223,8 @@ Other options: - a single file containing all localized elements - -c, --cache=FILE specify cache file name - (usually \$top_builddir/po/.intltool-merge-cache) -+ -g, --gettext-package=NAME -+ specify gettext domain, needed for --schemas-style - -q, --quiet suppress most messages - --help display this help and exit - --version output version information and exit -@@ -241,6 +250,25 @@ sub print_message - } - - -+sub FindPackageName -+{ -+ my $name = ""; -+ -+ my $conf_source; { -+ local (*IN); -+ open (IN, "; -+ close IN; -+ } -+ -+ $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE = \[?([^\n\]]+)/m; -+ -+ return $name if $name; -+} -+ -+ - sub preparation - { - $PO_DIR = $ARGV[0]; -@@ -1246,50 +1274,41 @@ sub schemas_merge_translations - my $short_string = $9 ? $9 : ''; - my $long_string = $12 ? $12 : ''; - -- print OUTPUT "$locale_start_spaces$c_default_block"; -- - $default_string =~ s/\s+/ /g; -- $default_string = entity_decode($default_string); - $short_string =~ s/\s+/ /g; -- $short_string = entity_decode($short_string); - $long_string =~ s/\s+/ /g; -- $long_string = entity_decode($long_string); - -- for my $lang (sort keys %po_files_by_lang) -- { -- my $default_translation = $translations{$lang, $default_string}; -- my $short_translation = $translations{$lang, $short_string}; -- my $long_translation = $translations{$lang, $long_string}; -- -- next if (!$default_translation && !$short_translation && -- !$long_translation); -- -- print OUTPUT "\n$locale_start_spaces"; -+ print OUTPUT "$locale_start_spaces$MODULE"; - -+ print OUTPUT "$locale_start_spaces"; - print OUTPUT "$default_spaces"; -- -- if ($default_translation) -- { -- $default_translation = entity_encode($default_translation); -- print OUTPUT "$default_translation"; -+ if ($default_string) { -+ print OUTPUT "$default_string"; - } -+ print OUTPUT "$short_spaces"; -+ if ($short_string) { -+ print OUTPUT "$short_string"; -+ } -+ print OUTPUT "$long_spaces"; -+ if ($long_string) { -+ print OUTPUT "$long_string"; -+ } -+ print OUTPUT "$locale_end_spaces"; - -- print OUTPUT "$short_spaces"; -+ $default_string = entity_decode($default_string); -+ $short_string = entity_decode($short_string); -+ $long_string = entity_decode($long_string); - -- if ($short_translation) -- { -- $short_translation = entity_encode($short_translation); -- print OUTPUT "$short_translation"; -- } -+ for my $lang (sort keys %po_files_by_lang) -+ { -+ my $default_translation = $translations{$lang, $default_string}; - -- print OUTPUT "$long_spaces"; -+ next if (!$default_translation || ($default_translation eq $default_string)); - -- if ($long_translation) -- { -- $long_translation = entity_encode($long_translation); -- print OUTPUT "$long_translation"; -- } -+ $default_translation = entity_encode($default_translation); - -+ print OUTPUT "\n$locale_start_spaces"; -+ print OUTPUT "$default_spaces$default_translation"; - print OUTPUT "$locale_end_spaces"; - } - } -diff -up intltool-0.40.6/tests/results/test.schemas intltool-0.40.6/tests/results/test From 6da8f16cdf9291a9d3dbb8b51de362c98fb79f83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 16:50:18 +0000 Subject: [PATCH 91/92] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From cdc166b5b7aa519cfe6f66b3b58f71a61c069a9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jul 2026 03:58:04 +0000 Subject: [PATCH 92/92] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild