From 5aa25d84b10905ab478a06fca4a0c1278b08e448 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 19 Jul 2014 14:34:20 +0200 Subject: [PATCH] - added libdir patch (make AppstreamQt installation LIB_SUFFIX aware) - release 2 --- AppStream-libdir.patch | 22 ++++++++++++++++++++++ AppStream.spec | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 AppStream-libdir.patch diff --git a/AppStream-libdir.patch b/AppStream-libdir.patch new file mode 100644 index 0000000..adea196 --- /dev/null +++ b/AppStream-libdir.patch @@ -0,0 +1,22 @@ +--- AppStream-0.7.0/qt/src/CMakeLists.txt.orig 2014-07-16 16:53:34.000000000 +0200 ++++ AppStream-0.7.0/qt/src/CMakeLists.txt 2014-07-19 13:59:16.219821582 +0200 +@@ -33,8 +33,8 @@ + + install(TARGETS AppstreamQt EXPORT AppstreamQtTargets + RUNTIME DESTINATION "bin" +- LIBRARY DESTINATION "lib" +- ARCHIVE DESTINATION "lib" ++ LIBRARY DESTINATION "lib${LIB_SUFFIX}" ++ ARCHIVE DESTINATION "lib${LIB_SUFFIX}" + INCLUDES DESTINATION "include" + ) + +@@ -45,7 +45,7 @@ + export(TARGETS AppstreamQt + FILE "${CMAKE_CURRENT_BINARY_DIR}/AppstreamQtTargets.cmake") + +-set(ConfigPackageLocation lib/cmake/AppstreamQt) ++set(ConfigPackageLocation lib${LIB_SUFFIX}/cmake/AppstreamQt) + + configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/AppstreamQtConfig.cmake.in" diff --git a/AppStream.spec b/AppStream.spec index 972b3d0..b7865d3 100644 --- a/AppStream.spec +++ b/AppStream.spec @@ -8,11 +8,12 @@ Summary: AppStream-Core library and tools Summary(pl.UTF-8): Biblioteka i narzędzia AppStream-Core Name: AppStream Version: 0.7.0 -Release: 1 +Release: 2 License: LGPL v2.1+ Group: Libraries Source0: http://www.freedesktop.org/software/appstream/releases/%{name}-%{version}.tar.xz # Source0-md5: 0626feadb9b64babda4a292ec9ebb684 +Patch0: %{name}-libdir.patch URL: http://www.freedesktop.org/wiki/Distributions/AppStream/Software/ BuildRequires: PackageKit-devel %{?with_qt:BuildRequires: QtCore-devel >= 4.8.0} @@ -126,6 +127,7 @@ dostępnych aplikacji. %prep %setup -q +%patch0 -p1 %build install -d build -- 2.43.0