Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb38551-pkgconfig-version' into 'master'
[transfer-engine] Properly link package and .pc version. Contributes to JB#38551

See merge request mer-core/transfer-engine!9
  • Loading branch information
blam committed Dec 13, 2018
2 parents 8ef3989 + 0d71320 commit ca985a9
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 29 deletions.
11 changes: 9 additions & 2 deletions lib/lib.pro
Expand Up @@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = nemotransferengine-qt5
DEPENDPATH += .
INCLUDEPATH += .
CONFIG += shared link_pkgconfig
CONFIG += shared qt create_pc create_prl no_install_prl link_pkgconfig
QT += dbus
PKGCONFIG += quillmetadata-qt5

Expand Down Expand Up @@ -36,7 +36,7 @@ HEADERS += \
SOURCES += \
transferengineinterface.cpp

OTHER_FILES += nemotransfernegine-qt5.pc nemotransferengine-plugin-qt5.prf
OTHER_FILES += nemotransferengine-qt5.pc nemotransferengine-plugin-qt5.prf

headers.files = $$HEADERS
headers.path = /usr/include/TransferEngine-qt5
Expand All @@ -49,5 +49,12 @@ pkgconfigpc.files = nemotransferengine-qt5.pc
prf.path = $$[QT_INSTALL_DATA]/mkspecs/features
prf.files = nemotransferengine-plugin-qt5.prf

QMAKE_PKGCONFIG_NAME = lib$$TARGET
QMAKE_PKGCONFIG_DESCRIPTION = Nemo transfer engine library for share plugins and transfer engine API
QMAKE_PKGCONFIG_LIBDIR = $$target.path
QMAKE_PKGCONFIG_INCDIR = $$headers.path
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
QMAKE_PKGCONFIG_REQUIRES = Qt5Core Qt5DBus
QMAKE_PKGCONFIG_VERSION = $$VERSION

INSTALLS += target headers prf pkgconfigpc
11 changes: 0 additions & 11 deletions lib/nemotransferengine-qt5.pc

This file was deleted.

11 changes: 0 additions & 11 deletions lib/nemotransferengine.pc

This file was deleted.

8 changes: 3 additions & 5 deletions rpm/transfer-engine-qt5.spec
@@ -1,5 +1,5 @@
Name: nemo-transferengine-qt5
Version: 0.3.1
Version: 1.0.0
Release: 0
Summary: Transfer Engine for uploading media content and tracking transfers.
Group: System Environment/Daemon
Expand Down Expand Up @@ -110,10 +110,8 @@ Documentation for Nemo TransferEngine
%setup -q -n %{name}-%{version}

%build

%qmake5

make %{?jobs:-j%jobs}
%qmake5 "VERSION=%{version}"
make %{?_smp_mflags}
make docs

%install
Expand Down

0 comments on commit ca985a9

Please sign in to comment.