Hello community,

here is the log from the commit of package singularity for openSUSE:Factory 
checked in at 2019-09-07 11:53:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/singularity (Old)
 and      /work/SRC/openSUSE:Factory/.singularity.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "singularity"

Sat Sep  7 11:53:44 2019 rev:12 rq:728714 version:3.4.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/singularity/singularity.changes  2019-07-22 
12:20:25.251663888 +0200
+++ /work/SRC/openSUSE:Factory/.singularity.new.7948/singularity.changes        
2019-09-07 11:53:50.814270592 +0200
@@ -1,0 +2,18 @@
+Tue Sep  3 14:39:35 UTC 2019 - Ana Guerrero Lopez <[email protected]>
+
+- New version 3.4.0. Many changes since 3.2.1, for the full changelog 
+  please read CHANGELOG.md
+- Add new BuildRequires on cryptsetup.
+- Patches refreshed:
+  * build-position-independent-binaries.patch
+- Patches removed, merged upstream:
+  * zypper-install-Fix-dbpath-for-newer-versions-of-SUSE-Linux.patch
+  * Handle-zypper-error-code-correctly.patch
+  * Support-multi-line-bootdef-settings.patch
+  * Add-support-for-numbered-variables.patch
+  * Improve-zypper-integration.patch
+  * Add-unit-tests-for-zypper-installation-on-SLE.patch
+  * Fix-pgp-key-version-strings-and-paths.patch
+- Patches added, fix an issue with the flags order provided by the Makefile
+  * fix_flags_order.patch
+-------------------------------------------------------------------

Old:
----
  Add-support-for-numbered-variables.patch
  Add-unit-tests-for-zypper-installation-on-SLE.patch
  Fix-pgp-key-version-strings-and-paths.patch
  Handle-zypper-error-code-correctly.patch
  Improve-zypper-integration.patch
  Support-multi-line-bootdef-settings.patch
  singularity-3.2.1.tar.gz
  zypper-install-Fix-dbpath-for-newer-versions-of-SUSE-Linux.patch

New:
----
  fix_flags_order.patch
  singularity-3.4.0.tar.gz

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

Other differences:
------------------
++++++ singularity.spec ++++++
--- /var/tmp/diff_new_pack.21iQal/_old  2019-09-07 11:53:52.718270322 +0200
+++ /var/tmp/diff_new_pack.21iQal/_new  2019-09-07 11:53:52.718270322 +0200
@@ -23,7 +23,7 @@
 License:        BSD-3-Clause-LBNL
 Group:          Productivity/Clustering/Computing
 Name:           singularity
-Version:        3.2.1
+Version:        3.4.0
 Release:        0
 # https://spdx.org/licenses/BSD-3-Clause-LBNL.html
 URL:            https://www.sylabs.io/singularity/
@@ -31,13 +31,7 @@
 Source1:        README.SUSE
 Source5:        %{name}-rpmlintrc
 Patch0:         build-position-independent-binaries.patch
-Patch1:         
zypper-install-Fix-dbpath-for-newer-versions-of-SUSE-Linux.patch
-Patch2:         Handle-zypper-error-code-correctly.patch
-Patch3:         Support-multi-line-bootdef-settings.patch
-Patch4:         Add-support-for-numbered-variables.patch
-Patch5:         Improve-zypper-integration.patch
-Patch6:         Add-unit-tests-for-zypper-installation-on-SLE.patch
-Patch7:         Fix-pgp-key-version-strings-and-paths.patch
+Patch1:         fix_flags_order.patch
 
 BuildRequires:  gcc
 # Remove after brokenness has been fixed
@@ -46,6 +40,7 @@
 %else
 BuildRequires:  go1.11
 %endif
+BuildRequires:  cryptsetup
 BuildRequires:  fdupes
 BuildRequires:  git
 BuildRequires:  libuuid-devel
@@ -72,12 +67,6 @@
 mv %{name}-%{version} %{name}
 %patch0 -p 4
 %patch1 -p 4
-%patch2 -p 4
-%patch3 -p 4
-%patch4 -p 4
-%patch5 -p 4
-%patch6 -p 4
-%patch7 -p 4
 cp %{S:1} .
 
 %build

++++++ build-position-independent-binaries.patch ++++++
--- /var/tmp/diff_new_pack.21iQal/_old  2019-09-07 11:53:52.746270318 +0200
+++ /var/tmp/diff_new_pack.21iQal/_new  2019-09-07 11:53:52.746270318 +0200
@@ -13,9 +13,9 @@
 index 87359af..045563a 100644
 --- a/src/github.com/sylabs/singularity/mlocal/frags/go_common_opts.mk
 +++ b/src/github.com/sylabs/singularity/mlocal/frags/go_common_opts.mk
-@@ -2,10 +2,10 @@
- GO111MODULE := on
- GO_TAGS := containers_image_openpgp sylog
+@@ -3,10 +3,10 @@
+ GO_TAGS := containers_image_openpgp sylog imgbuild_engine oci_engine 
singularity_engine fakeroot_engine
+ GO_TAGS_SUID := containers_image_openpgp sylog singularity_engine 
fakeroot_engine
  GO_LDFLAGS :=
 -GO_BUILDMODE := -buildmode=default
 +GO_BUILDMODE := -buildmode=pie

++++++ fix_flags_order.patch ++++++
From: Ana Guerrero Lopez <[email protected]>
Date: Wed Sep  4 11:28:43 CEST 2019
Subject: Fix flags order 
Patch-mainline: Not yet
References: https://github.com/sylabs/singularity/pull/4375

GO_MODFLAGS should be provided to the go subcommand, and not directly
to go.

Signed-off-by: Ana Guerrero Lopez <[email protected]>
--- a/src/github.com/sylabs/singularity/mlocal/frags/build_scripts.mk.orig      
2019-09-04 11:17:26.293034517 +0200
+++ b/src/github.com/sylabs/singularity/mlocal/frags/build_scripts.mk   
2019-09-04 11:19:04.977038577 +0200
@@ -7,7 +7,7 @@
 $(SOURCEDIR)/scripts/go-test: export GO_TAGS := $(GO_TAGS)
 $(SOURCEDIR)/scripts/go-test: $(SOURCEDIR)/scripts/go-test.in 
$(SOURCEDIR)/scripts/expand-env.go
        @echo ' GEN $@'
-       $(V) $(GO) $(GO_MODFLAGS) run $(SOURCEDIR)/scripts/expand-env.go < $< > 
$@
+       $(V) $(GO) run $(GO_MODFLAGS) $(SOURCEDIR)/scripts/expand-env.go < $< > 
$@
        $(V) chmod +x $@
 
 ALL += $(SOURCEDIR)/scripts/go-test
++++++ singularity-3.2.1.tar.gz -> singularity-3.4.0.tar.gz ++++++
/work/SRC/openSUSE:Factory/singularity/singularity-3.2.1.tar.gz 
/work/SRC/openSUSE:Factory/.singularity.new.7948/singularity-3.4.0.tar.gz 
differ: char 13, line 1


Reply via email to