commit 97f5db0a81c1d17392d9bc6d6a2f626fc762cf5b
Author: Jakub Bogusz <[email protected]>
Date: Sat Feb 27 09:07:39 2021 +0100
- copied from telepathy-qt4, version 0.9.8 is qt5-only
- spec cleaned up for qt5 only, removed outdated qt4,link patches
telepathy-qt-link.patch | 10 --
telepathy-qt-qt4.patch | 12 --
telepathy-qt4.spec => telepathy-qt5.spec | 186 +++++++------------------------
3 files changed, 40 insertions(+), 168 deletions(-)
---
diff --git a/telepathy-qt4.spec b/telepathy-qt5.spec
similarity index 51%
rename from telepathy-qt4.spec
rename to telepathy-qt5.spec
index e3488a2..8c41ffd 100644
--- a/telepathy-qt4.spec
+++ b/telepathy-qt5.spec
@@ -1,17 +1,12 @@
-#
-# Conditional build:
-%bcond_with qt4 # Qt4 interface
-%bcond_without qt5 # Qt5 interface
-
# "telepathy_qt" name is occupied by earlier work under the same name from
different project;
-# thus spec and repo stick to original "telepathy-qt4" name of this project
(used before 0.9.0 release)
+# we used original "telepathy-qt4" name of this project (used before 0.9.0
release) until 0.9.7
+# (the last version with qt4 support), then we moved to "telepathy-qt5".
%define orgname telepathy-qt
-%define qt4_ver 4.8.2
-%define qt5_ver 5.0.0
+%define qt5_ver 5.6.0
-Summary: Library for Qt4-based Telepathy clients
-Summary(pl.UTF-8): Biblioteka dla klientów Telepathy opartych na Qt4
-Name: telepathy-qt4
+Summary: Library for Qt5-based Telepathy clients
+Summary(pl.UTF-8): Biblioteka dla klientów Telepathy opartych na Qt5
+Name: telepathy-qt5
Version: 0.9.8
Release: 1
License: LGPL v2.1+
@@ -19,77 +14,60 @@ Group: Libraries
Source0:
https://telepathy.freedesktop.org/releases/telepathy-qt/%{orgname}-%{version}.tar.gz
# Source0-md5: 2d55d477778ff7be9115746759bc398f
Patch0: telepathy-qt-warnings.patch
-Patch1: telepathy-qt-qt4.patch
-Patch2: telepathy-qt-link.patch
-URL: https://telepathy.freedesktop.org/wiki/Telepathy-Qt4
-BuildRequires: cmake >= 2.8.12
+URL: https://telepathy.freedesktop.org/components/telepathy-qt/
+BuildRequires: Qt5Core-devel >= %{qt5_ver}
+BuildRequires: Qt5DBus-devel >= %{qt5_ver}
+BuildRequires: Qt5Network-devel >= %{qt5_ver}
+BuildRequires: Qt5Test-devel >= %{qt5_ver}
+BuildRequires: Qt5Xml-devel >= %{qt5_ver}
+BuildRequires: cmake >= 3.5
BuildRequires: dbus-devel
BuildRequires: dbus-glib-devel
BuildRequires: farstream-devel >= 0.2.0
BuildRequires: glib2-devel >= 1:2.16
+BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: libxml2-devel >= 2.0
BuildRequires: pkgconfig
-BuildRequires: python-dbus
-BuildRequires: python-devel >= 1:2.5
-BuildRequires: python-modules >= 1:2.5
-BuildRequires: python-pygobject
-BuildRequires: rpmbuild(macros) >= 1.293
-BuildRequires: telepathy-farstream-devel >= 0.6.0
-BuildRequires: telepathy-glib-devel >= 0.18.0
-%if %{with qt4}
-BuildRequires: QtCore-devel >= %{qt4_ver}
-BuildRequires: QtDBus-devel >= %{qt4_ver}
-BuildRequires: QtGui-devel >= %{qt4_ver}
-BuildRequires: QtHelp >= %{qt4_ver}
-BuildRequires: QtNetwork-devel >= %{qt4_ver}
-BuildRequires: QtTest-devel >= %{qt4_ver}
-BuildRequires: QtXml-devel >= %{qt4_ver}
-BuildRequires: qt4-build >= %{qt4_ver}
-BuildRequires: qt4-qmake >= %{qt4_ver}
-%endif
-%if %{with qt5}
-BuildRequires: Qt5Core-devel >= %{qt5_ver}
-BuildRequires: Qt5DBus-devel >= %{qt5_ver}
-BuildRequires: Qt5Gui-devel >= %{qt5_ver}
-BuildRequires: Qt5Network-devel >= %{qt5_ver}
-BuildRequires: Qt5Test-devel >= %{qt5_ver}
-BuildRequires: Qt5Widgets-devel >= %{qt5_ver}
-BuildRequires: Qt5Xml-devel >= %{qt5_ver}
+BuildRequires: python3-dbus
+BuildRequires: python3-devel >= 1:3.2
+BuildRequires: python3-modules >= 1:3.2
+BuildRequires: python3-pygobject3
BuildRequires: qt5-assistant >= %{qt5_ver}
BuildRequires: qt5-build >= %{qt5_ver}
BuildRequires: qt5-qmake >= %{qt5_ver}
-%endif
-Requires: QtCore >= %{qt4_ver}
-Requires: QtDBus >= %{qt4_ver}
-Requires: QtNetwork >= %{qt4_ver}
-Requires: QtXml >= %{qt4_ver}
+BuildRequires: rpmbuild(macros) >= 1.293
+BuildRequires: telepathy-farstream-devel >= 0.6.0
+BuildRequires: telepathy-glib-devel >= 0.18.0
+Requires: Qt5Core >= %{qt5_ver}
+Requires: Qt5DBus >= %{qt5_ver}
+Requires: Qt5Network >= %{qt5_ver}
+Requires: Qt5Xml >= %{qt5_ver}
Requires: telepathy-farstream >= 0.6.0
Requires: telepathy-glib >= 0.18.0
Obsoletes: telepathy-qt4-yell
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
-Library for Qt4-based Telepathy clients.
+Library for Qt5-based Telepathy clients.
%description -l pl.UTF-8
-Biblioteka dla klientów Telepathy opartych na Qt4.
+Biblioteka dla klientów Telepathy opartych na Qt5.
%package devel
-Summary: Header files for telepathy-qt4 library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki telepathy-qt4
+Summary: Header files for telepathy-qt5 library
+Summary(pl.UTF-8): Pliki nagłówkowe biblioteki telepathy-qt5
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: QtCore-devel >= %{qt4_ver}
-Requires: QtDBus-devel >= %{qt4_ver}
-Requires: QtNetwork-devel >= %{qt4_ver}
-Requires: QtXml-devel >= %{qt4_ver}
-Obsoletes: telepathy-qt4-yell-devel
+Requires: Qt5Core-devel >= %{qt5_ver}
+Requires: Qt5DBus-devel >= %{qt5_ver}
+Requires: Qt5Network-devel >= %{qt5_ver}
+Requires: Qt5Xml-devel >= %{qt5_ver}
%description devel
-Header files for telepathy-qt4 library.
+Header files for telepathy-qt5 library.
%description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki telepathy-qt4.
+Pliki nagłówkowe biblioteki telepathy-qt5.
%package apidocs
Summary: API documentation for telepathy-qt4 and telepathy-qt5 libraries
@@ -105,57 +83,11 @@ API documentation for telepathy-qt4 and telepathy-qt5
libraries.
%description apidocs -l pl.UTF-8
Dokumentacja API bibliotek telepathy-qt5 i telepathy-qt5.
-%package -n telepathy-qt5
-Summary: Library for Qt5-based Telepathy clients
-Summary(pl.UTF-8): Biblioteka dla klientów Telepathy opartych na Qt5
-Group: Libraries
-Requires: Qt5Core >= %{qt5_ver}
-Requires: Qt5DBus >= %{qt5_ver}
-Requires: Qt5Network >= %{qt5_ver}
-Requires: Qt5Xml >= %{qt5_ver}
-Requires: telepathy-farstream >= 0.6.0
-Requires: telepathy-glib >= 0.18.0
-
-%description -n telepathy-qt5
-Library for Qt5-based Telepathy clients.
-
-%description -n telepathy-qt5 -l pl.UTF-8
-Biblioteka dla klientów Telepathy opartych na Qt5.
-
-%package -n telepathy-qt5-devel
-Summary: Header files for telepathy-qt5 library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki telepathy-qt5
-Group: Development/Libraries
-Requires: Qt5Core-devel >= %{qt5_ver}
-Requires: Qt5DBus-devel >= %{qt5_ver}
-Requires: telepathy-qt5 = %{version}-%{release}
-
-%description -n telepathy-qt5-devel
-Header files for telepathy-qt5 library.
-
-%description -n telepathy-qt5-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki telepathy-qt5.
-
%prep
%setup -q -n %{orgname}-%{version}
%patch0 -p1
-#%%patch1 -p1
-#%%patch2 -p1
%build
-%if %{with qt4}
-install -d build-qt4
-cd build-qt4
-%cmake .. \
- -DENABLE_FARSTREAM:BOOL=ON \
- -DDESIRED_QT_VERSION=4 \
- -DQT_QMAKE_EXECUTABLE_FINDQT=%{_libdir}/qt4/bin/qmake
-
-%{__make}
-cd ..
-%endif
-
-%if %{with qt5}
install -d build-qt5
cd build-qt5
%cmake .. \
@@ -165,20 +97,12 @@ cd build-qt5
%{__make}
cd ..
-%endif
%install
rm -rf $RPM_BUILD_ROOT
-%if %{with qt4}
-%{__make} -C build-qt4 install \
- DESTDIR=$RPM_BUILD_ROOT
-%endif
-
-%if %{with qt5}
%{__make} -C build-qt5 install \
DESTDIR=$RPM_BUILD_ROOT
-%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -186,43 +110,9 @@ rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%post -n telepathy-qt5 -p /sbin/ldconfig
-%postun -n telepathy-qt5 -p /sbin/ldconfig
-
-%if %{with qt4}
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_libdir}/libtelepathy-qt4.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libtelepathy-qt4.so.2
-%attr(755,root,root) %{_libdir}/libtelepathy-qt4-farstream.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libtelepathy-qt4-farstream.so.2
-%attr(755,root,root) %{_libdir}/libtelepathy-qt4-service.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libtelepathy-qt4-service.so.0
-
-%files devel
-%defattr(644,root,root,755)
-%doc doc/html
-%attr(755,root,root) %{_libdir}/libtelepathy-qt4.so
-%attr(755,root,root) %{_libdir}/libtelepathy-qt4-farstream.so
-%attr(755,root,root) %{_libdir}/libtelepathy-qt4-service.so
-%{_libdir}/cmake/TelepathyQt4
-%{_libdir}/cmake/TelepathyQt4Farstream
-%{_libdir}/cmake/TelepathyQt4Service
-%{_includedir}/telepathy-qt4
-%{_pkgconfigdir}/TelepathyQt4.pc
-%{_pkgconfigdir}/TelepathyQt4Farstream.pc
-%{_pkgconfigdir}/TelepathyQt4Service.pc
-%endif
-
-%files apidocs
-%defattr(644,root,root,755)
-%doc doc/html/*
-
-%if %{with qt5}
-%files -n telepathy-qt5
-%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
%attr(755,root,root) %{_libdir}/libtelepathy-qt5.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libtelepathy-qt5.so.0
%attr(755,root,root) %{_libdir}/libtelepathy-qt5-farstream.so.*.*.*
@@ -230,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libtelepathy-qt5-service.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libtelepathy-qt5-service.so.1
-%files -n telepathy-qt5-devel
+%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libtelepathy-qt5.so
%attr(755,root,root) %{_libdir}/libtelepathy-qt5-farstream.so
@@ -243,3 +133,7 @@ rm -rf $RPM_BUILD_ROOT
%{_pkgconfigdir}/TelepathyQt5Farstream.pc
%{_pkgconfigdir}/TelepathyQt5Service.pc
%endif
+
+%files apidocs
+%defattr(644,root,root,755)
+%doc doc/html/*
diff --git a/telepathy-qt-link.patch b/telepathy-qt-link.patch
deleted file mode 100644
index 3ac0376..0000000
--- a/telepathy-qt-link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- telepathy-qt-0.9.7/TelepathyQt/CMakeLists.txt.orig 2016-06-12
13:04:05.000000000 +0200
-+++ telepathy-qt-0.9.7/TelepathyQt/CMakeLists.txt 2016-06-21
22:05:40.686973292 +0200
-@@ -989,6 +989,7 @@
- target_link_libraries(telepathy-qt${QT_VERSION_MAJOR}-service
- ${QT_QTDBUS_LIBRARY}
- ${QT_QTCORE_LIBRARY}
-+ telepathy-qt${QT_VERSION_MAJOR}
- ${TP_QT_LIBRARY_LINKER_FLAGS})
-
- # Set the correct version number
diff --git a/telepathy-qt-qt4.patch b/telepathy-qt-qt4.patch
deleted file mode 100644
index 8d8dcc0..0000000
--- a/telepathy-qt-qt4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- telepathy-qt-0.9.7/tests/dbus/CMakeLists.txt.orig 2016-06-12
13:04:05.000000000 +0200
-+++ telepathy-qt-0.9.7/tests/dbus/CMakeLists.txt 2016-06-18
15:54:56.271798442 +0200
-@@ -93,7 +93,9 @@
- if(ENABLE_SERVICE_SUPPORT)
- tpqt_add_dbus_unit_test(BaseConnectionManager base-cm
telepathy-qt${QT_VERSION_MAJOR}-service)
- tpqt_add_dbus_unit_test(BaseProtocol base-protocol
telepathy-qt${QT_VERSION_MAJOR}-service)
-+ if (${QT_VERSION_MAJOR} GREATER 4)
- tpqt_add_dbus_unit_test(BaseChannelFileTransferType base-filetransfer
telepathy-qt${QT_VERSION_MAJOR}-service)
-+ endif (${QT_VERSION_MAJOR} GREATER 4)
- endif(ENABLE_SERVICE_SUPPORT)
-
- # Make check target. In case of check, output on failure and put it into a log
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/telepathy-qt5.git/commitdiff/5660c647a2eded0cb6789f8b6017484b531f1088
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
