Merge branch 'SLE-12-SP1' into bsc-1037210-sle-12-sp2

* SLE-12-SP1:
  Add gettext-tools to Travis
  Bump version and update changes file
  Fix pkgGpgCheck callback crashing when reporting SrcPackages (bsc#1037210)

.travis.yml

@@ -6,7 +6,7 @@ before_install:
     - export CC=gcc-4.8
     - export CXX=g++-4.8
     - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-    - sh ./travis_setup.sh -p "yast2-core-dev libzypp-dev yast2-devtools doxygen yast2-testsuite g++-4.8"
+    - sh ./travis_setup.sh -p "yast2-core-dev libzypp-dev yast2-devtools doxygen yast2-testsuite g++-4.8 gettext"
 script:
     - make -f Makefile.cvs
     - make -j 4

package/yast2-pkg-bindings-devel-doc.spec

@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-pkg-bindings-devel-doc
-Version:        3.1.35
+Version:        3.1.36
 Release:        0
 License:        GPL-2.0
 Group:          Documentation/HTML

package/yast2-pkg-bindings.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jun  2 08:42:12 UTC 2017 - igonzalezsosa@suse.com
+
+- Fix pkgGpgCheck callback crashing when reporting SrcPackages
+  (bsc#1037210) (by mlandres)
+- 3.1.36
+
 -------------------------------------------------------------------
 Fri Jan 27 15:55:34 UTC 2017 - lslezak@suse.cz
 

package/yast2-pkg-bindings.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-pkg-bindings
-Version:        3.1.35
+Version:        3.1.36
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/Callbacks.cc

@@ -728,12 +728,16 @@ namespace ZyppRecipients {
       YCPMap data;
 
       if (callback._set) {
-        // Package
-        const zypp::Package::constPtr & package_r = userData_r.get<zypp::Package::constPtr>("Package");
-        YCPString package = userData_r.get<std::string>("Package", package_r->name());
+        // Package or SrcPackage (ResObject is common base class)
+	zypp::ResObject::constPtr resobject_r;
+	if ( userData_r.hasvalue( "ResObject" ) )
+	  resobject_r = userData_r.get<zypp::ResObject::constPtr>( "ResObject" );
+	else // legacy callback sending "zypp::Package::constPtr "Package"
+	  resobject_r = userData_r.get<zypp::Package::constPtr>("Package");
+        YCPString package = resobject_r->name();
         data->add(YCPString("Package"), package);
 
-        const zypp::RepoInfo repo = package_r->repoInfo();
+        const zypp::RepoInfo repo = resobject_r->repoInfo();
         const std::string url = repo.rawUrl().asString();
         data->add(YCPString("RepoMediaUrl"), YCPString(url));