Imported Upstream version 17.16.0

diff --git a/VERSION.cmake b/VERSION.cmake
index 9f46119..877256e 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -60,9 +60,9 @@
 #
 SET(LIBZYPP_MAJOR "17")
 SET(LIBZYPP_COMPATMINOR "12")
-SET(LIBZYPP_MINOR "15")
+SET(LIBZYPP_MINOR "16")
 SET(LIBZYPP_PATCH "0")
 #
-# LAST RELEASED: 17.15.0 (12)
+# LAST RELEASED: 17.16.0 (12)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======

diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake
index b149f0c..8aae395 100644 (file)
--- a/libzypp.spec.cmake
+++ b/libzypp.spec.cmake
@@ -71,7 +71,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  pkg-config
 %endif
 
-BuildRequires:  libsolv-devel >= 0.7.2
+BuildRequires:  libsolv-devel >= 0.7.7
 %if 0%{?suse_version} >= 1100
 BuildRequires:  libsolv-tools
 %requires_eq    libsolv-tools

diff --git a/mkChangelog b/mkChangelog
index 52cb498..6d4303e 100755 (executable)
--- a/mkChangelog
+++ b/mkChangelog
@@ -107,7 +107,10 @@ function sameVersion() {
 }
 
 function getchanges() {
-  git log --no-merges --pretty=format:'- %s' "$LAST_RELEASE"..HEAD | grep -v 'po.tar.bz2\|Translated using Weblate'
+  git log --no-merges --pretty=format:'@@%B' "$LAST_RELEASE"..HEAD     \
+  | awk '/^@@/{p=1}/^@@Translated using Weblate/{p=0}(p){print}'       \
+  | sed '/./{H;$!d};x;/./{s/ *\n */ /g;s/^ *//;s/ *$//;/[^]})!?:.]$/s/$/./;p};d'       \
+  | fold -s -w 66 | sed '/^@@/{s/^../- /;p;d};s/^/  /'
 }
 
 function newchangesentry() {

diff --git a/package/libzypp.changes b/package/libzypp.changes
index 78ca458..6daaaac 100644 (file)
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Tue Oct 29 14:54:51 CET 2019 - ma@suse.de
+
+- Expose new libsolv API via C++ counterparts
+  (openSUSE/zypper#214)
+- BuildRequires:  libsolv-devel >= 0.7.7
+- version 17.16.0 (12)
+
+-------------------------------------------------------------------
 Fri Oct 18 17:20:08 CEST 2019 - ma@suse.de
 
 - Fix empty metalink downloads if filesize is unknown (bsc#1153557)

diff --git a/po/et.po b/po/et.po
index 4c789da..3978cea 100644 (file)
--- a/po/et.po
+++ b/po/et.po
@@ -9,15 +9,16 @@ msgstr ""
 "Project-Id-Version: zypp.et\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-11 09:20+0200\n"
-"PO-Revision-Date: 2009-06-10 09:49+0300\n"
-"Last-Translator: Ain Vagula <avagula@gmail.com>\n"
-"Language-Team: Estonian <linux-ee@lists.eenet.ee>\n"
+"PO-Revision-Date: 2019-10-25 09:53+0000\n"
+"Last-Translator: Jaanus Ojangu <jaanus.ojangu@gmail.com>\n"
+"Language-Team: Estonian <https://l10n.opensuse.org/projects/libzypp/master/"
+"et/>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 3.6.1\n"
 
 #. dubious: Throw on malformed known types, otherwise log a warning.
 #: zypp/CheckSum.cc:136
@@ -1267,7 +1268,7 @@ msgstr "Varustab"
 
 #: zypp/Dep.cc:97
 msgid "Prerequires"
-msgstr ""
+msgstr "Eeltingimused"
 
 #: zypp/Dep.cc:98
 msgid "Requires"
@@ -1288,15 +1289,15 @@ msgstr "Soovitab"
 
 #: zypp/Dep.cc:102
 msgid "Suggests"
-msgstr ""
+msgstr "Soovitused"
 
 #: zypp/Dep.cc:103
 msgid "Enhances"
-msgstr ""
+msgstr "Parandused"
 
 #: zypp/Dep.cc:104
 msgid "Supplements"
-msgstr ""
+msgstr "Lisandid"
 
 #: zypp/ExternalProgram.cc:268
 #, fuzzy, c-format, boost-format
@@ -1311,7 +1312,7 @@ msgstr "Ei saa avada faili %1."
 #: zypp/ExternalProgram.cc:362
 #, c-format, boost-format
 msgid "Can't chroot to '%s' (%s)."
-msgstr ""
+msgstr "Ei saa chroot läbi viia '%s' (%s)."
 
 #: zypp/ExternalProgram.cc:372
 #, c-format, boost-format
@@ -1337,22 +1338,22 @@ msgstr ""
 #: zypp/ExternalProgram.cc:522
 #, c-format, boost-format
 msgid "Command exited with status %d."
-msgstr ""
+msgstr "Käsk lõpetati olekuga %d."
 
 #: zypp/ExternalProgram.cc:542
 #, c-format, boost-format
 msgid "Command was killed by signal %d (%s)."
-msgstr ""
+msgstr "Käsk lõpetati signaaliga %d (%s)."
 
 #: zypp/ExternalProgram.cc:547
 msgid "Command exited with unknown error."
-msgstr ""
+msgstr "Käsk lõpetas tundmatu veaga."
 
 #. TranslatorExplanation first %s is key name, second is keyring name
 #: zypp/KeyRing.cc:590
 #, c-format, boost-format
 msgid "Tried to import not existent key %s into keyring %s"
-msgstr ""
+msgstr "Prooviti võtmehoidjasse %s importida olematu võtme  %s"
 
 #: zypp/KeyRing.cc:596
 #, fuzzy
@@ -1832,17 +1833,17 @@ msgstr "Korsika"
 #. language code: cpe
 #: zypp/LanguageCode.cc:353
 msgid "Creoles and Pidgins, English-Based (Other)"
-msgstr ""
+msgstr "Kreoolid ja Pidginid, inglise keeles (muu)"
 
 #. language code: cpf
 #: zypp/LanguageCode.cc:355
 msgid "Creoles and Pidgins, French-Based (Other)"
-msgstr ""
+msgstr "Kreoolid ja Pidginid, prantsuse päritolu (muu)"
 
 #. language code: cpp
 #: zypp/LanguageCode.cc:357
 msgid "Creoles and Pidgins, Portuguese-Based (Other)"
-msgstr ""
+msgstr "Kreoolid ja Pidginid, Portugali põhine (muu)"
 
 #. language code: cre cr
 #: zypp/LanguageCode.cc:359
@@ -1868,7 +1869,7 @@ msgstr "Kašuubi"
 #. language code: cus
 #: zypp/LanguageCode.cc:367
 msgid "Cushitic (Other)"
-msgstr ""
+msgstr "Cushitic (muu)"
 
 #. language code: cze ces cs
 #: zypp/LanguageCode.cc:369 zypp/LanguageCode.cc:371
@@ -1928,7 +1929,7 @@ msgstr "Dogri"
 #. language code: dra
 #: zypp/LanguageCode.cc:393
 msgid "Dravidian (Other)"
-msgstr ""
+msgstr "Dravidian (muu)"
 
 #. language code: dsb
 #: zypp/LanguageCode.cc:395
@@ -2318,7 +2319,7 @@ msgstr "Iloko"
 #. language code: ina ia
 #: zypp/LanguageCode.cc:561
 msgid "Interlingua (International Auxiliary Language Association)"
-msgstr ""
+msgstr "Interlingua (rahvusvaheline abikeele assotsiatsioon)"
 
 #. language code: inc
 #: zypp/LanguageCode.cc:563
@@ -2368,7 +2369,7 @@ msgstr "Jaava"
 #. language code: jbo
 #: zypp/LanguageCode.cc:581
 msgid "Lojban"
-msgstr ""
+msgstr "Lojban - tehiskeel"
 
 #. language code: jpn ja
 #: zypp/LanguageCode.cc:583
@@ -2453,7 +2454,7 @@ msgstr "Khasi"
 #. language code: khi
 #: zypp/LanguageCode.cc:615
 msgid "Khoisan (Other)"
-msgstr ""
+msgstr "Khoisan - aafrika keeled (muu)"
 
 #. language code: khm km
 #: zypp/LanguageCode.cc:617
@@ -2698,7 +2699,7 @@ msgstr "Maoori"
 #. language code: map
 #: zypp/LanguageCode.cc:717
 msgid "Austronesian (Other)"
-msgstr ""
+msgstr "Austronesian - aasia keeled (muud)"
 
 #. language code: mar mr
 #: zypp/LanguageCode.cc:719
@@ -2753,7 +2754,7 @@ msgstr "Mitmesugused keeled"
 #. language code: mkh
 #: zypp/LanguageCode.cc:741
 msgid "Mon-Khmer (Other)"
-msgstr ""
+msgstr "Mon-Khmer (muud)"
 
 #. language code: mlg mg
 #: zypp/LanguageCode.cc:743
@@ -2883,7 +2884,7 @@ msgstr "Nepali"
 #. language code: new
 #: zypp/LanguageCode.cc:795
 msgid "Nepal Bhasa"
-msgstr ""
+msgstr "Nepal Bhasa keeled"
 
 #. language code: nia
 #: zypp/LanguageCode.cc:797
@@ -3742,13 +3743,13 @@ msgstr "'%1' pole olemas."
 #: zypp/PublicKey.cc:68
 #, boost-format
 msgid "expired: %1%"
-msgstr ""
+msgstr "aegunud: %1%"
 
 #. translators: an annotation to a gpg keys expiry date: "expires: 2111-04-12"
 #: zypp/PublicKey.cc:73
 #, boost-format
 msgid "expires: %1%"
-msgstr ""
+msgstr "aegub: %1%"
 
 #. translators: an annotation to a gpg keys expiry date
 #: zypp/PublicKey.cc:82
@@ -3759,7 +3760,7 @@ msgstr "'%1' pole olemas."
 #. translators: an annotation to a gpg keys expiry date
 #: zypp/PublicKey.cc:91
 msgid "(EXPIRED)"
-msgstr ""
+msgstr "(AEGUNUD)"
 
 #. translators: an annotation to a gpg keys expiry date
 #: zypp/PublicKey.cc:95

diff --git a/zypp/ZConfig.h b/zypp/ZConfig.h
index 8285a1b..73a1a68 100644 (file)
--- a/zypp/ZConfig.h
+++ b/zypp/ZConfig.h
@@ -39,7 +39,7 @@ namespace zypp
   //
   /** Interim helper class to collect global options and settings.
    * Use it to avoid hardcoded values and calls to getZYpp() just
-   * to retrieve some value like architecture, languages or tmppath.
+   * to retrieve some value like architecture, languages or temppath.
    *
    * It reads /etc/zypp/zypp.conf, the filename can be overridden by
    * setting the ZYPP_CONF environment variable to a different file.
@@ -74,7 +74,7 @@ namespace zypp
       Pathname systemRoot() const;
 
       /** The RepoManager root directory.
-       *  Returns the same as \sa systemRoot() if not explicitely set.
+       *  Returns the same as \ref systemRoot() if not explicitly set.
        */
       Pathname repoManagerRoot() const;
 
@@ -94,7 +94,7 @@ namespace zypp
       /** Override the zypp system architecture.
        * This is useful for test scenarious. <b>But be warned</b>, zypp does
        * not expect the system architecture to change at runtime. So
-       * set it at the verry beginning before you acess any other
+       * set it at the very beginning before you access any other
        * zypp component.
       */
       void setSystemArchitecture( const Arch & arch_r );
@@ -104,7 +104,7 @@ namespace zypp
       { setSystemArchitecture( defaultSystemArchitecture() ); }
 
     public:
-      /** The autodetected prefered locale for translated texts.
+      /** The autodetected preferred locale for translated texts.
        */
       static Locale defaultTextLocale();
 
@@ -112,7 +112,7 @@ namespace zypp
        */
       Locale textLocale() const;
 
-      /** Set the prefered locale for translated texts. */
+      /** Set the preferred locale for translated texts. */
       void setTextLocale( const Locale & locale_r );
 
       /** Reset the locale for translated texts to the default. */

diff --git a/zypp/sat/Pool.cc b/zypp/sat/Pool.cc
index a94c90a..04beca0 100644 (file)
--- a/zypp/sat/Pool.cc
+++ b/zypp/sat/Pool.cc
@@ -119,6 +119,27 @@ namespace zypp
     Pool::SolvableIterator Pool::solvablesEnd() const
     { return SolvableIterator(); }
 
+    sat::Queue Pool::whatMatchesDep( const SolvAttr &attr, const Capability &cap ) const
+    {
+      sat::Queue q;
+      pool_whatmatchesdep( get(), attr.id(), cap.id(), q, 0);
+      return q;
+    }
+
+    Queue Pool::whatMatchesSolvable( const SolvAttr &attr, const Solvable &solv ) const
+    {
+      sat::Queue q;
+      pool_whatmatchessolvable( get(), attr.id(), static_cast<Id>( solv.id() ), q, 0 );
+      return q;
+    }
+
+    Queue Pool::whatContainsDep( const SolvAttr &attr, const Capability &cap ) const
+    {
+      sat::Queue q;
+      pool_whatcontainsdep( get(), attr.id(), cap.id(), q, 0 );
+      return q;
+    }
+
     Repository Pool::reposInsert( const std::string & alias_r )
     {
       Repository ret( reposFind( alias_r ) );

diff --git a/zypp/sat/Pool.h b/zypp/sat/Pool.h
index 6701493..ee3e72b 100644 (file)
--- a/zypp/sat/Pool.h
+++ b/zypp/sat/Pool.h
@@ -192,6 +192,10 @@ namespace zypp
         WhatProvides whatProvides( Capability cap_r ) const
         { return WhatProvides( cap_r ); }
 
+        Queue whatMatchesDep( const SolvAttr &attr, const Capability &cap ) const;
+        Queue whatMatchesSolvable ( const SolvAttr &attr, const Solvable &solv ) const;
+        Queue whatContainsDep ( const SolvAttr &attr, const Capability &cap ) const;
+
       public:
         /** \name Requested locales. */
         //@{

diff --git a/zypp/sat/Solvable.cc b/zypp/sat/Solvable.cc
index 42b274a..e47c9f8 100644 (file)
--- a/zypp/sat/Solvable.cc
+++ b/zypp/sat/Solvable.cc
@@ -528,6 +528,18 @@ namespace zypp
       return ret;
     }
 
+    std::pair<bool, CapabilitySet> Solvable::matchesSolvable(const SolvAttr &attr, const Solvable &solv) const
+    {
+      sat::Queue capQueue;
+      int res = solvable_matchessolvable( get(), attr.id(), static_cast<Id>( solv.id() ), capQueue, 0 );
+
+      CapabilitySet caps;
+      if ( capQueue.size() )
+        std::for_each( capQueue.begin(), capQueue.end(), [ &caps ]( auto cap ){ caps.insert( Capability(cap) );});
+
+      return std::make_pair( res == 1, std::move(caps) );
+    }
+
     ///////////////////////////////////////////////////////////////////
     namespace
     {

diff --git a/zypp/sat/Solvable.h b/zypp/sat/Solvable.h
index 5b6ec7f..00650ea 100644 (file)
--- a/zypp/sat/Solvable.h
+++ b/zypp/sat/Solvable.h
@@ -223,6 +223,8 @@ namespace zypp
       CapabilitySet valuesOfNamespace( const std::string & namespace_r ) const;
       //@}
 
+      std::pair<bool, CapabilitySet> matchesSolvable ( const SolvAttr &attr, const sat::Solvable &solv ) const;
+
     public:
       /** \name Locale support. */
       //@{