diff --git a/0.6.6.tar.gz b/0.6.6.tar.gz deleted file mode 100644 index 45ea478..0000000 --- a/0.6.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33d3da5a7045bbe2611dd73104279986dd8356b24de339dd10874c1a9417bba7 -size 560130 diff --git a/libQuotient-0.6.7.tar.gz b/libQuotient-0.6.7.tar.gz new file mode 100644 index 0000000..464f046 --- /dev/null +++ b/libQuotient-0.6.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29143c56efb24525d168281fdb751531d69529f05e7e7d1b1121a1d64a504510 +size 560174 diff --git a/libQuotient.changes b/libQuotient.changes index 4eb7b70..f214dee 100644 --- a/libQuotient.changes +++ b/libQuotient.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Jul 18 14:09:53 UTC 2021 - Fabian Vogt + +- Updae to version 0.6.7: + * One more maintenance release at the stable branch, fixing + gh#quotient-im/libQuotient#471 that affects NeoChat - thanks + to @ognarb for pinpointing and suggesting a fix to it. +- Mention soversion in %files +- Simplify %files +- Use full tarball name +- Don't install quotest and ndk-modules/Android.mk + ------------------------------------------------------------------- Thu Mar 18 05:51:58 UTC 2021 - Dead Mozay diff --git a/libQuotient.spec b/libQuotient.spec index 47a4c47..23d9e1a 100644 --- a/libQuotient.spec +++ b/libQuotient.spec @@ -17,26 +17,25 @@ %define soversion 0_6 +%define sonum 0.6 %bcond_with e2ee Name: libQuotient -Version: 0.6.6 +Version: 0.6.7 Release: 0 Summary: Library for Qt Matrix Clients License: LGPL-2.1-only Group: Development/Libraries/C and C++ URL: https://github.com/quotient-im/libQuotient -Source0: https://github.com/quotient-im/%{name}/archive/%{version}.tar.gz +Source0: https://github.com/quotient-im/%{name}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: unzip -BuildRequires: pkgconfig(Qt5Core) >= 5.6 +BuildRequires: pkgconfig(Qt5Core) >= 5.9 BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Multimedia) BuildRequires: pkgconfig(Qt5Network) %if %{with e2ee} BuildRequires: cmake(Olm) -BuildRequires: pkgconfig(QtOlm) %endif %description @@ -61,19 +60,23 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -p1 %build +%cmake \ + -DQuotient_INSTALL_TESTS=OFF \ %if %{with e2ee} -%cmake -DQuotient_ENABLE_E2EE=ON + -DQuotient_ENABLE_E2EE=ON %else -%cmake -DQuotient_ENABLE_E2EE=OFF + -DQuotient_ENABLE_E2EE=OFF %endif %cmake_build %install %cmake_install +# Not useful +rm -r %{buildroot}%{_datadir}/ndk-modules/ %post -n %{name}%{soversion} -p /sbin/ldconfig %postun -n %{name}%{soversion} -p /sbin/ldconfig @@ -81,7 +84,8 @@ developing applications that use %{name}. %files -n %{name}%{soversion} %doc README.md %license COPYING -%{_libdir}/libQuotient.so.* +%{_libdir}/libQuotient.so.%{version} +%{_libdir}/libQuotient.so.%{sonum} %files devel %doc README.md @@ -89,26 +93,6 @@ developing applications that use %{name}. %{_libdir}/pkgconfig/Quotient.pc %{_libdir}/libQuotient.so %{_libdir}/cmake/Quotient/ -%dir %{_includedir}/Quotient -%dir %{_includedir}/Quotient/csapi -%dir %{_includedir}/Quotient/csapi/definitions -%dir %{_includedir}/Quotient/csapi/definitions/wellknown -%dir %{_includedir}/Quotient/application-service -%dir %{_includedir}/Quotient/application-service/definitions -%dir %{_includedir}/Quotient/identity -%dir %{_includedir}/Quotient/identity/definitions -%dir %{_includedir}/Quotient/jobs -%dir %{_includedir}/Quotient/events -%dir %{_datadir}/ndk-modules -%{_includedir}/Quotient/*.h -%{_includedir}/Quotient/application-service/definitions/*.h -%{_includedir}/Quotient/csapi/*.h -%{_includedir}/Quotient/csapi/definitions/*h -%{_includedir}/Quotient/csapi/definitions/wellknown/*h -%{_includedir}/Quotient/events/*.h -%{_includedir}/Quotient/identity/definitions/*.h -%{_includedir}/Quotient/jobs/*.h -%{_bindir}/quotest -%{_datadir}/ndk-modules/Android.mk +%{_includedir}/Quotient/ %changelog