Appstream-0.5

This commit is contained in:
Rex Dieter 2014-02-23 16:24:08 -06:00
parent 5b85257c11
commit 1a04263394
4 changed files with 28 additions and 38 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/AppStream-0.4.0.tar.gz
/AppStream-0.5.tar.gz

View File

@ -1,25 +0,0 @@
From 77f3365eca21e4cf34446c525fa9499b5a7cae9f Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <matthias@tenstral.net>
Date: Sun, 20 Oct 2013 19:06:36 +0200
Subject: [PATCH 3/3] Always install appstream.pc in correct libdir
---
src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 503df05..29803a9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -109,7 +109,7 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/appstream.pc.in ${CMAKE_CURRENT_BINA
install(TARGETS appstream DESTINATION ${INSTALL_DIR_LIB})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appstream.vapi DESTINATION share/vala/vapi)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appstream.h DESTINATION include)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/appstream.pc DESTINATION lib/pkgconfig/)
+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/)
--
1.8.4.2

View File

@ -1,8 +1,8 @@
Summary: Utilities to generate, maintain and access the AppStream Xapian database
Name: appstream
Version: 0.4.0
Release: 3%{?dist}
Version: 0.5
Release: 1%{?dist}
# lib LGPLv3+, tools GPLv3+
License: GPLv3+ and LGPLv3+
@ -10,8 +10,6 @@ URL: http://www.freedesktop.org/wiki/Distributions/Distributions/AppStream/S
Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.gz
## upstream patches
# fix pkgconfig install
Patch0003: 0003-Always-install-appstream.pc-in-correct-libdir.patch
## upstreamable patches
# support LIB_SUFFIX
@ -51,35 +49,47 @@ Requires: vala
%prep
%setup -q -n AppStream-%{version}
%patch0003 -p1 -b .0003
%patch1 -p1 -b .LIB_SUFFIX
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake} ..
%{cmake} -DTESTS:BOOL=ON ..
popd
make %{?_smp_mflags} -C %{_target_platform}
# parallel build currently fails
make -j1 -C %{_target_platform}
%install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
mkdir -p %{buildroot}{%{_datadir},/var/cache}/app-info/{icons,xmls}
mkdir -p %{buildroot}%{_datadir}/app-info/{icons,xmls}
mkdir -p %{buildroot}/var/cache/app-info/{icons,xapian,xmls}
touch %{buildroot}/var/cache/app-info/cache.watch
%post -p /sbin/ldconfig
%check
# 2/3 tests currently fail, make non-fatal for now
make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
%post
/sbin/ldconfig
%{_bindir}/appstream-index --refresh --force >& /dev/null ||:
%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-0.4.typelib
%{_libdir}/girepository-1.0/AppStream-%{version}.typelib
%{_libdir}/libappstream.so.0*
%dir %{_libdir}/packagekit-plugins
%{_libdir}/packagekit-plugins/libpk_plugin_appstream.so
@ -87,8 +97,10 @@ mkdir -p %{buildroot}{%{_datadir},/var/cache}/app-info/{icons,xmls}
%dir %{_datadir}/app-info/icons
%dir %{_datadir}/app-info/xmls
%{_datadir}/app-info/categories.xml
%ghost /var/cache/app-info/cache.watch
%dir /var/cache/app-info
%dir /var/cache/app-info/icons
%dir /var/cache/app-info/xapian
%dir /var/cache/app-info/xmls
%{_mandir}/man1/appstream-index.1*
@ -97,13 +109,16 @@ mkdir -p %{buildroot}{%{_datadir},/var/cache}/app-info/{icons,xmls}
%{_libdir}/libappstream.so
%{_libdir}/pkgconfig/appstream.pc
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/AppStream-0.4.gir
%{_datadir}/gir-1.0/AppStream-%{version}.gir
%files vala
%{_datadir}/vala/vapi/appstream.vapi
%changelog
* Sun Feb 23 2014 Rex Dieter <rdieter@fedoraproject.org> 0.5-1
- Appstream-0.5
* Fri Jan 31 2014 Rex Dieter <rdieter@fedoraproject.org> 0.4.0-3
- rebuild (PackageKit)

View File

@ -1 +1 @@
60b87feb617c8e9b494ef8ef48353d68 AppStream-0.4.0.tar.gz
f0de60e0493fb2b172c864a99df846c7 AppStream-0.5.tar.gz