Update to last successful build

6580f461fcfbbcdaca4a71f18d0f689b8c44cc7f Fix issues in medianetwork

OBS-URL: https://build.opensuse.org/package/show/zypp:Head/libzypp?expand=0&rev=2350

libzypp-17.28.1.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd43be26af2a6ac277c86dfbd849eec2957b20e9873147f421354cbf1f641c95
+oid sha256:207b3b50c106f9096127abcf56f1b3c1f1beec4cb4ea39b0211bd1053a878822
-size 5354239
+size 5354089

libzypp.spec

@@ -42,9 +42,9 @@
 Name:           libzypp
 Version:        17.28.1
 Release:        0
+License:        GPL-2.0-or-later
 URL:            https://github.com/openSUSE/libzypp
 Summary:        Library for package, patch, pattern and product management
-License:        GPL-2.0-or-later
 Group:          System/Packages
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         %{name}-%{version}.tar.bz2
@@ -245,8 +245,15 @@ Developer documentation for libzypp.
 %build
 mkdir build
 cd build
+%if 0%{?suse_version} > 1500
+# Bug 1189788 - UsrMerge: filesystem package breaks system when upgraded in a single rpm transaction
+# While the bug is not fixed, we don't allow ZYPP_SINGLE_RPMTRANS=1 on a not UsrMerged system
+export CFLAGS="%{optflags} -DNO_SINGLETRANS_USERMERGE"
+export CXXFLAGS="%{optflags} -DNO_SINGLETRANS_USERMERGE"
+%else
 export CFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
+%endif
 unset EXTRA_CMAKE_OPTIONS
 
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
@@ -344,14 +351,14 @@ match_type: glob
   echo "
 solvable_name: $1
 match_type: glob
-version: $2
+Version:        $2
 " >> ${LOCKSFILE}
 ;;
     3 ) #TODO version
   echo "
 solvable_name: $1
 match_type: glob
-version: $2 $3
+Version:        $2 $3
 " >> ${LOCKSFILE}
   ;;
 esac