rpm/gettext-runtime
SHA256
1
0
Fork 0
forked from pool/gettext-runtime
Code Pull Requests Activity

Accepting request 758757 from home:StefanBruens:branches:Base:System

Browse Source 
- 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.

OBS-URL: https://build.opensuse.org/request/show/758757
OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=160
This commit is contained in:
Christian Vögl 2020-01-07 15:05:49 +00:00 committed by Git OBS Bridge
parent 1ea87b053e
commit 1b9f92693c
6 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gettext-csharp.spec
View File

@ -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

2
gettext-java.spec
View File

@ -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

9
gettext-runtime-mini.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Dec 21 17:23:21 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- 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 <cvoegl@suse.de>

15
gettext-runtime-mini.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gettext-runtime-mini
#
# 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
@ -144,8 +144,7 @@ It does this in a way that allows the end user to customize the styling using th
Summary: Devel package for libtextstyle
License: LGPL-2.1-or-later
Group: Development/Tools/Other
Requires: %{name} = %{version}
Provides: libtextstyle-devel = %{version}
Requires: libtextstyle0 = %{version}
%description -n libtextstyle-devel
This package provides headers and static libraries for libtextstyle
@ -172,6 +171,12 @@ export LDFLAGS="-lm"
OPTS="--disable-openmp"
%endif
%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
@ -202,9 +207,7 @@ rm -f %{buildroot}/%_libdir/libtextstyle.la
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 -rf %{buildroot}/usr/lib/debug/%_libdir/libtextstyle.so.0.0.0-0*
rm -rf %{buildroot}/%_libdir/libtextstyle.so.*
rm -f %{buildroot}/%_libdir/libtextstyle.so
rm -f %{buildroot}/%_libdir/libtextstyle.a
rm -f %{buildroot}/%{_infodir}/libtextstyle.info
%endif
#find %%{buildroot} -maxdepth 2 -name '*html' -delete

9
gettext-runtime.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sat Dec 21 17:23:21 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- 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 <cvoegl@suse.de>

15
gettext-runtime.spec
View File

@ -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
@ -144,8 +144,7 @@ It does this in a way that allows the end user to customize the styling using th
Summary: Devel package for libtextstyle
License: LGPL-2.1-or-later
Group: Development/Tools/Other
Requires: %{name} = %{version}
Provides: libtextstyle-devel = %{version}
Requires: libtextstyle0 = %{version}
%description -n libtextstyle-devel
This package provides headers and static libraries for libtextstyle
@ -172,6 +171,12 @@ export LDFLAGS="-lm"
OPTS="--disable-openmp"
%endif
%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
@ -202,9 +207,7 @@ rm -f %{buildroot}/%_libdir/libtextstyle.la
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 -rf %{buildroot}/usr/lib/debug/%_libdir/libtextstyle.so.0.0.0-0*
rm -rf %{buildroot}/%_libdir/libtextstyle.so.*
rm -f %{buildroot}/%_libdir/libtextstyle.so
rm -f %{buildroot}/%_libdir/libtextstyle.a
rm -f %{buildroot}/%{_infodir}/libtextstyle.info
%endif
#find %%{buildroot} -maxdepth 2 -name '*html' -delete