Commit 22a12aab authored by Raine Makelainen's avatar Raine Makelainen

Merge branch 'jb38551' into 'master'

[usb-moded-qt5] Properly link package and .pc version. Contributes to JB#38551

See merge request !3
parents 6682ca89 cc8483dc
Name: libusb-moded-qt5 Name: libusb-moded-qt5
Summary: A library of Qt5 bindings for usb_moded Summary: A library of Qt5 bindings for usb_moded
Version: 1.5 Version: 1.6
Release: 1 Release: 1
Group: System/Libraries Group: System/Libraries
License: BSD License: BSD
...@@ -25,7 +25,6 @@ This package contains Qt bindings for usb_moded ...@@ -25,7 +25,6 @@ This package contains Qt bindings for usb_moded
Summary: Development files for usb_moded Qt bindings Summary: Development files for usb_moded Qt bindings
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: %{name} = %{version}
%description devel %description devel
This package contains the development header files for usb_moded Qt bindings. This package contains the development header files for usb_moded Qt bindings.
...@@ -34,7 +33,7 @@ This package contains the development header files for usb_moded Qt bindings. ...@@ -34,7 +33,7 @@ This package contains the development header files for usb_moded Qt bindings.
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%build %build
%qtc_qmake5 %qtc_qmake5 "VERSION=%{version}"
%qtc_make %{?_smp_mflags} %qtc_make %{?_smp_mflags}
%install %install
......
...@@ -2,7 +2,6 @@ TEMPLATE = lib ...@@ -2,7 +2,6 @@ TEMPLATE = lib
TARGET = usb-moded-qt5 TARGET = usb-moded-qt5
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += usb_moded PKGCONFIG += usb_moded
VERSION = 1.4
QT += dbus QT += dbus
QT -= gui QT -= gui
...@@ -42,6 +41,8 @@ INSTALLS += target ...@@ -42,6 +41,8 @@ INSTALLS += target
pkgconfig.files = $$TARGET.pc pkgconfig.files = $$TARGET.pc
pkgconfig.path = $$target.path/pkgconfig-qt5 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_DESCRIPTION = Qt bindings for usb_moded
QMAKE_PKGCONFIG_INCDIR = $$headers.path QMAKE_PKGCONFIG_INCDIR = $$headers.path
QMAKE_PKGCONFIG_LIBDIR = $$target.path QMAKE_PKGCONFIG_LIBDIR = $$target.path
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment