Appstream-0.6.1, -vala support lives!

.gitignore

@@ -1 +1,2 @@
 /AppStream-0.6.tar.gz
+/AppStream-0.6.1.tar.gz

AppStream-0.6-LIB_SUFFIX.patch

@@ -1,24 +0,0 @@
-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)

appstream.spec

@@ -1,7 +1,7 @@
 
 Summary: Utilities to generate, maintain and access the AppStream Xapian database 
 Name:    appstream
-Version: 0.6
+Version: 0.6.1
 Release: 1%{?dist}
 
 # lib LGPLv3+, tools GPLv3+
@@ -12,11 +12,6 @@ Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{vers
 ## upstream patches
 
 ## upstreamable patches
-# support LIB_SUFFIX
-Patch1: AppStream-0.6-LIB_SUFFIX.patch
-
-# vala bindings no longer provided
-Obsoletes: appstream-vala < 0.6-1
 
 BuildRequires: cmake
 BuildRequires: gettext
@@ -40,17 +35,23 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
 
+%package vala
+Summary: Vala bindings for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+BuildRequires: vala-tools
+Requires: vala
+%description vala
+%{summary}.
+
 
 %prep
 %setup -q -n AppStream-%{version}
 
-%patch1 -p1 -b .LIB_SUFFIX
-
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake} -DTESTS:BOOL=ON ..
+%{cmake} -DTESTS:BOOL=ON -DVAPI:BOOL=ON ..
 
 popd
 
@@ -83,7 +84,7 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
 %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-0.6.typelib
 %{_libdir}/libappstream.so.0*
 %dir %{_libdir}/packagekit-plugins
 %{_libdir}/packagekit-plugins/libpk_plugin_appstream.so
@@ -99,15 +100,20 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
 %{_mandir}/man1/appstream-index.1*
 
 %files devel
-%{_includedir}/appstream.h
-%{_includedir}/as-*.h
+%{_includedir}/Appstream/
 %{_libdir}/libappstream.so
 %{_libdir}/pkgconfig/appstream.pc
 %dir %{_datadir}/gir-1.0
-%{_datadir}/gir-1.0/Appstream-%{version}.gir
+%{_datadir}/gir-1.0/Appstream-0.6.gir
+
+%files vala
+%{_datadir}/vala/vapi/appstream.vapi
 
 
 %changelog
+* Sat Apr 26 2014 Rex Dieter <rdieter@fedoraproject.org> 0.6.1-1
+- Appstream-0.6.1, -vala support lives!
+
 * Sat Apr 19 2014 Rex Dieter <rdieter@fedoraproject.org> - 0.6-1
 - Appstream-0.6
 - Obsoletes: appstream-vala (no longer provided)

sources

@@ -1 +1 @@
-3da45081e182ebc67db0d764de20d721  AppStream-0.6.tar.gz
+8c278853a4cb59d32e0b4b5e66a18bad  AppStream-0.6.1.tar.gz