From: Michael Schroeder <mls@suse.de>
Date: Mon, 9 Dec 2013 10:54:13 +0000 (+0100)
Subject: enable appdata support for suse
X-Git-Tag: 0.6.4~140
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1715bff47df266903cfb10ce99c107bc21c09ba;p=thirdparty%2Flibsolv.git

enable appdata support for suse
---

diff --git a/package/libsolv.changes b/package/libsolv.changes
index 85d7bb79..24f2fcef 100644
--- a/package/libsolv.changes
+++ b/package/libsolv.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec  9 11:53:06 CET 2013 - mls@suse.de
+
+- make repo2solv.sh work when appdata support is off
+- enable appdata support for SUSE
+
 -------------------------------------------------------------------
 Tue Dec  3 14:30:17 CET 2013 - mls@suse.de
 
diff --git a/package/libsolv.spec.in b/package/libsolv.spec.in
index 863c8e5c..e235f9c3 100644
--- a/package/libsolv.spec.in
+++ b/package/libsolv.spec.in
@@ -167,7 +167,7 @@ CMAKE_FLAGS=
 CMAKE_FLAGS="-DFEDORA=1"
 %endif
 %if 0%{?suse_version}
-CMAKE_FLAGS="-DSUSE=1"
+CMAKE_FLAGS="-DSUSE=1 -DENABLE_APPDATA=1"
 %endif
 
 cmake   $CMAKE_FLAGS \
diff --git a/tools/repo2solv.sh b/tools/repo2solv.sh
index c3f968ab..e85ca920 100755
--- a/tools/repo2solv.sh
+++ b/tools/repo2solv.sh
@@ -204,8 +204,11 @@ if test "$repotype" = rpmmd ; then
   fi
 
   # This contains appdata
+  appdataxml=
   appdatafile=
-  appdataxml=`repomd_findfile appdata appdata.xml`
+  if test -x /usr/bin/appdata2solv ; then
+      appdataxml=`repomd_findfile appdata appdata.xml`
+  fi
   if test -n "$appdataxml" -a -s "$appdataxml" ; then
       appdatafile=`mktemp` || exit 3
       repomd_decompress "$appdataxml" | appdata2solv $parser_options > $appdatafile || exit 4
@@ -219,8 +222,11 @@ elif test "$repotype" = susetags ; then
   olddir=`pwd`
   DESCR=$(get_DESCRDIR)
   cd ${DESCR} || exit 2
+  appdataxml=
   appdatafile=
-  appdataxml=`susetags_findfile appdata.xml`
+  if test -x /usr/bin/appdata2solv ; then
+      appdataxml=`susetags_findfile appdata.xml`
+  fi
   if test -n "$appdataxml" ; then
       appdatafile=`mktemp` || exit 3
       repomd_decompress "$appdataxml" | appdata2solv $parser_options > $appdatafile || exit 4