Merge pull request #12 from sailfishos/devel_package

Add back a -devel package. JB#60787
sailfishos · May 22, 2023 · 9a16be0 · 9a16be0
2 parents 43f0507 + e45a27f
commit 9a16be0
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 11 deletions.
diff --git a/lib/src/src.pro b/lib/src/src.pro
@@ -1,27 +1,24 @@
 TEMPLATE = lib
 TARGET = voicecall
 
-QT = core dbus
-
-CONFIG += c++11
+QT = core
 
 HEADERS += \
     common.h \
     voicecallmanagerinterface.h \
     abstractvoicecallhandler.h \
     abstractvoicecallprovider.h \
     abstractvoicecallmanagerplugin.h \
-    dbus/voicecallmanagerdbusadapter.h \
-    dbus/voicecallhandlerdbusadapter.h
 
 SOURCES += \
-    dbus/voicecallmanagerdbusadapter.cpp \
-    dbus/voicecallhandlerdbusadapter.cpp \
     abstractvoicecallhandler.cpp \
     common.cpp
 
 target.path = $$[QT_INSTALL_LIBS]
 
-INSTALLS += target
+develheaders.path = /usr/include/voicecall
+develheaders.files = $$HEADERS
+
+INSTALLS += target develheaders
 
 OTHER_FILES +=
diff --git a/rpm/voicecall-qt5.spec b/rpm/voicecall-qt5.spec
@@ -25,6 +25,13 @@ BuildRequires:  oneshot
 %description
 %{summary}.
 
+%package devel
+Summary:    Voicecall development package
+Requires:   %{name} = %{version}-%{release}
+
+%description devel
+%{summary}.
+
 %package plugin-telepathy
 Summary:    Voicecall plugin for calls using telepathy
 Requires:   %{name} = %{version}-%{release}
@@ -89,7 +96,6 @@ fi
 %{_libdir}/libvoicecall.so.1
 %{_libdir}/libvoicecall.so.1.0
 %{_libdir}/libvoicecall.so.1.0.0
-%exclude %{_libdir}/libvoicecall.so
 %dir %{_libdir}/qt5/qml/org/nemomobile/voicecall
 %{_libdir}/qt5/qml/org/nemomobile/voicecall/libvoicecall.so
 %{_libdir}/qt5/qml/org/nemomobile/voicecall/qmldir
@@ -104,6 +110,11 @@ fi
 %{_datadir}/mapplauncherd/privileges.d/*
 %{_oneshotdir}/phone-move-recordings-dir
 
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libvoicecall.so
+%{_includedir}/voicecall
+
 %files plugin-telepathy
 %defattr(-,root,root,-)
 %{_libdir}/voicecall/plugins/libvoicecall-telepathy-plugin.so

diff --git a/lib/src/dbus/voicecallhandlerdbusadapter.cpp → src/dbus/voicecallhandlerdbusadapter.cpp b/lib/src/dbus/voicecallhandlerdbusadapter.cpp → src/dbus/voicecallhandlerdbusadapter.cpp
diff --git a/lib/src/dbus/voicecallhandlerdbusadapter.h → src/dbus/voicecallhandlerdbusadapter.h b/lib/src/dbus/voicecallhandlerdbusadapter.h → src/dbus/voicecallhandlerdbusadapter.h
diff --git a/lib/src/dbus/voicecallmanagerdbusadapter.cpp → src/dbus/voicecallmanagerdbusadapter.cpp b/lib/src/dbus/voicecallmanagerdbusadapter.cpp → src/dbus/voicecallmanagerdbusadapter.cpp
diff --git a/lib/src/dbus/voicecallmanagerdbusadapter.h → src/dbus/voicecallmanagerdbusadapter.h b/lib/src/dbus/voicecallmanagerdbusadapter.h → src/dbus/voicecallmanagerdbusadapter.h
diff --git a/src/dbus/voicecallmanagerdbusservice.cpp b/src/dbus/voicecallmanagerdbusservice.cpp
@@ -21,8 +21,8 @@
 #include "common.h"
 
 #include "voicecallmanagerdbusservice.h"
-#include <dbus/voicecallmanagerdbusadapter.h>
-#include <dbus/voicecallhandlerdbusadapter.h>
+#include "voicecallmanagerdbusadapter.h"
+#include "voicecallhandlerdbusadapter.h"
 
 #include <voicecallmanagerinterface.h>
 

diff --git a/src/src.pro b/src/src.pro
@@ -25,9 +25,13 @@ HEADERS += \
     dbus/voicecallmanagerdbusservice.h \
     basicvoicecallconfigurator.h \
     voicecallmanager.h \
+    dbus/voicecallmanagerdbusadapter.h \
+    dbus/voicecallhandlerdbusadapter.h
 
 SOURCES += \
     dbus/voicecallmanagerdbusservice.cpp \
+    dbus/voicecallmanagerdbusadapter.cpp \
+    dbus/voicecallhandlerdbusadapter.cpp \
     basicvoicecallconfigurator.cpp \
     voicecallmanager.cpp \
     main.cpp \