[appstream] 0.7.0
Rex Dieter
rdieter at fedoraproject.org
Thu Jul 17 00:54:12 UTC 2014
commit abedbd1964ba49fdc985fcaa47bea5e586ece571
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed Jul 16 19:54:35 2014 -0500
0.7.0
.gitignore | 1 +
...the-global-install-paths-set-by-the-tople.patch | 66 ++++++++++++++++++++
...ue-when-loading-compressed-metadata-files.patch | 47 --------------
appstream.spec | 28 +++++---
sources | 2 +-
5 files changed, 85 insertions(+), 59 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a3d7d45..81cafb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/AppStream-0.6.2.tar.gz
+/AppStream-0.7.0.tar.xz
diff --git a/0003-qt-Respect-the-global-install-paths-set-by-the-tople.patch b/0003-qt-Respect-the-global-install-paths-set-by-the-tople.patch
new file mode 100644
index 0000000..b9051f0
--- /dev/null
+++ b/0003-qt-Respect-the-global-install-paths-set-by-the-tople.patch
@@ -0,0 +1,66 @@
+From 2382796e9f22be8b1af4669c9e0bc09da524412c Mon Sep 17 00:00:00 2001
+From: Matthias Klumpp <matthias at tenstral.net>
+Date: Wed, 16 Jul 2014 18:06:32 +0200
+Subject: [PATCH 3/3] qt: Respect the global install paths set by the toplevel
+ CMake file
+
+---
+ qt/CMakeLists.txt | 12 ++++++++++++
+ qt/src/CMakeLists.txt | 12 ++++++------
+ 2 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
+index 6ec18d3..67cce18 100644
+--- a/qt/CMakeLists.txt
++++ b/qt/CMakeLists.txt
+@@ -26,4 +26,16 @@ if(COMMAND cmake_policy)
+ cmake_policy(SET CMP0003 NEW)
+ endif(COMMAND cmake_policy)
+
++if (NOT DEFINED INSTALL_DIR_LIB)
++ set(INSTALL_DIR_LIB lib${LIB_SUFFIX}/${CMAKE_LIBRARY_ARCHITECTURE} CACHE PATH "Installation directory for libraries")
++endif()
++
++if (NOT DEFINED INSTALL_DIR_BIN)
++ set(INSTALL_DIR_BIN bin CACHE PATH "Installation directory for executables")
++endif()
++
++if (NOT DEFINED INSTALL_DIR_INC)
++ set(INSTALL_DIR_INC include CACHE PATH "Installation directory for headers")
++endif()
++
+ add_subdirectory(src)
+diff --git a/qt/src/CMakeLists.txt b/qt/src/CMakeLists.txt
+index 69cb8a3..b05108b 100644
+--- a/qt/src/CMakeLists.txt
++++ b/qt/src/CMakeLists.txt
+@@ -32,20 +32,20 @@ set_property(TARGET AppstreamQt PROPERTY VERSION "${APPSTREAMQT_SO_VERSION}.0.0"
+ set_property(TARGET AppstreamQt PROPERTY SOVERSION "${APPSTREAMQT_SO_VERSION}" )
+
+ install(TARGETS AppstreamQt EXPORT AppstreamQtTargets
+- RUNTIME DESTINATION "bin"
+- LIBRARY DESTINATION "lib"
+- ARCHIVE DESTINATION "lib"
+- INCLUDES DESTINATION "include"
++ RUNTIME DESTINATION ${INSTALL_DIR_BIN}
++ LIBRARY DESTINATION ${INSTALL_DIR_LIB}
++ ARCHIVE DESTINATION ${INSTALL_DIR_LIB}
++ INCLUDES DESTINATION ${INSTALL_DIR_INC}
+ )
+
+-install(FILES ${APPSTREAMQT_PUBLIC_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/appstreamqt_export.h DESTINATION "include/AppstreamQt")
++install(FILES ${APPSTREAMQT_PUBLIC_HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/appstreamqt_export.h DESTINATION "${INSTALL_DIR_INC}/AppstreamQt")
+
+ write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/AppstreamQtConfigVersion.cmake VERSION ${APPSTREAMQT_VERSION} COMPATIBILITY SameMajorVersion )
+
+ export(TARGETS AppstreamQt
+ FILE "${CMAKE_CURRENT_BINARY_DIR}/AppstreamQtTargets.cmake")
+
+-set(ConfigPackageLocation lib/cmake/AppstreamQt)
++set(ConfigPackageLocation ${INSTALL_DIR_LIB}/cmake/AppstreamQt)
+
+ configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/AppstreamQtConfig.cmake.in"
+--
+1.9.3
+
diff --git a/appstream.spec b/appstream.spec
index f408080..5af0da5 100644
--- a/appstream.spec
+++ b/appstream.spec
@@ -1,16 +1,16 @@
Summary: Utilities to generate, maintain and access the AppStream Xapian database
Name: appstream
-Version: 0.6.2
-Release: 6%{?dist}
+Version: 0.7.0
+Release: 1%{?dist}
-# lib LGPLv3+, tools GPLv3+
-License: GPLv3+ and LGPLv3+
+# lib LGPLv2+, tools GPLv2+
+License: GPLv2+ and LGPLv2+
URL: http://www.freedesktop.org/wiki/Distributions/AppStream/Software
-Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.gz
+Source0: http://www.freedesktop.org/software/appstream/releases/AppStream-%{version}.tar.xz
## upstream patches
-Patch55: 0055-Fix-issue-when-loading-compressed-metadata-files.patch
+Patch103: 0003-qt-Respect-the-global-install-paths-set-by-the-tople.patch
## upstreamable patches
@@ -69,6 +69,8 @@ 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
+%find_lang appstream
+
%check
# all/many tests currently fail, make non-fatal for now
@@ -83,16 +85,17 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%files
+%files -f appstream.lang
%doc AUTHORS
-%doc LICENSE.GPLv3 LICENSE.LGPLv3
+%doc LICENSE.GPLv2 LICENSE.LGPLv2.1
%config(noreplace) %{_sysconfdir}/appstream.conf
%{_bindir}/appstream-index
%{_bindir}/appstream-validate
%{_mandir}/man1/appstream-validate.1*
%dir %{_libdir}/girepository-1.0
-%{_libdir}/girepository-1.0/Appstream-0.6.typelib
-%{_libdir}/libappstream.so.0*
+%{_libdir}/girepository-1.0/Appstream-0.7.typelib
+%{_libdir}/libappstream.so.1*
+%{_libdir}/libappstream.so.%{version}
%dir %{_libdir}/packagekit-plugins
%{_libdir}/packagekit-plugins/libpk_plugin_appstream.so
%dir %{_datadir}/app-info/
@@ -111,13 +114,16 @@ make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||:
%{_libdir}/libappstream.so
%{_libdir}/pkgconfig/appstream.pc
%dir %{_datadir}/gir-1.0
-%{_datadir}/gir-1.0/Appstream-0.6.gir
+%{_datadir}/gir-1.0/Appstream-0.7.gir
%files vala
%{_datadir}/vala/vapi/appstream.vapi
%changelog
+* Wed Jul 16 2014 Rex Dieter <rdieter at fedoraproject.org> 0.7.0-1
+- 0.7.0
+
* Sat Jun 28 2014 Rex Dieter <rdieter at fedoraproject.org> 0.6.2-6
- Requires: appstream-data
diff --git a/sources b/sources
index d93557a..0c21054 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5df357df76156f7a6d4dd9a27b50b66 AppStream-0.6.2.tar.gz
+0626feadb9b64babda4a292ec9ebb684 AppStream-0.7.0.tar.xz
More information about the scm-commits
mailing list