Imported Upstream version 17.7.0

diff --git a/VERSION.cmake b/VERSION.cmake
index 80a3df7..196dc73 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -60,9 +60,9 @@
 #
 SET(LIBZYPP_MAJOR "17")
 SET(LIBZYPP_COMPATMINOR "2")
-SET(LIBZYPP_MINOR "6")
-SET(LIBZYPP_PATCH "4")
+SET(LIBZYPP_MINOR "7")
+SET(LIBZYPP_PATCH "0")
 #
-# LAST RELEASED: 17.6.4 (2)
+# LAST RELEASED: 17.7.0 (2)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 70a6780..c5f9299 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri Sep  7 12:07:39 CEST 2018 - ma@suse.de
+
+- Drop type application due to poor metadata support (bsc#1100095,
+  bsc#1104415)
+- version 17.7.0 (2)
+
+-------------------------------------------------------------------
 Thu Sep  6 12:16:25 CEST 2018 - ma@suse.de
 
 - Automatically fetch repository signing key from gpgkey url

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index a87e659..f5c1a00 100644 (file)
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -36,7 +36,7 @@ FOREACH( _currentPoFile ${PO_FILES} )
   SET( _gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo )
 
   ADD_CUSTOM_COMMAND( OUTPUT ${_gmoFile}
-    COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet -o ${_poFile} ${_absFile} ${POT_FILE}
+    COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --no-fuzzy-matching -o ${_poFile} ${_absFile} ${POT_FILE}
     COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_poFile}
     DEPENDS ${POT_FILE} ${_absFile}
     COMMENT "Update ${_gmoFile}"

diff --git a/zypp/RepoManager.cc b/zypp/RepoManager.cc
index fca1f42..dbcf7a1 100644 (file)
--- a/zypp/RepoManager.cc
+++ b/zypp/RepoManager.cc
@@ -1350,7 +1350,7 @@ namespace zypp
         cmd.push_back( "-o" );
         cmd.push_back( solvfile.asString() );
        cmd.push_back( "-X" );  // autogenerate pattern from pattern-package
-        cmd.push_back( "-A" ); // autogenerate application pseudo packages
+        // bsc#1104415: no more application support // cmd.push_back( "-A" );  // autogenerate application pseudo packages
 
         if ( repokind == RepoType::RPMPLAINDIR )
         {

diff --git a/zypp/RepoStatus.cc b/zypp/RepoStatus.cc
index b51b25c..42d2525 100644 (file)
--- a/zypp/RepoStatus.cc
+++ b/zypp/RepoStatus.cc
@@ -97,7 +97,7 @@ namespace zypp
       // NOTE: changing magic will once invalidate all solv file caches
       // Helpfull if solv file content must be refreshed (e.g. due to different
       // repo2* arguments) even if raw metadata are unchanged.
-      static const std::string magic( "42" );
+      static const std::string magic( "43" );
       _pimpl->_checksum += magic;
     }
   }

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index f4596f6..a5389b3 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -915,7 +915,7 @@ namespace zypp
           cmd.push_back( _root.asString() );
         }
         cmd.push_back( "-X" ); // autogenerate pattern/product/... from -package
-        cmd.push_back( "-A" ); // autogenerate application pseudo packages
+        // bsc#1104415: no more application support // cmd.push_back( "-A" );  // autogenerate application pseudo packages
         cmd.push_back( "-p" );
         cmd.push_back( Pathname::assertprefix( _root, "/etc/products.d" ).asString() );