diff --git a/gettext-0.19.8.1.tar.xz b/gettext-0.19.8.1.tar.xz deleted file mode 100644 index c2b3718..0000000 --- a/gettext-0.19.8.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:105556dbc5c3fbbc2aa0edb46d22d055748b6f5c7cd7a8d99f8e7eb84e938be4 -size 7209808 diff --git a/gettext-0.19.8.1.tar.xz.sig b/gettext-0.19.8.1.tar.xz.sig deleted file mode 100644 index 32e400d..0000000 --- a/gettext-0.19.8.1.tar.xz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJXXBKgAAoJENYFhI7X5phxb68P/i1Dvm0HzoKsrr2NFQpFq83P -dQlIoiAzZriLzL6tBvVE8cDw+hVgaRCUlAElulniKIDDPl7BH1/Qomf1AoQlPf8P -cU9Nj0sK1dK0TNQKEfk+AGQ20nXLRhZuKMO2k/M+1KAuOr2+KnAhYfUShyQa1hvF -4oNdT0mwA3Wve9hXjEh3022heD/nRkcB3C01dDJSWxEWJBv873JTnVhQ1EpOOMt2 -AEpuzVlUOd5dTIV8bOaac8WEBnTnhPnXppbJ+LhSZD6j2DyAvlZBHAfnrWA/nH+h -DIluAFwNUf+fzYY5YIIDkzN24NRTBZEmoWC1dGpkxkcDLSo99ra9RdSumgywf0NL -7rHSsUCxgbyxtsqdNyM6t+AOjSYnmYxGdLasoDWxisFFkKdW337qWV0iY+50Fk1e -IHhwsUhfEHHtu/jE81af8v+20Qg6U68os3k8kCrZQkG9YkDTtPMwloIZNQYnaTO8 -+JzhWzs/SdK+CgDjg19FkFkjVErZcQ0JcY3E3PKR8oCUKsWYBm474Z8jUsUieiCd -2irmbu/fO/toSc739YHn2QcRjG/wdzlhhGI5quMM4KOLqdU+ahmeZ3ILnkfMXsrn -BPv6sQ0twXnYC9Ix0K/U/iSXKAkC4D95qpYikw2glZ2eBcl9aI2C+sNsz322cNjl -BmVcwAeWnGuCA9NBrTTH -=wxWU ------END PGP SIGNATURE----- diff --git a/gettext-0.20.1.tar.gz b/gettext-0.20.1.tar.gz new file mode 100644 index 0000000..0dc0556 --- /dev/null +++ b/gettext-0.20.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66415634c6e8c3fa8b71362879ec7575e27da43da562c798a8a2f223e6e47f5c +size 23267473 diff --git a/gettext-0.20.1.tar.gz.sig b/gettext-0.20.1.tar.gz.sig new file mode 100644 index 0000000..5b5f6f0 --- /dev/null +++ b/gettext-0.20.1.tar.gz.sig @@ -0,0 +1,17 @@ +-----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----- diff --git a/gettext-csharp.changes b/gettext-csharp.changes index 849a45c..02a6de7 100644 --- a/gettext-csharp.changes +++ b/gettext-csharp.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Jun 11 13:08:04 UTC 2019 - Christian Vögl + +- 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) + + ------------------------------------------------------------------- Mon May 14 19:56:58 UTC 2018 - antoine.belvire@opensuse.org diff --git a/gettext-csharp.spec b/gettext-csharp.spec index d176e51..21f2724 100644 --- a/gettext-csharp.spec +++ b/gettext-csharp.spec @@ -26,26 +26,24 @@ BuildRequires: libxml2-devel 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 +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,7 +77,6 @@ reliably than 'resgen'. %patch2 %patch4 %patch5 -%patch9 %build export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint" diff --git a/gettext-dont-test-gnulib.patch b/gettext-dont-test-gnulib.patch index dd38180..0b73f79 100644 --- a/gettext-dont-test-gnulib.patch +++ b/gettext-dont-test-gnulib.patch @@ -1,29 +1,26 @@ Subject: This is not gnulib, so don't test it From: Stephan Kulow -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". + diff --git a/gettext-java.changes b/gettext-java.changes index 6d32942..da44e5c 100644 --- a/gettext-java.changes +++ b/gettext-java.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Tue Jun 11 13:12:37 UTC 2019 - Christian Vögl + +- 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) + ------------------------------------------------------------------- Mon May 14 19:45:56 UTC 2018 - antoine.belvire@opensuse.org diff --git a/gettext-java.spec b/gettext-java.spec index 23b46c3..9766c0f 100644 --- a/gettext-java.spec +++ b/gettext-java.spec @@ -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 +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 @@ java+swing. %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 diff --git a/gettext-po-mode.diff b/gettext-po-mode.diff index 10a32a6..a5e13ea 100644 --- a/gettext-po-mode.diff +++ b/gettext-po-mode.diff @@ -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. diff --git a/gettext-runtime-mini.changes b/gettext-runtime-mini.changes index 88aaeb2..d693507 100644 --- a/gettext-runtime-mini.changes +++ b/gettext-runtime-mini.changes @@ -3,6 +3,57 @@ Thu Jun 20 09:56:30 UTC 2019 - Martin Liška - Disable LTO (boo#1138806). +------------------------------------------------------------------- +Tue Jun 11 12:34:24 UTC 2019 - Christian Vögl + +- 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) + ------------------------------------------------------------------- Sat May 25 11:53:33 UTC 2019 - Marcus Meissner diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index 34f7e7c..dc0e73e 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -17,12 +17,12 @@ %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 @@ -34,7 +34,6 @@ BuildRequires: libcroco-devel BuildRequires: libxml2-devel BuildRequires: perl-libintl-perl BuildRequires: tcl -BuildRequires: xz # bug437293 %ifarch ppc64 Obsoletes: gettext-64bit @@ -56,12 +55,12 @@ License: GPL-3.0-or-later AND LGPL-2.0-or-later Group: Development/Tools/Other 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 +69,9 @@ Patch4: gettext-po-mode.diff Patch5: gettext-initialize_vars.patch # PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- coolo@suse.de Patch6: gettext-dont-test-gnulib.patch -Patch9: gettext-needlessly_init_vars.patch -# PATCH-FIX-UPSTREAM https://savannah.gnu.org/bugs/?49654 -- bmwiedemann@opensuse.org -Patch10: msgfmt-remove-pot-creation-date.patch # PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com 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 @@ -133,6 +128,28 @@ BuildArch: noarch This subpackage contains the HTML version of the gettext documentation as well as project examples. +%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: %{name} = %{version} +Provides: libtextstyle-devel = %{version} + +%description -n libtextstyle-devel +This package provides headers and static libraries for libtextstyle + + %prep %setup -q -n %{pacname}-%{version} %patch @@ -141,10 +158,7 @@ as well as project examples. %patch4 %patch5 %patch6 -p1 -%patch9 -%patch10 -p1 %patch11 -p1 -%patch12 -p0 %patch13 -p1 %build @@ -152,7 +166,7 @@ as well as project examples. # 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="$CFLAGS -Dgcc_is_lint" %if 0%{?qemu_user_space_build:1} OPTS="--disable-openmp" @@ -169,10 +183,10 @@ make install DESTDIR=%{buildroot} 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 +197,8 @@ rm -rf %{buildroot}/%_datadir/locale/en@{bold,}quot #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 +#find %%{buildroot} -maxdepth 2 -name '*html' | xargs rm -f # hardlink the dupes in the documentation: cd %{buildroot}/%{my_docdir}/examples sh %{SOURCE3} @@ -232,6 +247,12 @@ rm -rf %{buildroot} %install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz +%post -n libtextstyle0 +ldconfig + +%postun -n libtextstyle0 +ldconfig + %files -f gettext-runtime.lang %defattr(-,root,root) %license COPYING @@ -292,7 +313,6 @@ rm -rf %{buildroot} %_libdir/preloadable_libintl.so %_libdir/gettext %_datadir/%pacname/config.rpath -%_datadir/%pacname/intl %_datadir/%pacname/po %_datadir/%pacname/projects %_datadir/%pacname/gettext.h @@ -316,4 +336,22 @@ rm -rf %{buildroot} %doc %_docdir/%name/xgettext*.html %doc %_docdir/%name/recode-sr-latin.1.html +%files -n libtextstyle0 +%defattr(-,root,root) + +%doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html +%doc %_infodir/libtextstyle.info.gz +%_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.a +%_libdir/libtextstyle.so +%_libdir/libtextstyle.so.0 + %changelog diff --git a/gettext-runtime.changes b/gettext-runtime.changes index 88aaeb2..d693507 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -3,6 +3,57 @@ Thu Jun 20 09:56:30 UTC 2019 - Martin Liška - Disable LTO (boo#1138806). +------------------------------------------------------------------- +Tue Jun 11 12:34:24 UTC 2019 - Christian Vögl + +- 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) + ------------------------------------------------------------------- Sat May 25 11:53:33 UTC 2019 - Marcus Meissner diff --git a/gettext-runtime.spec b/gettext-runtime.spec index adeca2a..b24e691 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -17,12 +17,12 @@ %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 @@ -34,7 +34,6 @@ BuildRequires: libcroco-devel BuildRequires: libxml2-devel BuildRequires: perl-libintl-perl BuildRequires: tcl -BuildRequires: xz # bug437293 %ifarch ppc64 Obsoletes: gettext-64bit @@ -56,12 +55,12 @@ License: GPL-3.0-or-later AND LGPL-2.0-or-later Group: Development/Tools/Other 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 +69,9 @@ Patch4: gettext-po-mode.diff Patch5: gettext-initialize_vars.patch # PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- coolo@suse.de Patch6: gettext-dont-test-gnulib.patch -Patch9: gettext-needlessly_init_vars.patch -# PATCH-FIX-UPSTREAM https://savannah.gnu.org/bugs/?49654 -- bmwiedemann@opensuse.org -Patch10: msgfmt-remove-pot-creation-date.patch # PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com 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 @@ -133,6 +128,28 @@ BuildArch: noarch This subpackage contains the HTML version of the gettext documentation as well as project examples. +%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: %{name} = %{version} +Provides: libtextstyle-devel = %{version} + +%description -n libtextstyle-devel +This package provides headers and static libraries for libtextstyle + + %prep %setup -q -n %{pacname}-%{version} %patch @@ -141,10 +158,7 @@ as well as project examples. %patch4 %patch5 %patch6 -p1 -%patch9 -%patch10 -p1 %patch11 -p1 -%patch12 -p0 %patch13 -p1 %build @@ -152,7 +166,7 @@ as well as project examples. # 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="$CFLAGS -Dgcc_is_lint" %if 0%{?qemu_user_space_build:1} OPTS="--disable-openmp" @@ -169,10 +183,10 @@ make install DESTDIR=%{buildroot} 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 +197,8 @@ rm -rf %{buildroot}/%_datadir/locale/en@{bold,}quot #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 +#find %%{buildroot} -maxdepth 2 -name '*html' | xargs rm -f # hardlink the dupes in the documentation: cd %{buildroot}/%{my_docdir}/examples sh %{SOURCE3} @@ -232,6 +247,18 @@ rm -rf %{buildroot} %install_info_delete --info-dir=%{_infodir} %{_infodir}/gettext.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/autosprintf.info.gz +%post -n libtextstyle0 +ldconfig + +%postun -n libtextstyle0 +ldconfig + +%post -n libtextstyle-devel +ldconfig + +%postun -n libtextstyle-devel +ldconfig + %files -f gettext-runtime.lang %defattr(-,root,root) %license COPYING @@ -292,7 +319,6 @@ rm -rf %{buildroot} %_libdir/preloadable_libintl.so %_libdir/gettext %_datadir/%pacname/config.rpath -%_datadir/%pacname/intl %_datadir/%pacname/po %_datadir/%pacname/projects %_datadir/%pacname/gettext.h @@ -316,4 +342,22 @@ rm -rf %{buildroot} %doc %_docdir/%name/xgettext*.html %doc %_docdir/%name/recode-sr-latin.1.html +%files -n libtextstyle0 +%defattr(-,root,root) + +%doc %_docdir/gettext-runtime%{?with_mini:-mini}/libtextstyle*.html +%doc %_infodir/libtextstyle.info.gz +%_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.a +%_libdir/libtextstyle.so +%_libdir/libtextstyle.so.0 + %changelog diff --git a/reproducible.patch b/reproducible.patch index 8e2a2b6..e94f64c 100644 --- a/reproducible.patch +++ b/reproducible.patch @@ -1,31 +1,6 @@ merged upstream -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