Hello community,

here is the log from the commit of package coreutils for openSUSE:Factory 
checked in at 2020-02-13 10:10:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/coreutils (Old)
 and      /work/SRC/openSUSE:Factory/.coreutils.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "coreutils"

Thu Feb 13 10:10:47 2020 rev:131 rq:769873 version:8.31

Changes:
--------
--- /work/SRC/openSUSE:Factory/coreutils/coreutils.changes      2019-09-26 
20:35:57.159389180 +0200
+++ /work/SRC/openSUSE:Factory/.coreutils.new.26092/coreutils.changes   
2020-02-13 10:10:48.500315366 +0100
@@ -1,0 +2,21 @@
+Tue Jan 28 08:13:51 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- disable single and testsuite builds in rings/staging
+- remove duplicate "coreutils" in flavor to make it look nicer in OBS
+
+-------------------------------------------------------------------
+Mon Jan 20 15:00:06 UTC 2020 - Bernhard Voelker <m...@bernhard-voelker.de>
+
+- minor: remove obsolete comment in spec file.
+
+-------------------------------------------------------------------
+Thu Jan  9 16:23:59 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- switch to multibuild
+- add coreutils-single subpackage that contains a single binary coreutils tool
+  similar to busybox
+- package LC_CTIME directories also in lang package
+- split off doc package
+- remove info macros, handled by file trigger nowadays
+
+-------------------------------------------------------------------

Old:
----
  coreutils-testsuite.changes
  coreutils-testsuite.spec
  pre_checkin.sh

New:
----
  _multibuild

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ coreutils.spec ++++++
--- /var/tmp/diff_new_pack.bTutAq/_old  2020-02-13 10:10:51.296316988 +0100
+++ /var/tmp/diff_new_pack.bTutAq/_new  2020-02-13 10:10:51.316316999 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package coreutils
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,23 +16,27 @@
 #
 
 
-Name:           coreutils
+%bcond_with ringdisabled
+
+# there are more fancy ways to define a package name using magic
+# macros but OBS and the bots that rely on parser information from
+# OBS can't deal with all of them
+%define flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" != ""
+%define name_suffix -%{flavor}
+%if %{with ringdisabled}
+ExclusiveArch:  do_not_build
+%endif
+%endif
+
+Name:           coreutils%{?name_suffix} 
 Summary:        GNU Core Utilities
 License:        GPL-3.0-or-later
 Group:          System/Base
-Url:            https://www.gnu.org/software/coreutils/
+URL:            https://www.gnu.org/software/coreutils/
 Version:        8.31
 Release:        0
 
-#################################################################
-#################################################################
-###                ! ! ! R E M I N D E R ! ! !                ###
-#################################################################
-###    Please call "./pre_checkin.sh" prior to submitting.    ###
-###    (This will regenerate coreutils-testsuite.spec)        ###
-#################################################################
-#################################################################
-
 BuildRequires:  automake
 BuildRequires:  gmp-devel
 BuildRequires:  libacl-devel
@@ -60,18 +64,21 @@
 %endif
 %endif
 
-%if "%{name}" == "coreutils"
+%if "%{name}" == "coreutils" || "%{name}" == "coreutils-single"
 Provides:       fileutils = %{version}
 Provides:       mktemp = %{version}
 Provides:       sh-utils = %{version}
 Provides:       stat = %{version}
 Provides:       textutils = %{version}
+%if "%{name}" == "coreutils-single"
+Conflicts:      coreutils
+Provides:       coreutils = %{version}-%{release}
+%endif
 %endif
 
 # this will create a cycle, broken up randomly - coreutils is just
 # too core to have other prerequisites.
 #PreReq:         permissions
-PreReq:         %{install_info_prereq}
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -146,6 +153,17 @@
   timeout touch tr true truncate tsort tty uname unexpand uniq unlink
   uptime users vdir wc who whoami yes
 
+%package doc
+Summary:        Documentation for the GNU Core Utilities
+Group:          Documentation/Man
+Provides:       coreutils:%{_infodir}/coreutils.info.gz
+Supplements:    packageand(coreutils:patterns-base-documentation)
+Supplements:    packageand(coreutils-single:patterns-base-documentation)
+BuildArch:      noarch
+
+%description doc
+This package contains the documentation for the GNU Core Utilities.
+
 # ================================================
 %lang_package
 %prep
@@ -183,6 +201,12 @@
 export CFLAGS="%optflags"
 %configure --libexecdir=%{_libdir} \
            --enable-install-program=arch \
+          --enable-no-install-program=kill \
+%if "%{name}" == "coreutils-single"
+           --enable-single-binary \
+           --without-openssl \
+           --without-gmp \
+%endif
            DEFAULT_POSIX2_VERSION=200112 \
            alternative=199209
 
@@ -211,13 +235,9 @@
 
 # ================================================
 %install
-%if "%{name}" == "coreutils"
+%if "%{name}" == "coreutils" || "%{name}" == "coreutils-single"
 make install DESTDIR="%buildroot" pkglibexecdir=%{_libdir}/%{name}
 
-# remove kill - we use that from util-linux.
-rm -v %{buildroot}%{_bindir}/kill
-rm -v %{buildroot}/%{_mandir}/man1/kill.1
-
 #UsrMerge
 install -d %{buildroot}/bin
 for i in arch basename cat chgrp chmod chown cp date dd df echo \
@@ -228,31 +248,34 @@
 done
 #EndUsrMerge
 echo '.so man1/test.1' > %{buildroot}/%{_mandir}/man1/\[.1
+%if "%{name}" == "coreutils"
 %find_lang coreutils
+# add LC_TIME directories to lang package
+awk '/LC_TIME/ {a=$2; gsub(/\/[^\/]+\.mo/,"", a); print "%%dir", a} {print}' < 
coreutils.lang > tmp
+mv tmp coreutils.lang
+%else
+rm -rf %{buildroot}%{_mandir}
+rm -rf %{buildroot}%{_infodir}
+rm -rf %{buildroot}%{_datadir}/locale
+> coreutils.lang
+%endif
 %endif
 
 # ================================================
 %post
-%if "%{name}" == "coreutils"
-%install_info --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz
+%if "%{name}" == "coreutils" || "%{name}" == "coreutils-single"
 %{?regenerate_initrd_post}
 %endif
 
 # ================================================
 %posttrans
-%if "%{name}" == "coreutils"
+%if "%{name}" == "coreutils" || "%{name}" == "coreutils-single"
 %{?regenerate_initrd_posttrans}
 %endif
 
 # ================================================
-%postun
-%if "%{name}" == "coreutils"
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/coreutils.info.gz
-%endif
-
-# ================================================
 %files
-%if "%{name}" == "coreutils"
+%if "%{name}" == "coreutils" || "%{name}" == "coreutils-single"
 
 %defattr(-,root,root)
 %license COPYING
@@ -262,13 +285,16 @@
 /bin/*
 #EndUsrMerge
 %{_libdir}/%{name}
-%doc %{_infodir}/coreutils.info*.gz
-%doc %{_mandir}/man1/*.1.gz
-%dir %{_datadir}/locale/*/LC_TIME
 
+%if "%{name}" == "coreutils"
 %files lang -f coreutils.lang
 %defattr(-,root,root)
 
+%files doc
+%doc %{_infodir}/coreutils.info*.gz
+%doc %{_mandir}/man1/*.1.gz
+%endif
+
 %else
 
 # test-suite

++++++ _multibuild ++++++
<multibuild>
  <flavor>single</flavor>
  <flavor>testsuite</flavor>
</multibuild>


Reply via email to