3
0

Accepting request 866400 from Base:System

- use https for urls
- spec-cleaner run 
- apply all the patches from gettext-runtime

- use https for urls 
- apply all the patches from gettext-runtime

- fixup libtextstyle autofoo with adding 
  use-acinit-for-libtextstyle.patch 

- fixup libtextstyle autofoo with adding 
  use-acinit-for-libtextstyle.patch 

- Reintroduce autoreconf call

OBS-URL: https://build.opensuse.org/request/show/866400
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gettext-runtime?expand=0&rev=86
This commit is contained in:
Dominique Leuenberger 2021-01-26 13:43:52 +00:00 committed by Git OBS Bridge
commit b58f8fbc2f
9 changed files with 138 additions and 70 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jan 22 22:06:46 UTC 2021 - Dirk Müller <dmueller@suse.com>
- use https for urls
- spec-cleaner run
- apply all the patches from gettext-runtime
-------------------------------------------------------------------
Tue Jul 28 10:33:41 UTC 2020 - Christian Vögl <christian.voegl@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package gettext-csharp
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,7 +16,37 @@
#
%if 0%{?fedora_version} || 0%{?centos_version} <= 600 || 0%{?scilin_version} <= 600 || 0%{?rhel_version} <= 600
%global debug_package %{nil}
%endif
Name: gettext-csharp
Version: 0.21
Release: 0
Summary: Native Language Support (NLS) for C#
License: LGPL-2.1-or-later
Group: Development/Tools/Other
URL: https://www.gnu.org/software/gettext/
Source0: https://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
Source1: https://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz.sig
Source2: suse-start-po-mode.el
Source3: gettext-linkdupes.sh
Source4: gettext-rpmlintrc
Source5: %{name}.keyring
Patch: gettext-0.12.1-sigfpe.patch
Patch1: gettext-0.19.3-fix-bashisms.patch
Patch2: gettext-0.12.1-gettextize.patch
Patch3: use-acinit-for-libtextstyle.patch
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
# PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com
Patch11: boo941629-unnessary-rpath-on-standard-path.patch
# PATCH-FIX-SUSE Bug boo#1106843
Patch13: reproducible.patch
# PATCH-FEATURE bsc#1165138
Patch14: 0001-msgcat-Add-feature-to-use-the-newest-po-file.patch
Patch15: 0002-msgcat-Merge-headers-when-use-first.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glib2-devel
@ -27,27 +57,6 @@ BuildRequires: mono-devel
BuildRequires: perl-libintl-perl
BuildRequires: tcl
Requires: mono
URL: http://www.gnu.org/software/gettext/
Version: 0.21
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
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
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
%if 0%{?fedora_version} || 0%{?centos_version} <= 600 || 0%{?scilin_version} <= 600 || 0%{?rhel_version} <= 600
%global debug_package %{nil}
%endif
%description
Mono with its 'resgen' program uses a design that Microsoft created and
@ -70,26 +79,31 @@ The included GNU.Gettext.dll gives the user this freedom back and the
also included msgfmt.net.exe and msgunfmt.net.exe handle PO files more
reliably than 'resgen'.
%prep
%setup -q -n gettext-%{version}
%patch
%patch0
%patch1 -p1
%patch2
%patch3 -p1
%patch4
%patch5
%patch6 -p1
%patch11 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%build
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
#sh autogen.sh
autoreconf -fiv
%configure --enable-shared --enable-csharp
make %{?_smp_mflags} GMSGFMT=../src/msgfmt V=1
%make_build GMSGFMT=../src/msgfmt
%install
export LC_CTYPE=ISO-8859-15
%makeinstall
%make_install
mkdir examples
mv %{buildroot}/%{_datadir}/doc/gettext/examples/*csharp* examples
mv %{buildroot}/%{_datadir}/doc/gettext/csharpdoc csharpdoc
@ -109,24 +123,20 @@ mkdir -p %{buildroot}/%{_defaultdocdir}/%{name}
mv examples %{buildroot}/%{_defaultdocdir}/%{name}
mv csharpdoc %{buildroot}/%{_defaultdocdir}/%{name}
# exclude files packaged via other spec files
rm -Rf %{buildroot}/%_bindir
rm -f %{buildroot}/%_libdir/lib*
rm -f %{buildroot}/%_libdir/gettext/hostname
rm -f %{buildroot}/%_libdir/gettext/project-id
rm -f %{buildroot}/%_libdir/gettext/urlget
rm -f %{buildroot}/%_libdir/gettext/user-email
rm -f %{buildroot}/%_libdir/gettext/cldr-plurals
rm -Rf %{buildroot}/%_includedir
rm -f %{buildroot}/%_libdir/preloadable_libintl.so
%clean
rm -rf %{buildroot}
rm -Rf %{buildroot}/%{_bindir}
rm -f %{buildroot}/%{_libdir}/lib*
rm -f %{buildroot}/%{_libdir}/gettext/hostname
rm -f %{buildroot}/%{_libdir}/gettext/project-id
rm -f %{buildroot}/%{_libdir}/gettext/urlget
rm -f %{buildroot}/%{_libdir}/gettext/user-email
rm -f %{buildroot}/%{_libdir}/gettext/cldr-plurals
rm -Rf %{buildroot}/%{_includedir}
rm -f %{buildroot}/%{_libdir}/preloadable_libintl.so
%files
%defattr(-,root,root)
%doc %{_defaultdocdir}/%{name}
%_libdir/GNU.Gettext.dll
%_libdir/gettext/msgfmt.net.exe
%_libdir/gettext/msgunfmt.net.exe
%{_libdir}/GNU.Gettext.dll
%{_libdir}/gettext/msgfmt.net.exe
%{_libdir}/gettext/msgunfmt.net.exe
%changelog

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 22 22:06:58 UTC 2021 - Dirk Müller <dmueller@suse.com>
- use https for urls
- apply all the patches from gettext-runtime
-------------------------------------------------------------------
Tue Jul 28 10:20:58 UTC 2020 - Christian Vögl <christian.voegl@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package gettext-java
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,17 +22,28 @@ 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
Source1: gettext-rpmlintrc
URL: https://www.gnu.org/software/gettext/
Source0: https://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
Source1: https://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz.sig
Source2: suse-start-po-mode.el
Source3: gettext-linkdupes.sh
Source4: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz.sig
Source4: gettext-rpmlintrc
Source5: %{name}.keyring
Patch0: gettext-0.12.1-sigfpe.patch
Patch1: gettext-0.19.3-fix-bashisms.patch
Patch2: gettext-0.12.1-gettextize.patch
Patch3: use-acinit-for-libtextstyle.patch
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
# PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com
Patch11: boo941629-unnessary-rpath-on-standard-path.patch
# PATCH-FIX-SUSE Bug boo#1106843
Patch13: reproducible.patch
# PATCH-FEATURE bsc#1165138
Patch14: 0001-msgcat-Add-feature-to-use-the-newest-po-file.patch
Patch15: 0002-msgcat-Merge-headers-when-use-first.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: glib2-devel
@ -56,14 +67,20 @@ java+swing.
%prep
%setup -q -n gettext-%{version}
%patch0
%patch1 -p1
%patch2
%patch3 -p1
%patch4
%patch5
%patch6 -p1
%patch11 -p1
%patch13 -p1
%patch14 -p1
%patch15 -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 -lm"
export CXXFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
%configure --enable-shared --enable-java

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 22 21:45:16 UTC 2021 - Dirk Müller <dmueller@suse.com>
- fixup libtextstyle autofoo with adding
use-acinit-for-libtextstyle.patch
-------------------------------------------------------------------
Fri Aug 7 07:46:39 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package gettext-runtime-mini
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,12 +22,12 @@
Name: gettext-runtime-mini
Version: 0.21
Release: 0
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: libtool
# To get an updated linkdupes.sh (in case there are new dupes), temproarily enable:
#BuildRequires: fdupes
%if %{without mini}
BuildRequires: automake
BuildRequires: glib2-devel
BuildRequires: libcroco-devel
BuildRequires: libxml2-devel
@ -52,18 +52,18 @@ Provides: gettext-runtime = %{version}
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/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
Source1: gettext-rpmlintrc
URL: https://www.gnu.org/software/gettext/
Source0: https://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
Source1: https://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz.sig
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: gettext-rpmlintrc
Source6: %name.keyring
Patch: gettext-0.12.1-sigfpe.patch
Patch0: gettext-0.12.1-sigfpe.patch
Patch1: gettext-0.19.3-fix-bashisms.patch
Patch2: gettext-0.12.1-gettextize.patch
Patch3: use-acinit-for-libtextstyle.patch
Patch4: gettext-po-mode.diff
Patch5: gettext-initialize_vars.patch
# PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- coolo@suse.de
@ -155,9 +155,10 @@ This package provides headers and static libraries for libtextstyle
%prep
%setup -q -n %{pacname}-%{version}
%patch
%patch0
%patch1 -p1
%patch2
%patch3 -p1
%patch4
%patch5
%patch6 -p1
@ -170,7 +171,6 @@ This package provides headers and static libraries for libtextstyle
%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"

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 22 21:45:16 UTC 2021 - Dirk Müller <dmueller@suse.com>
- fixup libtextstyle autofoo with adding
use-acinit-for-libtextstyle.patch
-------------------------------------------------------------------
Fri Aug 7 07:46:39 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
@ -5,7 +11,7 @@ Fri Aug 7 07:46:39 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
- Add patches:
* 0001-msgcat-Add-feature-to-use-the-newest-po-file.patch
* 0002-msgcat-Merge-headers-when-use-first.patch
- Reintroduce utoreconf call
- Reintroduce autoreconf call
-------------------------------------------------------------------
Tue Jul 28 09:33:34 UTC 2020 - Christian Vögl <christian.voegl@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package gettext-runtime
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -52,18 +52,18 @@ Provides: gettext-runtime = %{version}
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/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: http://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
Source1: gettext-rpmlintrc
URL: https://www.gnu.org/software/gettext/
Source0: https://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz
Source1: https://ftp.gnu.org/gnu/gettext/gettext-%{version}.tar.xz.sig
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: gettext-rpmlintrc
Source6: %name.keyring
Patch: gettext-0.12.1-sigfpe.patch
Patch0: gettext-0.12.1-sigfpe.patch
Patch1: gettext-0.19.3-fix-bashisms.patch
Patch2: gettext-0.12.1-gettextize.patch
Patch3: use-acinit-for-libtextstyle.patch
Patch4: gettext-po-mode.diff
Patch5: gettext-initialize_vars.patch
# PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- coolo@suse.de
@ -155,9 +155,10 @@ This package provides headers and static libraries for libtextstyle
%prep
%setup -q -n %{pacname}-%{version}
%patch
%patch0
%patch1 -p1
%patch2
%patch3 -p1
%patch4
%patch5
%patch6 -p1
@ -170,7 +171,6 @@ This package provides headers and static libraries for libtextstyle
%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"

View File

@ -0,0 +1,16 @@
--- gettext-0.21/libtextstyle/configure.ac
+++ gettext-0.21/libtextstyle/configure.ac
@@ -17,11 +17,10 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.63])
-AC_INIT
+AC_INIT([libtextstyle],
+ m4_esyscmd([source ./version.sh; echo $VERSION_NUMBER | tr -d '\n']))
AC_CONFIG_SRCDIR([version.sh])
AC_CONFIG_AUX_DIR([build-aux])
-. $srcdir/version.sh
-gl_INIT_PACKAGE([libtextstyle], [$VERSION_NUMBER])
AM_INIT_AUTOMAKE([1.13 silent-rules])
AM_CONFIG_HEADER([config.h])