Merge branch 'jb50027' into 'master'

Use $$[QT_INSTALL_LIBS]. Contributes JB#50027 See merge request mer-core/kcalcore!18
sailfishos · Jun 24, 2020 · 6094b59 · 6094b59
2 parents 8aec62b + 538a7fa
commit 6094b59
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/kcalcore/kcalcore.pro b/kcalcore/kcalcore.pro
@@ -21,7 +21,7 @@ equals(QT_MAJOR_VERSION, 5) {
 
 QT += dbus
 
-target.path = $$INSTALL_ROOT/usr/lib
+target.path = $$INSTALL_ROOT$$[QT_INSTALL_LIBS]
 equals(QT_MAJOR_VERSION, 4): headers.path += $$INSTALL_ROOT/usr/include/kcalcoren
 equals(QT_MAJOR_VERSION, 5): headers.path += $$INSTALL_ROOT/usr/include/kcalcoren-qt5
 headers.files += *.h \
@@ -39,7 +39,7 @@ headers.files += *.h \
     klibport/KUrl \
     klibport/*.h
 
-pkgconfig.path = $$INSTALL_ROOT/usr/lib/pkgconfig
+pkgconfig.path = $$INSTALL_ROOT$$[QT_INSTALL_LIBS]/pkgconfig
 equals(QT_MAJOR_VERSION, 4): pkgconfig.files = ../libkcalcoren.pc
 equals(QT_MAJOR_VERSION, 5): pkgconfig.files = ../libkcalcoren-qt5.pc
 

diff --git a/rpm/kcalcore-qt5.spec b/rpm/kcalcore-qt5.spec
@@ -2,9 +2,8 @@ Name:       kcalcore-qt5
 Summary:    Port of KDE kcalcore calendar library
 Version:    4.10.2
 Release:    1
-Group:      System/Libraries
 License:    LGPLv2
-URL:        https://github.com/mer-packages/kcalcore
+URL:        https://git.sailfishos.org/mer-core/kcalcore
 Source0:    %{name}-%{version}.tar.bz2
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -22,7 +21,6 @@ Port of KDE kcalcore calendar library
 
 %package devel
 Summary:    Development files for kcalcore
-Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel