From ea40796137441521675d305633fcd21ebc26e4aa Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sat, 19 Apr 2014 13:26:27 -0500
Subject: [PATCH] 0.6-1

- Appstream-0.6
- Obsoletes: appstream-vala (no longer provided)
---
 .gitignore                       |  2 +-
 AppStream-0.4.0-LIB_SUFFIX.patch | 25 -------------------------
 AppStream-0.6-LIB_SUFFIX.patch   | 24 ++++++++++++++++++++++++
 appstream.spec                   | 30 +++++++++++++-----------------
 sources                          |  2 +-
 5 files changed, 39 insertions(+), 44 deletions(-)
 delete mode 100644 AppStream-0.4.0-LIB_SUFFIX.patch
 create mode 100644 AppStream-0.6-LIB_SUFFIX.patch

diff --git a/.gitignore b/.gitignore
index 6b609b3..36156d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/AppStream-0.5.tar.gz
+/AppStream-0.6.tar.gz
diff --git a/AppStream-0.4.0-LIB_SUFFIX.patch b/AppStream-0.4.0-LIB_SUFFIX.patch
deleted file mode 100644
index 0838dbf..0000000
--- a/AppStream-0.4.0-LIB_SUFFIX.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up AppStream-0.4.0/CMakeLists.txt.LIB_SUFFIX AppStream-0.4.0/CMakeLists.txt
---- AppStream-0.4.0/CMakeLists.txt.LIB_SUFFIX	2013-10-20 09:20:39.000000000 -0500
-+++ AppStream-0.4.0/CMakeLists.txt	2013-11-03 19:40:48.730834229 -0600
-@@ -65,7 +65,7 @@ find_package (Gettext REQUIRED)
- # Default paths
- #
- set(INSTALL_DIR_BIN bin CACHE PATH "Installation directory for executables")
--set(INSTALL_DIR_LIB lib/${CMAKE_LIBRARY_ARCHITECTURE} CACHE PATH "Installation directory for libraries")
-+set(INSTALL_DIR_LIB lib${LIB_SUFFIX}/${CMAKE_LIBRARY_ARCHITECTURE} CACHE PATH "Installation directory for libraries")
- set(INSTALL_DIR_LIBEXEC "${INSTALL_DIR_LIB}/appstream" CACHE PATH "Installation directory for executables use by a library")
- set(INSTALL_DIR_INC include CACHE PATH "Installation directory for headers")
- set(INSTALL_DIR_SYSCONF /etc CACHE PATH "Installation directory for system configuration files")
-diff -up AppStream-0.4.0/src/CMakeLists.txt.LIB_SUFFIX AppStream-0.4.0/src/CMakeLists.txt
---- AppStream-0.4.0/src/CMakeLists.txt.LIB_SUFFIX	2013-11-03 19:40:48.731834211 -0600
-+++ AppStream-0.4.0/src/CMakeLists.txt	2013-11-03 19:41:52.387697221 -0600
-@@ -111,7 +111,8 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appstream.h DESTINATION include)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appstream.pc DESTINATION ${INSTALL_DIR_LIB}/pkgconfig/)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/AppStream-${AS_VERSION_LIBS}.gir DESTINATION share/gir-1.0/)
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/AppStream-${AS_VERSION_LIBS}.typelib DESTINATION lib/girepository-1.0/)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/AppStream-${AS_VERSION_LIBS}.typelib DESTINATION lib${LIB_SUFFIX}/girepository-1.0/)
-+
- 
- # include the PackageKit plugin
- add_subdirectory(pk-plugin)
diff --git a/AppStream-0.6-LIB_SUFFIX.patch b/AppStream-0.6-LIB_SUFFIX.patch
new file mode 100644
index 0000000..3f28dcf
--- /dev/null
+++ b/AppStream-0.6-LIB_SUFFIX.patch
@@ -0,0 +1,24 @@
+diff -up AppStream-0.6/CMakeLists.txt.LIB_SUFFIX AppStream-0.6/CMakeLists.txt
+--- AppStream-0.6/CMakeLists.txt.LIB_SUFFIX	2014-04-16 13:25:06.000000000 -0500
++++ AppStream-0.6/CMakeLists.txt	2014-04-19 13:11:23.061686555 -0500
+@@ -66,7 +66,7 @@ find_package (Gettext REQUIRED)
+ # Default paths
+ #
+ set(INSTALL_DIR_BIN bin CACHE PATH "Installation directory for executables")
+-set(INSTALL_DIR_LIB lib/${CMAKE_LIBRARY_ARCHITECTURE} CACHE PATH "Installation directory for libraries")
++set(INSTALL_DIR_LIB lib${LIB_SUFFIX}/${CMAKE_LIBRARY_ARCHITECTURE} CACHE PATH "Installation directory for libraries")
+ set(INSTALL_DIR_LIBEXEC "${INSTALL_DIR_LIB}/appstream" CACHE PATH "Installation directory for executables use by a library")
+ set(INSTALL_DIR_INC include CACHE PATH "Installation directory for headers")
+ set(INSTALL_DIR_SYSCONF /etc CACHE PATH "Installation directory for system configuration files")
+diff -up AppStream-0.6/src/CMakeLists.txt.LIB_SUFFIX AppStream-0.6/src/CMakeLists.txt
+--- AppStream-0.6/src/CMakeLists.txt.LIB_SUFFIX	2014-04-19 13:11:23.061686555 -0500
++++ AppStream-0.6/src/CMakeLists.txt	2014-04-19 13:12:33.996915795 -0500
+@@ -131,7 +131,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR
+ 
+ #install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appstream.vapi DESTINATION share/vala/vapi)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Appstream-${AS_VERSION_LIBS}.gir DESTINATION share/gir-1.0/)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Appstream-${AS_VERSION_LIBS}.typelib DESTINATION lib/girepository-1.0/)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Appstream-${AS_VERSION_LIBS}.typelib DESTINATION lib${LIB_SUFFIX}/girepository-1.0/)
+ 
+ # include the PackageKit plugin
+ add_subdirectory(pk-plugin)
diff --git a/appstream.spec b/appstream.spec
index 263b299..8b401d6 100644
--- a/appstream.spec
+++ b/appstream.spec
@@ -1,7 +1,7 @@
 
 Summary: Utilities to generate, maintain and access the AppStream Xapian database 
 Name:    appstream
-Version: 0.5
+Version: 0.6
 Release: 1%{?dist}
 
 # lib LGPLv3+, tools GPLv3+
@@ -13,7 +13,10 @@ Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{vers
 
 ## upstreamable patches
 # support LIB_SUFFIX
-Patch1: AppStream-0.4.0-LIB_SUFFIX.patch
+Patch1: AppStream-0.6-LIB_SUFFIX.patch
+
+# vala bindings no longer provided
+Obsoletes: appstream-vala < 0.6-1
 
 BuildRequires: cmake
 BuildRequires: gettext
@@ -22,7 +25,6 @@ BuildRequires: pkgconfig(gio-2.0) pkgconfig(gobject-introspection-1.0)
 BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(packagekit-glib2)
 BuildRequires: pkgconfig(packagekit-plugin)
-BuildRequires: vala
 BuildRequires: xapian-core-devel
 BuildRequires: xmlto
 
@@ -38,13 +40,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
 
-%package vala
-Summary: Vala bindings for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: vala
-%description vala
-%{summary}.
-
 
 %prep
 %setup -q -n AppStream-%{version}
@@ -72,7 +67,7 @@ touch %{buildroot}/var/cache/app-info/cache.watch
 
 
 %check
-# 2/3 tests currently fail, make non-fatal for now
+# 1/3 tests currently fail, make non-fatal for now
 make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
 
 
@@ -82,14 +77,13 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %doc AUTHORS
 %doc LICENSE.GPLv3 LICENSE.LGPLv3
 %config(noreplace) %{_sysconfdir}/appstream.conf
 %{_bindir}/appstream-index
 %dir %{_libdir}/girepository-1.0
-%{_libdir}/girepository-1.0/AppStream-%{version}.typelib
+%{_libdir}/girepository-1.0/Appstream-%{version}.typelib
 %{_libdir}/libappstream.so.0*
 %dir %{_libdir}/packagekit-plugins
 %{_libdir}/packagekit-plugins/libpk_plugin_appstream.so
@@ -106,16 +100,18 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
 
 %files devel
 %{_includedir}/appstream.h
+%{_includedir}/as-*.h
 %{_libdir}/libappstream.so
 %{_libdir}/pkgconfig/appstream.pc
 %dir %{_datadir}/gir-1.0
-%{_datadir}/gir-1.0/AppStream-%{version}.gir
-
-%files vala
-%{_datadir}/vala/vapi/appstream.vapi
+%{_datadir}/gir-1.0/Appstream-%{version}.gir
 
 
 %changelog
+* Sat Apr 19 2014 Rex Dieter <rdieter@fedoraproject.org> - 0.6-1
+- Appstream-0.6
+- Obsoletes: appstream-vala (no longer provided)
+
 * Sun Feb 23 2014 Rex Dieter <rdieter@fedoraproject.org> 0.5-1
 - Appstream-0.5
 
diff --git a/sources b/sources
index 976b28a..ccda608 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f0de60e0493fb2b172c864a99df846c7  AppStream-0.5.tar.gz
+3da45081e182ebc67db0d764de20d721  AppStream-0.6.tar.gz