remove Target::targetDistributionFlavor

diff --git a/VERSION.cmake b/VERSION.cmake
index 3dfcfa89e8abaca4b2a63a3dea296368a119d2e6..43e5419231b96a4ed7e9109512eaa97547b523d4 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -59,9 +59,9 @@
 #   changes file. See './mkChangelog -h' for help.
 #
 SET(LIBZYPP_MAJOR "5")
-SET(LIBZYPP_COMPATMINOR "12")
-SET(LIBZYPP_MINOR "12")
-SET(LIBZYPP_PATCH "1")
+SET(LIBZYPP_COMPATMINOR "13")
+SET(LIBZYPP_MINOR "13")
+SET(LIBZYPP_PATCH "0")
 #
 # LAST RELEASED: 5.12.0 (12)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)

diff --git a/zypp/Target.cc b/zypp/Target.cc
index d38fe4591021da13457a479612fd1e7997ec5b00..350c40d75fe385077a2295c612860250897ca698 100644 (file)
--- a/zypp/Target.cc
+++ b/zypp/Target.cc
@@ -103,9 +103,6 @@ namespace zypp
   std::string Target::targetDistributionRelease() const
   { return _pimpl->targetDistributionRelease(); }
 
-  std::string Target::targetDistributionFlavor() const
-  { return _pimpl->targetDistributionFlavor(); }
-
   std::string Target::anonymousUniqueId() const
   { return _pimpl->anonymousUniqueId(); }
 

diff --git a/zypp/Target.h b/zypp/Target.h
index 2fbf602af7a3ed9da0527e15b93a57eae407f1bc..3bb8899548e9938ba11e5ec260e5a5443eee6c35 100644 (file)
--- a/zypp/Target.h
+++ b/zypp/Target.h
@@ -126,11 +126,6 @@ namespace zypp
      * Used for registration.
      */
     std::string targetDistributionRelease() const;
-
-    /** This is \c register.flavor attribute of the installed base product.
-     * Used for registration.
-     */
-    std::string targetDistributionFlavor() const;
     //@}
 
     /**

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index e190f1aaedabb0b3aae43409149db409fb6285b4..733dac6b0eadbd0db716e32fbca5cda3ffcaf931 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -911,9 +911,6 @@ namespace zypp
     std::string TargetImpl::targetDistributionRelease() const
     { return rpmdb2solvAttr( "register.release", _root ); }
 
-    std::string TargetImpl::targetDistributionFlavor() const
-    { return rpmdb2solvAttr( "register.flavor", _root ); }
-
     ///////////////////////////////////////////////////////////////////
 
     std::string TargetImpl::anonymousUniqueId() const

diff --git a/zypp/target/TargetImpl.h b/zypp/target/TargetImpl.h
index 7fe1f2277de65c533b0f3b75b68e31a26202792e..865bf4ab4cc30cd02f49632ba04f97a065bc0da1 100644 (file)
--- a/zypp/target/TargetImpl.h
+++ b/zypp/target/TargetImpl.h
@@ -147,9 +147,6 @@ namespace zypp
       /** \copydoc Target::targetDistributionRelease()*/
       std::string targetDistributionRelease() const;
 
-      /** \copydoc Target::targetDistributionFlavor() */
-      std::string targetDistributionFlavor() const;
-
     protected:
       /** Path to the target */
       Pathname _root;