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

- 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

gettext-csharp.spec

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

gettext-java.spec

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

gettext-runtime-mini.changes

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

gettext-runtime-mini.spec

@@ -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}
+Requires:       libtextstyle0 = %{version}
-Provides:       libtextstyle-devel = %{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 -f %{buildroot}/%_libdir/libtextstyle.a
-	rm -rf %{buildroot}/%_libdir/libtextstyle.so.*
-	rm -f %{buildroot}/%_libdir/libtextstyle.so
 	rm  -f %{buildroot}/%{_infodir}/libtextstyle.info
 %endif
 #find %%{buildroot} -maxdepth 2 -name '*html' -delete

gettext-runtime.changes

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

gettext-runtime.spec

@@ -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}
+Requires:       libtextstyle0 = %{version}
-Provides:       libtextstyle-devel = %{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 -f %{buildroot}/%_libdir/libtextstyle.a
-	rm -rf %{buildroot}/%_libdir/libtextstyle.so.*
-	rm -f %{buildroot}/%_libdir/libtextstyle.so
 	rm  -f %{buildroot}/%{_infodir}/libtextstyle.info
 %endif
 #find %%{buildroot} -maxdepth 2 -name '*html' -delete