Skip to content

Commit

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

See merge request !3
  • Loading branch information
rainemak committed Sep 8, 2017
2 parents 6682ca8 + cc8483d commit 22a12aa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 2 additions & 3 deletions rpm/libusb-moded-qt5.spec
@@ -1,7 +1,7 @@
Name: libusb-moded-qt5

Summary: A library of Qt5 bindings for usb_moded
Version: 1.5
Version: 1.6
Release: 1
Group: System/Libraries
License: BSD
Expand All @@ -25,7 +25,6 @@ This package contains Qt bindings for usb_moded
Summary: Development files for usb_moded Qt bindings
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name} = %{version}

%description devel
This package contains the development header files for usb_moded Qt bindings.
Expand All @@ -34,7 +33,7 @@ This package contains the development header files for usb_moded Qt bindings.
%setup -q -n %{name}-%{version}

%build
%qtc_qmake5
%qtc_qmake5 "VERSION=%{version}"
%qtc_make %{?_smp_mflags}

%install
Expand Down
3 changes: 2 additions & 1 deletion src/src.pro
Expand Up @@ -2,7 +2,6 @@ TEMPLATE = lib
TARGET = usb-moded-qt5
CONFIG += link_pkgconfig
PKGCONFIG += usb_moded
VERSION = 1.4

QT += dbus
QT -= gui
Expand Down Expand Up @@ -42,6 +41,8 @@ INSTALLS += target

pkgconfig.files = $$TARGET.pc
pkgconfig.path = $$target.path/pkgconfig-qt5
QMAKE_PKGCONFIG_NAME = lib$$TARGET
QMAKE_PKGCONFIG_VERSION = $$VERSION
QMAKE_PKGCONFIG_DESCRIPTION = Qt bindings for usb_moded
QMAKE_PKGCONFIG_INCDIR = $$headers.path
QMAKE_PKGCONFIG_LIBDIR = $$target.path
Expand Down

0 comments on commit 22a12aa

Please sign in to comment.