From 7ff395a5095b9f676cbbe9a4c176166e47d30f742d8e4b15ff4828b991ca2025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 30 Apr 2018 14:54:25 +0000 Subject: [PATCH] Accepting request 602575 from home:jengelh:branches:KDE:Extra - Trim bias and filler wording from descriptions. - Stop ignoring errors from useradd/groupadd. OBS-URL: https://build.opensuse.org/request/show/602575 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/quassel?expand=0&rev=58 --- quassel.changes | 6 +++ quassel.spec | 98 +++++++++++++++++++------------------------------ 2 files changed, 43 insertions(+), 61 deletions(-) diff --git a/quassel.changes b/quassel.changes index b055030..5275e7d 100644 --- a/quassel.changes +++ b/quassel.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 30 14:19:49 UTC 2018 - jengelh@inai.de + +- Trim bias and filler wording from descriptions. +- Stop ignoring errors from useradd/groupadd. + ------------------------------------------------------------------- Wed Apr 25 07:56:26 UTC 2018 - tchvatal@suse.com diff --git a/quassel.spec b/quassel.spec index 5f95b9d..f1bac1a 100644 --- a/quassel.spec +++ b/quassel.spec @@ -23,7 +23,7 @@ Name: quassel Version: 0.12.5 Release: 0 -Summary: Modern, cross-platform, distributed IRC client +Summary: Distributed IRC client License: GPL-2.0-only OR GPL-3.0-only Group: Productivity/Networking/IRC URL: http://quassel-irc.org/ @@ -65,17 +65,13 @@ BuildRequires: pkgconfig(zlib) %{?systemd_requires} %description -Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that -one (or multiple) client(s) can attach to and detach from a central core -- -much like the popular combination of screen and a text-based IRC client such -as WeeChat, but graphical. In addition to this uniqe feature, we aim to bring -a pleasurable, comfortable chatting experience to all major platforms (including -Linux®, Windows®, and MacOS X® as well as Qtopia-based cell phones and PDAs), -making communication with your peers not only convenient, but also ubiquitous -available. +Quassel IRC is a distributed IRC client, meaning that one (or +multiple) client(s) can attach to and detach from a central core -- +much like the combination of GNU Screen and a text-based IRC client +such as WeeChat, but graphical. %package mono -Summary: Modern, cross-platform, distributed IRC client +Summary: Standalone client for the Quassel IRC client Group: Productivity/Networking/IRC Requires: %{name}-base = %{version} Requires: libqt5_sql_backend @@ -85,55 +81,43 @@ Obsoletes: %{name} < %{version} Provides: %{name}_ui = %{version} %description mono -Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that -one (or multiple) client(s) can attach to and detach from a central core -- -much like the popular combination of screen and a text-based IRC client such -as WeeChat, but graphical. In addition to this uniqe feature, we aim to bring -a pleasurable, comfortable chatting experience to all major platforms (including -Linux®, Windows®, and MacOS X® as well as Qtopia-based cell phones and PDAs), -making communication with your peers not only convenient, but also ubiquitous -available. +Quassel IRC is a distributed IRC client, meaning that one (or +multiple) client(s) can attach to and detach from a central core -- +much like the combination of GNU Screen and a text-based IRC client +such as WeeChat, but graphical. -This is the quassel standalone client +This is the quassel standalone client. %package client -Summary: Modern, cross-platform, distributed IRC client +Summary: KDE client for the Quassel IRC client Group: Productivity/Networking/IRC Requires: %{name}-base = %{version} Provides: %{name}_ui = %{version} %description client -Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that -one (or multiple) client(s) can attach to and detach from a central core -- -much like the popular combination of screen and a text-based IRC client such -as WeeChat, but graphical. In addition to this uniqe feature, we aim to bring -a pleasurable, comfortable chatting experience to all major platforms (including -Linux®, Windows®, and MacOS X® as well as Qtopia-based cell phones and PDAs), -making communication with your peers not only convenient, but also ubiquitous -available. +Quassel IRC is a distributed IRC client, meaning that one (or +multiple) client(s) can attach to and detach from a central core -- +much like the combination of GNU Screen and a text-based IRC client +such as WeeChat, but graphical. -This is the quassel KDE client only +This is the quassel KDE client only. %package client-qt5 -Summary: Modern, cross-platform, distributed IRC client +Summary: Qt5 client for the Quassel IRC client Group: Productivity/Networking/IRC Requires: %{name}-base = %{version} Provides: %{name}_ui = %{version} %description client-qt5 -Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that -one (or multiple) client(s) can attach to and detach from a central core -- -much like the popular combination of screen and a text-based IRC client such -as WeeChat, but graphical. In addition to this uniqe feature, we aim to bring -a pleasurable, comfortable chatting experience to all major platforms (including -Linux®, Windows®, and MacOS X® as well as Qtopia-based cell phones and PDAs), -making communication with your peers not only convenient, but also ubiquitous -available. +Quassel IRC is a distributed IRC client, meaning that one (or +multiple) client(s) can attach to and detach from a central core -- +much like the combination of GNU Screen and a text-based IRC client +such as WeeChat, but graphical. This is the quassel Qt5 client only %package core -Summary: Modern, cross-platform, distributed IRC client +Summary: Core program for the Quassel IRC client Group: Productivity/Networking/IRC Requires: libqt5_sql_backend Requires: logrotate @@ -142,33 +126,25 @@ Requires(pre): pwdutils Recommends: libqt5-sql-sqlite %description core -Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that -one (or multiple) client(s) can attach to and detach from a central core -- -much like the popular combination of screen and a text-based IRC client such -as WeeChat, but graphical. In addition to this uniqe feature, we aim to bring -a pleasurable, comfortable chatting experience to all major platforms (including -Linux®, Windows®, and MacOS X® as well as Qtopia-based cell phones and PDAs), -making communication with your peers not only convenient, but also ubiquitous -available. +Quassel IRC is a distributed IRC client, meaning that one (or +multiple) client(s) can attach to and detach from a central core -- +much like the combination of GNU Screen and a text-based IRC client +such as WeeChat, but graphical. -This is the core only +This is the core only. %package base -Summary: Modern, cross-platform, distributed IRC client +Summary: Base files for the Quassel IRC client Group: Productivity/Networking/IRC Requires: %{name}_ui = %{version} %description base -Quassel IRC is a modern, cross-platform, distributed IRC client, meaning that -one (or multiple) client(s) can attach to and detach from a central core -- -much like the popular combination of screen and a text-based IRC client such -as WeeChat, but graphical. In addition to this uniqe feature, we aim to bring -a pleasurable, comfortable chatting experience to all major platforms (including -Linux®, Windows®, and MacOS X® as well as Qtopia-based cell phones and PDAs), -making communication with your peers not only convenient, but also ubiquitous -available. +Quassel IRC is a distributed IRC client, meaning that one (or +multiple) client(s) can attach to and detach from a central core -- +much like the combination of GNU Screen and a text-based IRC client +such as WeeChat, but graphical. -This contains common parts shared by %{name} and %{name}-client +This contains common parts shared by %{name} and %{name}-client. %prep %setup -q @@ -197,7 +173,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives touch %{buildroot}%{_sysconfdir}/alternatives/quasselclient ln -sf %{_sysconfdir}/alternatives/quasselclient %{buildroot}%{_bindir}/quasselclient -%fdupes %{buildroot} +%fdupes %{buildroot}/%{_prefix} install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}core install -d -m 755 %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_unitdir} @@ -210,9 +186,9 @@ install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}core install -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %pre core -%{_bindir}/getent group %{name}core >/dev/null || %{_sbindir}/groupadd -r %{name}core || : +%{_bindir}/getent group %{name}core >/dev/null || %{_sbindir}/groupadd -r %{name}core %{_bindir}/getent passwd %{name}core >/dev/null || %{_sbindir}/useradd -r -d %{_localstatedir}/lib/%{name}core \ - -s /bin/false -c "%{name}core daemon" -g %{name}core %{name}core || : + -s /bin/false -c "%{name}core daemon" -g %{name}core %{name}core %service_add_pre quasselcore.service %post core