Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb50027' into 'master'
[aarch64] Use macros. Do not hardcode lib dir. Contributes to JB#50027

See merge request mer-core/commhistory-daemon!33
  • Loading branch information
Matti Kosola committed Jun 15, 2020
2 parents 0ad3eda + 76557ea commit edf1e74
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 14 deletions.
4 changes: 2 additions & 2 deletions common-installs-config.pri
Expand Up @@ -50,7 +50,7 @@ contains( TEMPLATE, app ) {
#-----------------------------------------------------------------------------
contains( TEMPLATE, lib ) {

target.path = $${INSTALL_PREFIX}/lib
target.path = $$[QT_INSTALL_LIBS]
INSTALLS += target


Expand All @@ -59,7 +59,7 @@ contains( TEMPLATE, lib ) {
#-------------------------------------------------------------------------
CONFIG *= create_prl create_pc
pkgconfig.files = $${TARGET}.pc
pkgconfig.path = $${INSTALL_PREFIX}/lib/pkgconfig
pkgconfig.path = $$[QT_INSTALL_LIBS]/pkgconfig
INSTALLS += pkgconfig

# reset the .pc file's `prefix' variable
Expand Down
19 changes: 8 additions & 11 deletions rpm/commhistory-daemon.spec
Expand Up @@ -2,9 +2,8 @@ Name: commhistory-daemon
Summary: Communications event history database daemon
Version: 0.8.13
Release: 1
Group: Communications/Telephony and IM
License: LGPLv2.1
URL: https://git.merproject.org/mer-core/commhistory-daemon
URL: https://git.sailfishos.org/mer-core/commhistory-daemon
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}.privileges
BuildRequires: pkgconfig(Qt5Core)
Expand All @@ -27,6 +26,7 @@ BuildRequires: qt5-qttools-linguist
BuildRequires: libqofono-qt5-devel >= 0.89
BuildRequires: libqofonoext-devel
BuildRequires: python
BuildRequires: systemd
Requires: libcommhistory-qt5 >= 1.9.33
Requires: libqofono-qt5 >= 0.66
Requires: mapplauncherd-qt5
Expand All @@ -36,9 +36,6 @@ Provides: smshistory > 0.1.8
Obsoletes: voicecallhistory <= 0.1.5
Provides: voicecallhistory > 0.1.5

%{!?qtc_qmake5:%define qtc_qmake5 %qmake5}
%{!?qtc_make:%define qtc_make make}

%package tests
Summary: Unit tests for %{name}

Expand All @@ -59,24 +56,24 @@ Daemon for logging communications (IM, SMS and call) in history database.

%build
unset LD_AS_NEEDED
%qtc_qmake5
%qtc_make %{?_smp_mflags}
%qmake5
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
%qmake5_install

mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants
ln -s ../commhistoryd.service %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/
mkdir -p %{buildroot}%{_userunitdir}/user-session.target.wants
ln -s ../commhistoryd.service %{buildroot}%{_userunitdir}/user-session.target.wants/

mkdir -p %{buildroot}%{_datadir}/mapplauncherd/privileges.d
install -m 644 -p %{SOURCE1} %{buildroot}%{_datadir}/mapplauncherd/privileges.d

%files
%defattr(-,root,root,-)
%{_bindir}/commhistoryd
%{_libdir}/systemd/user/commhistoryd.service
%{_libdir}/systemd/user/user-session.target.wants/commhistoryd.service
%{_userunitdir}/commhistoryd.service
%{_userunitdir}/user-session.target.wants/commhistoryd.service
%{_datadir}/translations/*.qm
%{_datadir}/lipstick/notificationcategories/*
%{_datadir}/telepathy/clients/CommHistory.client
Expand Down
4 changes: 3 additions & 1 deletion tools/mocwrapper.sh
@@ -1,3 +1,5 @@
#!/bin/sh

ARGS=
for i
do
Expand All @@ -8,4 +10,4 @@ do
fi
shift
done
moc $ARGS
moc $ARGS

0 comments on commit edf1e74

Please sign in to comment.