enable appdata support for suse

diff --git a/package/libsolv.changes b/package/libsolv.changes
index 85d7bb790279a1b8f7f4d4cb82608ac0ae7881f9..24f2fcef4b786664f3744f51e761d86ba5583308 100644 (file)
--- 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 863c8e5ccc0cecbeac4cc5411ed0b0fa97d4772e..e235f9c3dd30a77d2caecb851f768e9cedf5c71c 100644 (file)
--- 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 c3f968abb5ce20f1c7f15e4386d060e74860b3bb..e85ca920675e03732f9b48166d15b6b7be033983 100755 (executable)
--- 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