Imported Upstream version 14.45.13

diff --git a/VERSION.cmake b/VERSION.cmake
index c104e9c..9f2ebf2 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -61,8 +61,8 @@
 SET(LIBZYPP_MAJOR "14")
 SET(LIBZYPP_COMPATMINOR "39")
 SET(LIBZYPP_MINOR "45")
-SET(LIBZYPP_PATCH "12")
+SET(LIBZYPP_PATCH "13")
 #
-# LAST RELEASED: 14.45.12 (39)
+# LAST RELEASED: 14.45.13 (39)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake
index 498c826..c8b1e6f 100644 (file)
--- a/libzypp.spec.cmake
+++ b/libzypp.spec.cmake
@@ -155,7 +155,6 @@ Requires:       libudev-devel
 %else
 Requires:       hal-devel
 %endif
-Requires:       cmake
 %if 0%{?suse_version}
 %if 0%{?suse_version} >= 1100
 # Code11+

diff --git a/package/libzypp.changes b/package/libzypp.changes
index d5e23e2..f6ee65d 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Jul 18 10:04:45 CEST 2018 - ma@suse.de
+
+- Prefer calling "repo2solv" rather than "repo2solv.sh"
+- libzypp-devel should not require cmake (bsc#1101349)
+- version 14.45.13 (39)
+
+-------------------------------------------------------------------
 Mon Jul  9 15:51:25 CEST 2018 - ma@suse.de
 
 - HardLocksFile: Prevent against empty commit without Target having

diff --git a/tests/repo/yum/data/extensions/repodata/repomd.xml b/tests/repo/yum/data/extensions/repodata/repomd.xml
index eee1c85..5369892 100644 (file)
--- a/tests/repo/yum/data/extensions/repodata/repomd.xml
+++ b/tests/repo/yum/data/extensions/repodata/repomd.xml
@@ -37,8 +37,8 @@
 
   <data type="suseinfo">
     <location href="repodata/suseinfo.xml.gz"/>
-    <checksum type="sha">e0b9149c1b7f48c952e9b3ea996669d8d0d9e1e8</checksum>
+    <checksum type="sha">34599f8eed67ec256299d295617ceaf05ae7ebdd</checksum>
     <timestamp>1227279057.0</timestamp>
-    <open-checksum type="sha">b17c055bef95bca397faffdf028cfa91dd1b24bc</open-checksum>
+    <open-checksum type="sha">a3011438085ac55f06c68053201ea3ded17ee85c</open-checksum>
   </data>
 </repomd>

diff --git a/tests/repo/yum/data/extensions/repodata/suseinfo.xml.gz b/tests/repo/yum/data/extensions/repodata/suseinfo.xml.gz
index d2f1474..b5710b1 100644 (file)
Binary files a/tests/repo/yum/data/extensions/repodata/suseinfo.xml.gz and b/tests/repo/yum/data/extensions/repodata/suseinfo.xml.gz differ

diff --git a/zypp/RepoManager.cc b/zypp/RepoManager.cc
index 7490044..219a2f2 100644 (file)
--- a/zypp/RepoManager.cc
+++ b/zypp/RepoManager.cc
@@ -1328,7 +1328,7 @@ namespace zypp
         scoped_ptr<MediaMounter> forPlainDirs;
 
         ExternalProgram::Arguments cmd;
-        cmd.push_back( "repo2solv.sh" );
+        cmd.push_back( PathInfo( "/usr/bin/repo2solv" ).isFile() ? "repo2solv" : "repo2solv.sh" );
         // repo2solv expects -o as 1st arg!
         cmd.push_back( "-o" );
         cmd.push_back( solvfile.asString() );