diff --git a/quassel.changes b/quassel.changes index cc2e18a..e8c617c 100644 --- a/quassel.changes +++ b/quassel.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 23 09:05:32 UTC 2020 - Christophe Giboudeaux + +- Spec cleanup + ------------------------------------------------------------------- Wed Aug 26 06:30:00 UTC 2020 - Antonio Larrosa diff --git a/quassel.spec b/quassel.spec index c4c70a4..b532283 100644 --- a/quassel.spec +++ b/quassel.spec @@ -37,32 +37,30 @@ Source5: quassel-rpmlintrc Patch0: quassel-set-required-libs-and-flags.patch # PATCH-FIX-UPSTREAM: Fix build with Qt 5.14 Patch1: 0001-common-Disable-enum-type-stream-operators-for-Qt-5.1.patch -BuildRequires: cmake >= 2.8.10 -BuildRequires: extra-cmake-modules BuildRequires: fdupes BuildRequires: git BuildRequires: hicolor-icon-theme -BuildRequires: kconfigwidgets-devel -BuildRequires: kcoreaddons-devel BuildRequires: kf5-filesystem -BuildRequires: knotifications-devel -BuildRequires: knotifyconfig-devel -BuildRequires: ktextwidgets-devel -BuildRequires: kxmlgui-devel BuildRequires: openldap2-devel BuildRequires: pkgconfig -BuildRequires: snorenotify-qt5-devel >= 0.7 +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5Notifications) +BuildRequires: cmake(KF5NotifyConfig) +BuildRequires: cmake(KF5TextWidgets) +BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(LibsnoreQt5) >= 0.7 +BuildRequires: cmake(Qt5Core) >= 5.2.0 +BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5LinguistTools) -BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Multimedia) -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Script) -BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5WebEngine) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(dbusmenu-qt5) -BuildRequires: pkgconfig(qca2-qt5) +BuildRequires: cmake(Qt5Multimedia) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5Script) +BuildRequires: cmake(Qt5Sql) +BuildRequires: cmake(Qt5WebEngine) +BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(dbusmenu-qt5) +BuildRequires: cmake(qca2-qt5) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(zlib) %{?systemd_requires} @@ -150,8 +148,7 @@ such as WeeChat, but graphical. This contains common parts shared by %{name} and %{name}-client. %prep -%setup -q -n %{name}-%{realver} -%autopatch -p1 +%autosetup -p1 -n %{name}-%{realver} %build FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -160,10 +157,10 @@ FAKE_BUILDTIME=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/common/quassel.cpp %cmake_kf5 -d build -- -DUSE_QT5=ON -DWITH_WEBENGINE=ON -DWITH_KDE=ON -make %{?_smp_mflags} +%cmake_build cd .. %cmake_kf5 -d build-qt5 -- -DUSE_QT5=ON -DWITH_WEBENGINE=ON -DWITH_KDE=OFF -make %{?_smp_mflags} +%cmake_build %install %kf5_makeinstall -C build @@ -209,14 +206,6 @@ sed -i '1{ %postun core %service_del_postun quasselcore.service -%if 0%{?suse_version} < 1500 -%post base -%icon_theme_cache_post - -%postun base -%icon_theme_cache_postun -%endif - %post client update-alternatives --install %{_bindir}/quasselclient quasselclient %{_bindir}/quasselclient-kde 20