Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libcontacts
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
mer-core-attic
libcontacts
Commits
fc6f7849
Commit
fc6f7849
authored
May 29, 2020
by
Matti Kosola
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[libcontacts] Use macros, not hardcoded paths. JB#50027
Signed-off-by:
Matti Kosola
<
matti.kosola@jolla.com
>
parent
06adaa51
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
rpm/libcontacts-qt5.spec
rpm/libcontacts-qt5.spec
+5
-9
src/src.pro
src/src.pro
+8
-2
No files found.
rpm/libcontacts-qt5.spec
View file @
fc6f7849
Name: libcontacts-qt5
Summary:
Nemo
contact cache library
Summary:
Sailfish OS
contact cache library
Version: 0.2.7
Release: 1
Group: System/Libraries
License: BSD
URL: https://git
hub.com/nemomobil
e/libcontacts
URL: https://git
.sailfishos.org/mer-cor
e/libcontacts
Source0: %{name}-%{version}.tar.bz2
Requires: qtcontacts-sqlite-qt5
BuildRequires: pkgconfig(Qt5Core)
...
...
@@ -23,16 +22,14 @@ BuildRequires: qt5-qttools-linguist
%{summary}.
%package tests
Summary: Nemo contact cache library tests
Group: System/Libraries
Summary: Sailfish OS contact cache library tests
Requires: %{name} = %{version}-%{release}
%description tests
%{summary}.
%package devel
Summary: Nemo contact cache library headers
Group: System/Libraries
Summary: Sailfish OS contact cache library headers
Requires: %{name} = %{version}-%{release}
%description devel
...
...
@@ -41,7 +38,6 @@ Requires: %{name} = %{version}-%{release}
%package ts-devel
Summary: Translation source for libcontacts
Group: System/Applications
%description ts-devel
Translation source for libcontacts
...
...
@@ -57,7 +53,7 @@ Translation source for libcontacts
%build
%qmake5 VERSION=%{version}
%qmake5 VERSION=%{version}
"PKGCONFIG_LIB=%{_lib}"
make %{?_smp_mflags}
...
...
src/src.pro
View file @
fc6f7849
...
...
@@ -6,12 +6,18 @@ CONFIG += create_pc create_prl no_install_prl
#
'contacts'
is
too
generic
for
the
target
name
-
use
'contactcache'
TARGET
=
$$
{
PACKAGENAME
}
target
.
path
=
$$
PREFIX
/
lib
target
.
path
=
$$
[
QT_INSTALL_LIBS
]
INSTALLS
+=
target
#
This
should
be
passed
on
qmake
command
line
isEmpty
(
PKGCONFIG_LIB
)
{
PKGCONFIG_LIB
=
lib
message
(
"PKGCONFIG_LIB is unset, assuming $$PKGCONFIG_LIB"
)
}
#
version
for
generated
pkgconfig
files
is
defined
in
the
spec
file
QMAKE_PKGCONFIG_INCDIR
=
$$
PREFIX
/
include
/
$$
{
PACKAGENAME
}
QMAKE_PKGCONFIG_LIBDIR
=
$$
PREFIX
/
lib
QMAKE_PKGCONFIG_LIBDIR
=
$$
PREFIX
/
$$
{
PKGCONFIG_LIB
}
QMAKE_PKGCONFIG_DESTDIR
=
pkgconfig
CONFIG
+=
link_pkgconfig
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment