[packages/libqtxdg] - /usr/ was twice in QTXDG_INCLUDE_DIR

witekfl witekfl at pld-linux.org
Wed Mar 11 22:59:11 CET 2015


commit 21bb48049364a5af93fefac434ca43a36e1e3f6a
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Wed Mar 11 22:58:04 2015 +0100

    - /usr/ was twice in QTXDG_INCLUDE_DIR

 include_dir.patch | 11 +++++++++++
 libqtxdg.spec     |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/libqtxdg.spec b/libqtxdg.spec
index 919fc72..88b3ae8 100644
--- a/libqtxdg.spec
+++ b/libqtxdg.spec
@@ -3,11 +3,12 @@
 Summary:	libqtxdg
 Name:		libqtxdg
 Version:	1.1.0
-Release:	1
+Release:	2
 License:	GPLv2 and LGPL-2.1+
 Group:		X11/Libraries
 Source0:	http://downloads.lxqt.org/libqtxdg/%{version}/%{name}-%{version}.tar.xz
 # Source0-md5:	17f43c91a72b44804dd519246be6e03a
+Patch0:		include_dir.patch
 URL:		http://www.lxqt.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5Gui-devel >= %{qtver}
@@ -42,6 +43,7 @@ pisaniu własnych programów wykorzystujących libqtxdg.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build
diff --git a/include_dir.patch b/include_dir.patch
new file mode 100644
index 0000000..7ef5297
--- /dev/null
+++ b/include_dir.patch
@@ -0,0 +1,11 @@
+--- libqtxdg-1.1.0/CMakeLists.txt.orig	2015-03-11 22:49:12.244265879 +0100
++++ libqtxdg-1.1.0/CMakeLists.txt	2015-03-11 22:50:22.263886550 +0100
+@@ -225,7 +225,7 @@ configure_file(
+ )
+ 
+ # Instalable ...............................
+-set(QTXDG_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_FILE_NAME})
++set(QTXDG_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR}/${QTXDGX_FILE_NAME})
+ 
+ configure_file(
+     ${CMAKE_CURRENT_SOURCE_DIR}/cmake/qtxdg-config.cmake.in
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libqtxdg.git/commitdiff/21bb48049364a5af93fefac434ca43a36e1e3f6a



More information about the pld-cvs-commit mailing list