From 4c5412fd7d3f40b80c9dd31da789e540fdcf63ad4f2cda281d0be44a837172c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 9 Mar 2015 13:05:07 +0000 Subject: [PATCH] - Version bump to 0.12-beta1: * Various fixes all around * Add support for KF5 so build with its integration - Reenable qca2 crypto - Enable snorenotify support OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/quassel?expand=0&rev=22 --- quassel-0.11.0.tar.bz2 | 3 --- quassel-0.12-beta1.tar.bz2 | 3 +++ quassel.changes | 9 ++++++++ quassel.spec | 42 +++++++++++++++++++++++++------------- 4 files changed, 40 insertions(+), 17 deletions(-) delete mode 100644 quassel-0.11.0.tar.bz2 create mode 100644 quassel-0.12-beta1.tar.bz2 diff --git a/quassel-0.11.0.tar.bz2 b/quassel-0.11.0.tar.bz2 deleted file mode 100644 index 484df72..0000000 --- a/quassel-0.11.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99a191b8bc2a410f7020b890ec57e0be49313f539da9f4843675bb108b0f4504 -size 2875387 diff --git a/quassel-0.12-beta1.tar.bz2 b/quassel-0.12-beta1.tar.bz2 new file mode 100644 index 0000000..0cbaf98 --- /dev/null +++ b/quassel-0.12-beta1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9bdedea4b334d7d9a4b79acde42ed80f16a077300346a310bd7d74873d7c8599 +size 3626759 diff --git a/quassel.changes b/quassel.changes index 528fa0c..4cf679d 100644 --- a/quassel.changes +++ b/quassel.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Mar 6 21:10:57 UTC 2015 - tchvatal@suse.com + +- Version bump to 0.12-beta1: + * Various fixes all around + * Add support for KF5 so build with its integration +- Reenable qca2 crypto +- Enable snorenotify support + ------------------------------------------------------------------- Thu Jan 8 11:39:24 UTC 2015 - dimstar@opensuse.org diff --git a/quassel.spec b/quassel.spec index c54a29b..6bead1d 100644 --- a/quassel.spec +++ b/quassel.spec @@ -1,7 +1,7 @@ # # spec file for package quassel # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,34 @@ # +%define realver 0.12-beta1 Name: quassel -Version: 0.11.0 +Version: 0.12~beta1 Release: 0 Summary: Modern, cross-platform, distributed IRC client License: GPL-2.0 or GPL-3.0 Group: Productivity/Networking/IRC -Url: http://%{name}-irc.org/ -Source: http://%{name}-irc.org/pub/%{name}-%{version}.tar.bz2 +Url: http://quassel-irc.org/ +Source: http://%{name}-irc.org/pub/%{name}-%{realver}.tar.bz2 Source1: service.%{name}core Source2: sysconfig.%{name}core Source3: logrotate.%{name}core Source4: %{name}.SuSEfirewall2 Source5: quassel-rpmlintrc -# Package/enable https://github.com/TheOneRing/Snorenotify 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: phonon4qt5-devel +BuildRequires: snorenotify-qt5-devel BuildRequires: systemd BuildRequires: pkgconfig(Qt5CLucene) BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 @@ -51,6 +60,7 @@ BuildRequires: pkgconfig(Qt5WebKit) BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(dbusmenu-qt5) +BuildRequires: pkgconfig(qca2-qt5) BuildRequires: pkgconfig(zlib) BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} @@ -144,7 +154,7 @@ available. This contains common parts shared by %{name} and %{name}-client %prep -%setup -q +%setup -q -n %{name}-%{realver} %build FAKE_BUILDDATE=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -152,19 +162,17 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/common/main.cpp src/common/quassel. FAKE_BUILDTIME=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/common/main.cpp src/common/quassel.cpp -%cmake \ - -DUSE_QT5=ON \ - -DWITH_WEBKIT=ON +%cmake_kf5 -d build -- -DUSE_QT5=ON -DWITH_WEBKIT=ON -DWITH_KDE=ON make %{?_smp_mflags} %install -%cmake_install +%kf5_makeinstall -C build %fdupes %{buildroot} install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}core install -d -m 755 %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_unitdir} install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/quasselcore.service -# Provide SUSE policy symlink /usr/sbin/rcFOO -> /etc/init.d/FOO +# Provide SUSE policy symlink /usr/sbin/rcFOO -> service ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcquasselcore install -D -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.quasselcore install -d -m 751 %{buildroot}%{_localstatedir}/log/%{name} @@ -203,6 +211,7 @@ install -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2. %defattr(-,root,root) %doc AUTHORS ChangeLog README %{_datadir}/applications/%{name}client.desktop +%{_datadir}/knotifications5/%{name}.notifyrc %{_bindir}/%{name}client %files core @@ -220,10 +229,15 @@ install -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2. %files base %defattr(-,root,root) %{_datadir}/pixmaps/%{name}.png -%dir %{_datadir}/apps -%dir %{_datadir}/apps/%{name} -%{_datadir}/apps/%{name} +%dir %{_datadir}/%{name} +%{_datadir}/%{name} %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/*/status/%{name}-*.png +%{_datadir}/icons/hicolor/*/status/irc-channel-joined.png +%{_datadir}/icons/hicolor/*/status/irc-channel-parted.png +%{_datadir}/icons/hicolor/*/actions/im-user-away.png +%{_datadir}/icons/hicolor/*/actions/im-user-offline.png +%{_datadir}/icons/hicolor/*/actions/im-user.png +%{_datadir}/icons/hicolor/scalable/*/* %changelog