Hello community,
here is the log from the commit of package gettext-runtime for openSUSE:Factory
checked in at 2020-01-25 13:22:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gettext-runtime (Old)
and /work/SRC/openSUSE:Factory/.gettext-runtime.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gettext-runtime"
Sat Jan 25 13:22:44 2020 rev:81 rq:765780 version:0.20.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/gettext-runtime/gettext-csharp.changes
2018-05-22 16:57:48.513293604 +0200
+++
/work/SRC/openSUSE:Factory/.gettext-runtime.new.26092/gettext-csharp.changes
2020-01-25 13:22:51.504002330 +0100
@@ -1,0 +2,25 @@
+Mon Dec 9 11:17:04 UTC 2019 - Christian Vögl <[email protected]>
+
+- Added -lm flag to CFLAGS
+
+-------------------------------------------------------------------
+Tue Jun 11 13:08:04 UTC 2019 - Christian Vögl <[email protected]>
+
+- Updated to version 0.20.1:
+ + msgfmt now eliminates the POT-Creation-Date header field from .mo files.
+ + msgmerge now has an option --for-msgfmt, that produces a PO file meant
+ for use by msgfmt only. This option saves processing time, in particular
+ by omitting fuzzy matching that is not useful in this situation.
+ + The .pot file in a 'po' directory is now erased by "make maintainer-clean".
+ + It is now possible to override xgettext options from the po/Makefile.in.in
+ through options in XGETTEXT_OPTIONS (declared in po/Makevars).
+ + The --intl option of the gettextize program (deprecated since 2010) is
+ no longer available. Instead of including the intl sources in your package,
+ we suggest making the libintl library an optional prerequisite of your
+ package. This will simplify the build system of your package.
+ + Accordingly, the Autoconf macro AM_GNU_GETTEXT_INTL_SUBDIR is gone as well.
+- Rebased gettext-po-mode.diff
+- Removed gettext-needlessly_init_vars.patch (now in upstream)
+
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/gettext-runtime/gettext-java.changes
2018-05-22 16:57:48.837281817 +0200
+++ /work/SRC/openSUSE:Factory/.gettext-runtime.new.26092/gettext-java.changes
2020-01-25 13:22:53.388003155 +0100
@@ -1,0 +2,27 @@
+Tue Jun 11 13:12:37 UTC 2019 - Christian Vögl <[email protected]>
+
+- Updated to version 0.20.1
+ + msgfmt now eliminates the POT-Creation-Date header field from .mo files.
+ + update-po target in Makefile.in.in now uses msgmerge --previous.
+ + msgmerge now has an option --for-msgfmt, that produces a PO file meant
+ for use by msgfmt only. This option saves processing time, in particular
+ by omitting fuzzy matching that is not useful in this situation.
+ + The .pot file in a 'po' directory is now erased by "make maintainer-clean".
+ + It is now possible to override xgettext options from the po/Makefile.in.in
+ through options in XGETTEXT_OPTIONS (declared in po/Makevars).
+ + The --intl option of the gettextize program (deprecated since 2010) is
+ no longer available. Instead of including the intl sources in your package,
+ we suggest making the libintl library an optional prerequisite of your
+ package. This will simplify the build system of your package.
+ + Accordingly, the Autoconf macro AM_GNU_GETTEXT_INTL_SUBDIR is gone as well.
+ + Java:
+ * xgettext now supports UTF-8 encoded .properties files (a new feature
+ of Java 9).
+ * The build system and tools now support Java 9, 10, and 11. On the
+ other hand, support for old versions of Java (Java 5 and older,
+ GCJ 4.2.x and older) has been dropped.
+- Rebased gettext-po-mode.diff
+- Removed gettext-needlessly_init_vars.patch (now in upstream)
+- Removed gettext-0.19.8.1-jdk9.patch (now in upstream)
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/gettext-runtime/gettext-runtime-mini.changes
2019-07-08 15:08:57.387225999 +0200
+++
/work/SRC/openSUSE:Factory/.gettext-runtime.new.26092/gettext-runtime-mini.changes
2020-01-25 13:22:53.896003378 +0100
@@ -1,0 +2,43 @@
+Wed Jan 15 08:35:10 UTC 2020 - Dominique Leuenberger <[email protected]>
+
+- Add libtextstyle0 to baselibs.conf: gettext-runtime-32bit has a
+ dependency on it, so we also need the library built as -32bit.
+
+-------------------------------------------------------------------
+Sat Dec 21 17:23:21 UTC 2019 - Stefan Brüns <[email protected]>
+
+- Add missing Requires: libtextstyle0 in corresponding devel package,
+ drop gettext-runtime Requires.
+- Skip creation of shared libtextstyle in -mini flavor.
+- Statically link to libtextstyle in -mini flavor, fixes
+ broken bootstrap of gettext.
+
+-------------------------------------------------------------------
+Tue Dec 17 10:16:04 UTC 2019 - Christian Vögl <[email protected]>
+
+- Add -lm to LDFLAGS (boo#1138806)
+
+-------------------------------------------------------------------
+Tue Nov 26 16:04:25 UTC 2019 - Christian Vögl <[email protected]>
+
+- Added xz to requires (boo#1141380)
+- The previous update to 0.20.1 also fixes (boo#1113719)
+
+-------------------------------------------------------------------
+Wed Oct 30 19:05:13 UTC 2019 - Stefan Brüns <[email protected]>
+
+- Remove autoreconf call (not required), and drop the no longer
+ required libtool build dependency.
+
+-------------------------------------------------------------------
+Fri Aug 23 16:56:05 UTC 2019 - Jan Engelhardt <[email protected]>
+
+- Heed SLPP by placing libtextstyle.so.0 in the right package.
+- Drop documentation from libtextstyle0, no one will read it there.
+- Drop static library.
+- Remove pointless ldconfig calls for libtextstyle-devel.
+- Avoid pointless sh invocation of libtextstyle0 scriptlets.
+- Avoid unnecessary |xargs rm.
+- Remove redundant %clean section.
+
+-------------------------------------------------------------------
@@ -4,0 +48,51 @@
+
+-------------------------------------------------------------------
+Tue Jun 11 12:34:24 UTC 2019 - Christian Vögl <[email protected]>
+
+- Updatetd to 0.20.1
+ + msgfmt now eliminates the POT-Creation-Date header field from .mo files.
+ + update-po target in Makefile.in.in now uses msgmerge --previous.
+ + msgmerge now has an option --for-msgfmt, that produces a PO file meant
+ for use by msgfmt only. This option saves processing time, in particular
+ by omitting fuzzy matching that is not useful in this situation.
+ + The .pot file in a 'po' directory is now erased by "make maintainer-clean".
+ + It is now possible to override xgettext options from the po/Makefile.in.in
+ through options in XGETTEXT_OPTIONS (declared in po/Makevars).
+ + The --intl option of the gettextize program (deprecated since 2010) is
+ no longer available. Instead of including the intl sources in your package,
+ we suggest making the libintl library an optional prerequisite of your
+ package. This will simplify the build system of your package.
+ + Accordingly, the Autoconf macro AM_GNU_GETTEXT_INTL_SUBDIR is gone as well.
+ + C, C++:
+ * xgettext now supports strings in u8"..." syntax, as specified in C11
+ and C++11.
+ * xgettext now supports 'p'/'P' exponent markers in number tokens, as
+ specified in C99 and C++17.
+ + C++:
+ * xgettext now supports single-quotes in number tokens, as specified in
+ C++14.
+ + Shell:
+ * The programs 'gettext', 'ngettext' now support a --context argument.
+ * gettext.sh contains new function eval_pgettext and eval_npgettext
+ for producing translations of messages with context.
+ + Perl:
+ * Native support for context functions (pgettext, dpgettext, dcpgettext,
+ npgettext, dnpgettext, dcnpgettext).
+ * better detection of question mark and slash as operators (as opposed
+ to regular expression delimiters).
+ + Scheme:
+ * xgettext now parses the syntax for specialized byte vectors (#u8(...),
+ #vu8(...), etc.) correctly.
+ + Pascal:
+ * xgettext can now extract strings from .rsj files, produced by the
+ Free Pascal compiler version 3.0.0 or newer.
+ + Vala:
+ * xgettext now parses escape sequences in strings more accurately.
+ + JavaScript:
+ * xgettext now parses template literals correctly.
+- Rebased gettext-dont-test-gnulib.patch
+- Removed gettext-needlessly_init_vars.patch (now in upstream)
+- Rebased gettext-po-mode.diff
+- Removed msgfmt-remove-pot-creation-date.patch (now in upstream)
+- Removed msgfmt-reset-msg-length-after-remove.patch (now in upstream)
+- Removed parts of reproducible.patch (now in upstream)
gettext-runtime.changes: same change
Old:
----
gettext-0.19.8.1-jdk9.patch
gettext-0.19.8.1.tar.xz
gettext-0.19.8.1.tar.xz.sig
gettext-needlessly_init_vars.patch
msgfmt-remove-pot-creation-date.patch
msgfmt-reset-msg-length-after-remove.patch
New:
----
gettext-0.20.1.tar.gz
gettext-0.20.1.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gettext-csharp.spec ++++++
--- /var/tmp/diff_new_pack.YlCmOJ/_old 2020-01-25 13:22:58.140005238 +0100
+++ /var/tmp/diff_new_pack.YlCmOJ/_new 2020-01-25 13:22:58.144005239 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gettext-csharp
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,26 +26,24 @@
BuildRequires: mono-devel
BuildRequires: perl-libintl-perl
BuildRequires: tcl
-BuildRequires: xz
Requires: mono
-Url: http://www.gnu.org/software/gettext/
-Version: 0.19.8.1
+URL: http://www.gnu.org/software/gettext/
+Version: 0.20.1
Release: 0
Summary: Native Language Support (NLS) for C#
License: LGPL-2.1-or-later
Group: Development/Tools/Other
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
+Source: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz
Source1: gettext-rpmlintrc
Source2: suse-start-po-mode.el
Source3: gettext-linkdupes.sh
-Source4: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz.sig
+Source4: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz.sig
Source5: %name.keyring
Patch: gettext-0.12.1-sigfpe.patch
Patch2: gettext-0.12.1-gettextize.patch
Patch4: gettext-po-mode.diff
Patch5: gettext-initialize_vars.patch
-Patch9: gettext-needlessly_init_vars.patch
%if 0%{?fedora_version} || 0%{?centos_version} <= 600 || 0%{?scilin_version}
<= 600 || 0%{?rhel_version} <= 600
%global debug_package %{nil}
@@ -79,10 +77,9 @@
%patch2
%patch4
%patch5
-%patch9
%build
-export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
+export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint -lm"
export CXXFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
# expect a couple "You should update your `aclocal.m4' by running aclocal."
#autoreconf -fiv
++++++ gettext-java.spec ++++++
--- /var/tmp/diff_new_pack.YlCmOJ/_old 2020-01-25 13:22:58.160005247 +0100
+++ /var/tmp/diff_new_pack.YlCmOJ/_new 2020-01-25 13:22:58.164005248 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gettext-java
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,34 +17,32 @@
Name: gettext-java
-Version: 0.19.8.1
+Version: 0.20.1
Release: 0
Summary: Java Support for Native Language Support (NLS)
License: LGPL-2.1-or-later
Group: Development/Tools/Other
-Url: http://www.gnu.org/software/gettext/
-Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
+URL: http://www.gnu.org/software/gettext/
+Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz
Source1: gettext-rpmlintrc
Source2: suse-start-po-mode.el
Source3: gettext-linkdupes.sh
-Source4: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz.sig
+Source4: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz.sig
Source5: %{name}.keyring
Patch0: gettext-0.12.1-sigfpe.patch
Patch2: gettext-0.12.1-gettextize.patch
Patch4: gettext-po-mode.diff
Patch5: gettext-initialize_vars.patch
-Patch9: gettext-needlessly_init_vars.patch
-Patch10: gettext-0.19.8.1-jdk9.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: java-devel
BuildRequires: libcroco-devel
+BuildRequires: libtextstyle-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: perl-libintl-perl
BuildRequires: tcl
-BuildRequires: xz
%if 0%{?fedora_version} || 0%{?centos_version} <= 600 || 0%{?scilin_version}
<= 600 || 0%{?rhel_version} <= 600
%global debug_package %{nil}
@@ -61,16 +59,14 @@
%patch2
%patch4
%patch5
-%patch9
-%patch10 -p1
%build
# expect a couple "You should update your `aclocal.m4' by running aclocal."
autoreconf -fiv
#sh autogen.sh
-export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
+export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint -lm"
export CXXFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
-%configure --enable-shared --disable-native-java --enable-java
+%configure --enable-shared --enable-java
make GMSGFMT=../src/msgfmt %{?_smp_mflags} V=1
%install
@@ -92,7 +88,7 @@
fi
done
cd ..
-find -size 0 -print0 | xargs -0 --no-run-if-empty rm
+find -type f -size 0 -delete
mkdir -p %{buildroot}%{_libdir}/gettext
mv %{buildroot}/%{_datadir}/gettext/gettext.jar %{buildroot}%{_libdir}/gettext/
# Create scripts that will launch the tools
++++++ gettext-runtime-mini.spec ++++++
--- /var/tmp/diff_new_pack.YlCmOJ/_old 2020-01-25 13:22:58.188005259 +0100
+++ /var/tmp/diff_new_pack.YlCmOJ/_new 2020-01-25 13:22:58.188005259 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package gettext-runtime-mini
+# spec file for package gettext-runtime
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,14 @@
%define pacname gettext
-# datadir was not changed in 0.19.8.1 patch release
-%define dataversion 0.19.8
+# datadir was not changed in 0.20.1 patch release
+%define dataversion 0.20
%bcond_without mini
Name: gettext-runtime-mini
-Version: 0.19.8.1
+Version: 0.20.1
Release: 0
BuildRequires: gcc-c++
-BuildRequires: libtool
# To get an updated linkdupes.sh (in case there are new dupes), temproarily
enable:
#BuildRequires: fdupes
%if %{without mini}
@@ -34,7 +33,6 @@
BuildRequires: libxml2-devel
BuildRequires: perl-libintl-perl
BuildRequires: tcl
-BuildRequires: xz
# bug437293
%ifarch ppc64
Obsoletes: gettext-64bit
@@ -54,14 +52,14 @@
Summary: Tools for Native Language Support (NLS)
License: GPL-3.0-or-later AND LGPL-2.0-or-later
Group: Development/Tools/Other
-Url: http://www.gnu.org/software/gettext/
+URL: http://www.gnu.org/software/gettext/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
+Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz
Source1: gettext-rpmlintrc
Source2: suse-start-po-mode.el
Source3: gettext-linkdupes.sh
Source4: baselibs.conf
-Source5: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz.sig
+Source5: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz.sig
Source6: %name.keyring
Patch: gettext-0.12.1-sigfpe.patch
Patch1: gettext-0.19.3-fix-bashisms.patch
@@ -70,13 +68,9 @@
Patch5: gettext-initialize_vars.patch
# PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- [email protected]
Patch6: gettext-dont-test-gnulib.patch
-Patch9: gettext-needlessly_init_vars.patch
-# PATCH-FIX-UPSTREAM https://savannah.gnu.org/bugs/?49654 --
[email protected]
-Patch10: msgfmt-remove-pot-creation-date.patch
# PATCH-FIX-UPSTREAM boo#941629 -- [email protected]
Patch11: boo941629-unnessary-rpath-on-standard-path.patch
# PATCH-FIX-SUSE Bug boo#1106843
-Patch12: msgfmt-reset-msg-length-after-remove.patch
Patch13: reproducible.patch
%description
@@ -92,6 +86,7 @@
License: LGPL-2.1-or-later
Group: Development/Tools/Other
Requires: %{name} = %{version}
+Requires: xz
%if %{without mini}
Requires(post): info
Requires(preun): info
@@ -133,6 +128,28 @@
This subpackage contains the HTML version of the gettext documentation
as well as project examples.
+%if %{without mini}
+%package -n libtextstyle0
+Summary: Provides textstyling for console output
+License: LGPL-2.1-or-later
+Group: Development/Tools/Other
+
+%description -n libtextstyle0
+GNU libtextstyle provides an easy way to add styling to programs that produce
output to a console or terminal emulator window.
+It does this in a way that allows the end user to customize the styling using
the industry standard, namely Cascading Style Sheets (CSS).
+
+
+
+%package -n libtextstyle-devel
+Summary: Devel package for libtextstyle
+License: LGPL-2.1-or-later
+Group: Development/Tools/Other
+Requires: libtextstyle0 = %{version}
+
+%description -n libtextstyle-devel
+This package provides headers and static libraries for libtextstyle
+%endif
+
%prep
%setup -q -n %{pacname}-%{version}
%patch
@@ -141,23 +158,25 @@
%patch4
%patch5
%patch6 -p1
-%patch9
-%patch10 -p1
%patch11 -p1
-%patch12 -p0
%patch13 -p1
%build
%define _lto_cflags %{nil}
-# expect a couple "You should update your `aclocal.m4' by running aclocal."
-autoreconf -fiv
#sh autogen.sh
export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
export CXXFLAGS="$CFLAGS -Dgcc_is_lint"
+export LDFLAGS="-lm"
%if 0%{?qemu_user_space_build:1}
OPTS="--disable-openmp"
%endif
-%configure --enable-shared $OPTS
+%configure --disable-static $OPTS
+%if %{with mini}
+# Link statically to libtextstyle from libgettextlib.so
+export CFLAGS="${CFLAGS} -fPIC"
+export CXXFLAGS="${CXXFLAGS} -fPIC"
+(cd libtextstyle; %configure --enable-static --disable-shared ${OPTS})
+%endif
make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1
# use texinfo.tex supplied by the system (texinfo)
# make -C gettext-tools/doc gettext.pdf
@@ -165,14 +184,14 @@
%install
%define my_docdir %{_defaultdocdir}/%{name}
export LC_CTYPE=ISO-8859-15
-make install DESTDIR=%{buildroot} docdir=%{my_docdir}
+%make_install docdir=%{my_docdir}
cp -pr AUTHORS NEWS README* %{buildroot}/%{my_docdir}
mkdir -p %{buildroot}/usr/share/emacs/site-lisp
install -m 644 %SOURCE2 %{buildroot}/usr/share/emacs/site-lisp
-install -m 644 gettext-tools/misc/po-compat.el
%{buildroot}/usr/share/emacs/site-lisp
-install -m 644 gettext-tools/misc/po-mode.el
%{buildroot}/usr/share/emacs/site-lisp
-install -m 644 gettext-tools/misc/start-po.el
%{buildroot}/usr/share/emacs/site-lisp
-#make -C gettext-tools/doc docdir=%{buildroot}/%{my_docdir} install-pdf
+install -m 644 gettext-tools/emacs/po-compat.el
%{buildroot}/usr/share/emacs/site-lisp
+install -m 644 gettext-tools/emacs/po-mode.el
%{buildroot}/usr/share/emacs/site-lisp
+install -m 644 gettext-tools/emacs/start-po.el
%{buildroot}/usr/share/emacs/site-lisp
+#make -C gettext-tools/doc docdir=%%{buildroot}/%%{my_docdir} install-pdf
if [ -e %{buildroot}/%{_libdir}/preloadable_libintl.so ];then
chmod 755 %{buildroot}/%{_libdir}/preloadable_libintl.so
fi
@@ -183,7 +202,15 @@
#remove unwanted stuff
rm -f %{buildroot}/usr/share/doc/packages/gettext/README.{mingw,vms,woe32}
rm -f %_datadir/%name/gettext.jar
-#find %{buildroot} -maxdepth 2 -name '*html' | xargs rm -f
+rm -f %{buildroot}/%_libdir/libtextstyle.la
+%if %{with mini}
+ rm -f %{buildroot}/usr/include/textstyle.h
+ rm -rf %{buildroot}/usr/include/textstyle
+ rm -rf
%{buildroot}/usr/share/doc/packages/gettext-runtime-mini/libtextstyle_*.html
+ rm -f %{buildroot}/%_libdir/libtextstyle.a
+ rm -f %{buildroot}/%{_infodir}/libtextstyle.info
+%endif
+#find %%{buildroot} -maxdepth 2 -name '*html' -delete
# hardlink the dupes in the documentation:
cd %{buildroot}/%{my_docdir}/examples
sh %{SOURCE3}
@@ -217,9 +244,6 @@
}
%endif
-%clean
-rm -rf %{buildroot}
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -232,6 +256,11 @@
%install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz
+%if %{without mini}
+%post -n libtextstyle0 -p /sbin/ldconfig
+%postun -n libtextstyle0 -p /sbin/ldconfig
+%endif
+
%files -f gettext-runtime.lang
%defattr(-,root,root)
%license COPYING
@@ -292,7 +321,6 @@
%_libdir/preloadable_libintl.so
%_libdir/gettext
%_datadir/%pacname/config.rpath
-%_datadir/%pacname/intl
%_datadir/%pacname/po
%_datadir/%pacname/projects
%_datadir/%pacname/gettext.h
@@ -300,7 +328,7 @@
%_datadir/%pacname/javaversion.class
%_datadir/%pacname/styles
%_datadir/%pacname/archive.dir.tar.xz
-%_datadir/aclocal/*
+%_datadir/aclocal
%dir %{_datadir}/%{pacname}-%{dataversion}
%{_datadir}/%{pacname}-%{dataversion}/its
@@ -316,4 +344,22 @@
%doc %_docdir/%name/xgettext*.html
%doc %_docdir/%name/recode-sr-latin.1.html
+%if %{without mini}
+%files -n libtextstyle0
+%defattr(-,root,root)
+%_libdir/libtextstyle.so.0
+%_libdir/libtextstyle.so.0.0.0
+
+%files -n libtextstyle-devel
+%defattr(-,root,root)
+%dir %_includedir/textstyle
+%_includedir/textstyle.h
+%_includedir/textstyle/stdbool.h
+%_includedir/textstyle/version.h
+%_includedir/textstyle/woe32dll.h
+%_libdir/libtextstyle.so
+%doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html
+%doc %_infodir/libtextstyle.info.gz
+%endif
+
%changelog
++++++ gettext-runtime.spec ++++++
--- /var/tmp/diff_new_pack.YlCmOJ/_old 2020-01-25 13:22:58.204005266 +0100
+++ /var/tmp/diff_new_pack.YlCmOJ/_new 2020-01-25 13:22:58.204005266 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gettext-runtime
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,14 @@
%define pacname gettext
-# datadir was not changed in 0.19.8.1 patch release
-%define dataversion 0.19.8
+# datadir was not changed in 0.20.1 patch release
+%define dataversion 0.20
%bcond_with mini
Name: gettext-runtime
-Version: 0.19.8.1
+Version: 0.20.1
Release: 0
BuildRequires: gcc-c++
-BuildRequires: libtool
# To get an updated linkdupes.sh (in case there are new dupes), temproarily
enable:
#BuildRequires: fdupes
%if %{without mini}
@@ -34,7 +33,6 @@
BuildRequires: libxml2-devel
BuildRequires: perl-libintl-perl
BuildRequires: tcl
-BuildRequires: xz
# bug437293
%ifarch ppc64
Obsoletes: gettext-64bit
@@ -54,14 +52,14 @@
Summary: Tools for Native Language Support (NLS)
License: GPL-3.0-or-later AND LGPL-2.0-or-later
Group: Development/Tools/Other
-Url: http://www.gnu.org/software/gettext/
+URL: http://www.gnu.org/software/gettext/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
+Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz
Source1: gettext-rpmlintrc
Source2: suse-start-po-mode.el
Source3: gettext-linkdupes.sh
Source4: baselibs.conf
-Source5: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz.sig
+Source5: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.gz.sig
Source6: %name.keyring
Patch: gettext-0.12.1-sigfpe.patch
Patch1: gettext-0.19.3-fix-bashisms.patch
@@ -70,13 +68,9 @@
Patch5: gettext-initialize_vars.patch
# PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- [email protected]
Patch6: gettext-dont-test-gnulib.patch
-Patch9: gettext-needlessly_init_vars.patch
-# PATCH-FIX-UPSTREAM https://savannah.gnu.org/bugs/?49654 --
[email protected]
-Patch10: msgfmt-remove-pot-creation-date.patch
# PATCH-FIX-UPSTREAM boo#941629 -- [email protected]
Patch11: boo941629-unnessary-rpath-on-standard-path.patch
# PATCH-FIX-SUSE Bug boo#1106843
-Patch12: msgfmt-reset-msg-length-after-remove.patch
Patch13: reproducible.patch
%description
@@ -92,6 +86,7 @@
License: LGPL-2.1-or-later
Group: Development/Tools/Other
Requires: %{name} = %{version}
+Requires: xz
%if %{without mini}
Requires(post): info
Requires(preun): info
@@ -133,6 +128,28 @@
This subpackage contains the HTML version of the gettext documentation
as well as project examples.
+%if %{without mini}
+%package -n libtextstyle0
+Summary: Provides textstyling for console output
+License: LGPL-2.1-or-later
+Group: Development/Tools/Other
+
+%description -n libtextstyle0
+GNU libtextstyle provides an easy way to add styling to programs that produce
output to a console or terminal emulator window.
+It does this in a way that allows the end user to customize the styling using
the industry standard, namely Cascading Style Sheets (CSS).
+
+
+
+%package -n libtextstyle-devel
+Summary: Devel package for libtextstyle
+License: LGPL-2.1-or-later
+Group: Development/Tools/Other
+Requires: libtextstyle0 = %{version}
+
+%description -n libtextstyle-devel
+This package provides headers and static libraries for libtextstyle
+%endif
+
%prep
%setup -q -n %{pacname}-%{version}
%patch
@@ -141,23 +158,25 @@
%patch4
%patch5
%patch6 -p1
-%patch9
-%patch10 -p1
%patch11 -p1
-%patch12 -p0
%patch13 -p1
%build
%define _lto_cflags %{nil}
-# expect a couple "You should update your `aclocal.m4' by running aclocal."
-autoreconf -fiv
#sh autogen.sh
export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
export CXXFLAGS="$CFLAGS -Dgcc_is_lint"
+export LDFLAGS="-lm"
%if 0%{?qemu_user_space_build:1}
OPTS="--disable-openmp"
%endif
-%configure --enable-shared $OPTS
+%configure --disable-static $OPTS
+%if %{with mini}
+# Link statically to libtextstyle from libgettextlib.so
+export CFLAGS="${CFLAGS} -fPIC"
+export CXXFLAGS="${CXXFLAGS} -fPIC"
+(cd libtextstyle; %configure --enable-static --disable-shared ${OPTS})
+%endif
make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1
# use texinfo.tex supplied by the system (texinfo)
# make -C gettext-tools/doc gettext.pdf
@@ -165,14 +184,14 @@
%install
%define my_docdir %{_defaultdocdir}/%{name}
export LC_CTYPE=ISO-8859-15
-make install DESTDIR=%{buildroot} docdir=%{my_docdir}
+%make_install docdir=%{my_docdir}
cp -pr AUTHORS NEWS README* %{buildroot}/%{my_docdir}
mkdir -p %{buildroot}/usr/share/emacs/site-lisp
install -m 644 %SOURCE2 %{buildroot}/usr/share/emacs/site-lisp
-install -m 644 gettext-tools/misc/po-compat.el
%{buildroot}/usr/share/emacs/site-lisp
-install -m 644 gettext-tools/misc/po-mode.el
%{buildroot}/usr/share/emacs/site-lisp
-install -m 644 gettext-tools/misc/start-po.el
%{buildroot}/usr/share/emacs/site-lisp
-#make -C gettext-tools/doc docdir=%{buildroot}/%{my_docdir} install-pdf
+install -m 644 gettext-tools/emacs/po-compat.el
%{buildroot}/usr/share/emacs/site-lisp
+install -m 644 gettext-tools/emacs/po-mode.el
%{buildroot}/usr/share/emacs/site-lisp
+install -m 644 gettext-tools/emacs/start-po.el
%{buildroot}/usr/share/emacs/site-lisp
+#make -C gettext-tools/doc docdir=%%{buildroot}/%%{my_docdir} install-pdf
if [ -e %{buildroot}/%{_libdir}/preloadable_libintl.so ];then
chmod 755 %{buildroot}/%{_libdir}/preloadable_libintl.so
fi
@@ -183,7 +202,15 @@
#remove unwanted stuff
rm -f %{buildroot}/usr/share/doc/packages/gettext/README.{mingw,vms,woe32}
rm -f %_datadir/%name/gettext.jar
-#find %{buildroot} -maxdepth 2 -name '*html' | xargs rm -f
+rm -f %{buildroot}/%_libdir/libtextstyle.la
+%if %{with mini}
+ rm -f %{buildroot}/usr/include/textstyle.h
+ rm -rf %{buildroot}/usr/include/textstyle
+ rm -rf
%{buildroot}/usr/share/doc/packages/gettext-runtime-mini/libtextstyle_*.html
+ rm -f %{buildroot}/%_libdir/libtextstyle.a
+ rm -f %{buildroot}/%{_infodir}/libtextstyle.info
+%endif
+#find %%{buildroot} -maxdepth 2 -name '*html' -delete
# hardlink the dupes in the documentation:
cd %{buildroot}/%{my_docdir}/examples
sh %{SOURCE3}
@@ -217,9 +244,6 @@
}
%endif
-%clean
-rm -rf %{buildroot}
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -232,6 +256,11 @@
%install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz
%install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz
+%if %{without mini}
+%post -n libtextstyle0 -p /sbin/ldconfig
+%postun -n libtextstyle0 -p /sbin/ldconfig
+%endif
+
%files -f gettext-runtime.lang
%defattr(-,root,root)
%license COPYING
@@ -292,7 +321,6 @@
%_libdir/preloadable_libintl.so
%_libdir/gettext
%_datadir/%pacname/config.rpath
-%_datadir/%pacname/intl
%_datadir/%pacname/po
%_datadir/%pacname/projects
%_datadir/%pacname/gettext.h
@@ -300,7 +328,7 @@
%_datadir/%pacname/javaversion.class
%_datadir/%pacname/styles
%_datadir/%pacname/archive.dir.tar.xz
-%_datadir/aclocal/*
+%_datadir/aclocal
%dir %{_datadir}/%{pacname}-%{dataversion}
%{_datadir}/%{pacname}-%{dataversion}/its
@@ -316,4 +344,22 @@
%doc %_docdir/%name/xgettext*.html
%doc %_docdir/%name/recode-sr-latin.1.html
+%if %{without mini}
+%files -n libtextstyle0
+%defattr(-,root,root)
+%_libdir/libtextstyle.so.0
+%_libdir/libtextstyle.so.0.0.0
+
+%files -n libtextstyle-devel
+%defattr(-,root,root)
+%dir %_includedir/textstyle
+%_includedir/textstyle.h
+%_includedir/textstyle/stdbool.h
+%_includedir/textstyle/version.h
+%_includedir/textstyle/woe32dll.h
+%_libdir/libtextstyle.so
+%doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html
+%doc %_infodir/libtextstyle.info.gz
+%endif
+
%changelog
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.YlCmOJ/_old 2020-01-25 13:22:58.228005276 +0100
+++ /var/tmp/diff_new_pack.YlCmOJ/_new 2020-01-25 13:22:58.232005278 +0100
@@ -1,3 +1,4 @@
gettext-runtime
obsoletes "gettext-<targettype> <= <version>"
provides "gettext-<targettype> = <version>"
+libtextstyle0
++++++ gettext-0.20.1.tar.gz.sig ++++++
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJc2D1GAAoJEE9JSpQuRhbCb5AP/2dZEV/tACl49bDq0Vp4Btkr
UoxdTmUy+NmtgCCdZnXbH9FeilWyjtga8uRoa8n5CQ/XIZxNvI0FtVE+FCW7FkBe
Rnv3A+LzQPwzSZAzO9ZmJXUERMlgK1ic4dJA+YrWjBlvlc6T3cs2t+adZdojHsKM
YcLytVlC7Eu5xRu8KwYOWhPvREmSflcM1UvYMB5lK0mfcsn3CKjdBSPQGKXmo3B7
ftNthdeBR3mPIj7QuJOTPF7nPBio3VR0qY2rKWzY+V9Tvif6I0p3b9R5Ygza/4gm
AxiX2r86IosnQnafRJHNV9PfEORjv+qju6DwVQMFjsBeCu0/URontbTr6pGUNPrw
bkA5TW65JdGj2kLGXfH5AYpGvcFpElt7VLoBIPabhM2HlIUmUfAnD+P3Ad7QP9Rk
6zzot9yEukeEgwPRvK0wvhVFVbKSPeBXI4KR3wj3oZnWvpUSlTlplGyDqmGcNQ9W
mRr9q1R+bFvuHj6jEJBPd7hXG+OJm/FZA+kLgscObuuBXoNQnU2+pSx7WJryI79r
bePtHd5PAMGIthTk1h1s1OHNs+ppyVnf7Kmke6zKX0RnGaHDoHbVE2HmgKFMarjW
Ytgg0Luh/WsgboOmmzhF3+RU5q1q7F6OkHEkklPUvAeYTlwBexQ2rBhgw2rT2J94
lTlpb6S9tXf3y9CbNEEs
=rjnh
-----END PGP SIGNATURE-----
++++++ gettext-dont-test-gnulib.patch ++++++
--- /var/tmp/diff_new_pack.YlCmOJ/_old 2020-01-25 13:22:58.252005287 +0100
+++ /var/tmp/diff_new_pack.YlCmOJ/_new 2020-01-25 13:22:58.256005288 +0100
@@ -1,29 +1,26 @@
Subject: This is not gnulib, so don't test it
From: Stephan Kulow <[email protected]>
-Index: gettext-0.19.7/gettext-tools/Makefile.am
-===================================================================
---- gettext-0.19.7.orig/gettext-tools/Makefile.am
-+++ gettext-0.19.7/gettext-tools/Makefile.am
+--- gettext-0.20.1.orig/gettext-tools/Makefile.am 2019-06-04
13:12:49.514030196 +0200
++++ gettext-0.20.1/gettext-tools/Makefile.am 2019-06-04 13:13:09.778072816
+0200
@@ -19,7 +19,7 @@
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I
libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
--SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles
misc man m4 tests gnulib-tests examples its
-+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles
misc man m4 tests examples its
+-SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles
emacs misc man m4 tests system-tests gnulib-tests examples doc
++SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles
emacs misc man m4 tests system-tests examples doc
EXTRA_DIST = misc/DISCLAIM
MOSTLYCLEANFILES = core *.stackdump
-Index: gettext-0.19.7/gettext-tools/Makefile.in
-===================================================================
---- gettext-0.19.7.orig/gettext-tools/Makefile.in
-+++ gettext-0.19.7/gettext-tools/Makefile.in
-@@ -1865,7 +1865,7 @@ top_builddir = @top_builddir@
+--- gettext-0.20.1.orig/gettext-tools/Makefile.in 2019-06-04
13:12:49.514030196 +0200
++++ gettext-0.20.1/gettext-tools/Makefile.in 2019-06-04 13:14:33.546249004
+0200
+@@ -2016,7 +2016,7 @@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I
libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
--SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles
misc man m4 tests gnulib-tests examples its
-+SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles
misc man m4 tests examples its
+-SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles
emacs misc man m4 tests system-tests gnulib-tests examples doc
++SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles
emacs misc man m4 tests system-tests examples doc
# Allow users to use "gnulib-tool --update".
+
++++++ gettext-po-mode.diff ++++++
--- /var/tmp/diff_new_pack.YlCmOJ/_old 2020-01-25 13:22:58.280005299 +0100
+++ /var/tmp/diff_new_pack.YlCmOJ/_new 2020-01-25 13:22:58.280005299 +0100
@@ -1,7 +1,7 @@
-Index: gettext-tools/misc/po-mode.el
+Index: gettext-tools/emacs/po-mode.el
===================================================================
---- gettext-tools/misc/po-mode.el.orig 2010-06-06 14:49:57.000000000 +0200
-+++ gettext-tools/misc/po-mode.el 2010-12-20 18:47:11.963132483 +0100
+--- gettext-tools/emacs/po-mode.el.orig 2010-06-06 14:49:57.000000000
+0200
++++ gettext-tools/emacs/po-mode.el 2010-12-20 18:47:11.963132483 +0100
@@ -1242,6 +1242,7 @@ all reachable through 'M-x customize', i
;; mode-line-format usually contains global-mode-string, but some
;; people customize this variable. As a last resort, append at the end.
++++++ reproducible.patch ++++++
--- /var/tmp/diff_new_pack.YlCmOJ/_old 2020-01-25 13:22:58.308005311 +0100
+++ /var/tmp/diff_new_pack.YlCmOJ/_new 2020-01-25 13:22:58.308005311 +0100
@@ -1,31 +1,6 @@
merged upstream <https://savannah.gnu.org/bugs/?54367>
-Index: gettext-0.19.8.1/gettext-runtime/man/help2man
-===================================================================
---- gettext-0.19.8.1.orig/gettext-runtime/man/help2man
-+++ gettext-0.19.8.1/gettext-runtime/man/help2man
-@@ -179,7 +179,7 @@ my ($help_text, $version_text) = map {
- or die "$this_program: can't get `--$_' info from $ARGV[0]\n"
- } qw(help version);
-
--my $date = strftime "%B %Y", localtime;
-+my $date = strftime "%B %Y", gmtime($ENV{SOURCE_DATE_EPOCH} || time);
- (my $program = $ARGV[0]) =~ s!.*/!!;
- my $package = $program;
- my $version;
-Index: gettext-0.19.8.1/gettext-tools/man/help2man
-===================================================================
---- gettext-0.19.8.1.orig/gettext-tools/man/help2man
-+++ gettext-0.19.8.1/gettext-tools/man/help2man
-@@ -179,7 +179,7 @@ my ($help_text, $version_text) = map {
- or die "$this_program: can't get `--$_' info from $ARGV[0]\n"
- } qw(help version);
-
--my $date = strftime "%B %Y", localtime;
-+my $date = strftime "%B %Y", gmtime($ENV{SOURCE_DATE_EPOCH} || time);
- (my $program = $ARGV[0]) =~ s!.*/!!;
- my $package = $program;
- my $version;
+
Index: gettext-0.19.8.1/gettext-tools/src/xgettext.c
===================================================================
--- gettext-0.19.8.1.orig/gettext-tools/src/xgettext.c
