Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -12,3 +12,4 @@
 /quassel-0.12.5.tar.bz2
 /quassel-0.13.0.tar.bz2
 /quassel-0.13.1.tar.bz2
+/quassel-0.14.0.tar.bz2

quassel.spec

@@ -1,20 +1,13 @@
-%global quassel_user        quassel
 %global quassel_data_dir    %{_var}/lib/quassel
 
 Name:    quassel
 Summary: A modern distributed IRC system
-Version: 0.13.1
-Release: 8%{?dist}
+Version: 0.14.0
+Release: 3%{?dist}
 
 License: GPLv2 or GPLv3
-URL:     http://quassel-irc.org/
-Source0: http://quassel-irc.org/pub/quassel-%{version}.tar.bz2
-
-# patch from freebsd ports treee
-#https://github.com/freebsd/freebsd-ports/blob/b6c49e02ef34b163293e453c7245093cb7668a40/irc/quassel/files/patch-src_common_types.h
-Patch0: https://raw.githubusercontent.com/freebsd/freebsd-ports/b6c49e02ef34b163293e453c7245093cb7668a40/irc/quassel/files/patch-src_common_types.h
-Patch1: %{name}-gcc11.patch
-Patch2: quassel_0.13.1_CVE-2021-34825.patch
+URL:     https://quassel-irc.org/
+Source0: https://quassel-irc.org/pub/quassel-%{version}.tar.bz2
 
 BuildRequires: cmake
 BuildRequires: dbusmenu-qt5-devel
@@ -39,8 +32,10 @@ BuildRequires: qt5-qtscript-devel
 BuildRequires: qt5-qtwebkit-devel
 BuildRequires: qt5-qtmultimedia-devel
 BuildRequires: openldap-devel
+BuildRequires: boost-devel
 
 BuildRequires: systemd
+BuildRequires: systemd-rpm-macros
 
 BuildRequires: libappstream-glib
 
@@ -53,10 +48,7 @@ Requires: %{name}-common = %{version}-%{release}
 # Systemd service file and configuration script.
 Source1: quasselcore.service
 Source2: quassel.conf
-
-# Appstream metadata, for GNOME Software.
-Source4: quassel.appdata.xml
-Source5: quasselclient.appdata.xml
+Source3: quassel.sysusers
 
 %description
 Quassel IRC is a modern, distributed IRC client,
@@ -79,9 +71,6 @@ BuildArch: noarch
 %package core
 Summary: Quassel core component
 
-# Required for the quassel user.
-Requires(pre): shadow-utils
-
 # Weak dependency on qt5 postgresql bindings.
 # We use a weak dependency here so they can be uninstalled if necessary.
 Recommends: qt5-qtbase-postgresql
@@ -103,7 +92,7 @@ Quassel client
 
 %build
 %cmake_kf5 \
-  -DWANT_MONO=1 -DUSE_QT5=1 -DWITH_KDE=1 -DHAVE_SSL=1
+  -DWANT_MONO=1 -DUSE_QT5=1 -DWITH_KDE=1 -DHAVE_SSL=1 -DENABLE_SHARED=OFF
 
 %cmake_build
 
@@ -114,29 +103,27 @@ Quassel client
 rm -f %{buildroot}/%{_datadir}/pixmaps/quassel.png
 
 # Install quassel.conf for systemd file
-mkdir -p %{buildroot}/%{_sysconfdir}
-install -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/
+install -Dp -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name}.conf
 
 # Install systemd service file
-install -d -m 0755 %{buildroot}/%{_unitdir}
-install -p -m 0644 %{SOURCE1} %{buildroot}/%{_unitdir}/
+install -Dp -m 0644 %{SOURCE1} %{buildroot}/%{_unitdir}/quasselcore.service
+
+# Install the systemd-sysusers config
+install -Dp -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/%{name}.conf
 
 # Home directory for quassel user
 install -d -m 0750 %{buildroot}/%{quassel_data_dir}
 
-# Install the appdata files.
-mkdir %{buildroot}%{_datadir}/appdata/
-cp -a %{SOURCE4} %{SOURCE5} %{buildroot}%{_datadir}/appdata/
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml
+# Install AppStream metadata
+install -d -m 0755 %{buildroot}%{_datadir}/metainfo
+install -p -m 0644 data/*.appdata.xml %{buildroot}%{_datadir}/metainfo/
+
+%check
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
 
 # Core pre/post macros.
-
 %pre core
-getent group %{quassel_user} >/dev/null || groupadd -r %{quassel_user}
-getent passwd %{quassel_user} >/dev/null || \
-    useradd -r -g %{quassel_user} -d %{quassel_data_dir} -s /sbin/nologin \
-    -c "Account to own and run the quasselcore daemon from." %{quassel_user}
-exit 0
+%sysusers_create_compat %{SOURCE3}
 
 %post core
 # Install quassel service.
@@ -151,7 +138,7 @@ exit 0
 %files
 %{_kf5_bindir}/quassel
 %{_kf5_datadir}/applications/quassel.desktop
-%{_datadir}/appdata/quassel.appdata.xml
+%{_datadir}/metainfo/quassel.appdata.xml
 
 %files common
 %doc README.md
@@ -167,14 +154,34 @@ exit 0
 %dir %attr(-,quassel,quassel) %{quassel_data_dir}
 %{_unitdir}/quasselcore.service
 %config(noreplace) %{_sysconfdir}/quassel.conf
+%{_sysusersdir}/%{name}.conf
 
 %files client
 %{_kf5_bindir}/quasselclient
 %{_kf5_datadir}/applications/quasselclient.desktop
-%{_datadir}/appdata/quasselclient.appdata.xml
+%{_datadir}/metainfo/quasselclient.appdata.xml
 
 
 %changelog
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Feb 25 2022 Chris Egeland <phuzion@fedoraproject.org> - 0.14.0-1
+- New upstream release (rhbz#1917071)
+
+* Thu Feb 10 2022 Timothée Ravier <tim@siosm.fr> - 0.13.1-11
+- Use systemd sysusers config to create user and group
+- Use upstream AppStream metadata
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Thu Jun 17 2021 Chris Egeland <chris@chrisegeland.com> - 0.13.1-8
 - Added security fix for CVE-2021-34825
 

quassel.sysusers

@@ -0,0 +1 @@
+u quassel - "quasselcore daemon" /var/lib/quassel

sources

@@ -1 +1 @@
-SHA512 (quassel-0.13.1.tar.bz2) = 4ed55e81b1638c8851ddae5d9c9d23a1c2cea92f307e19f426873c2600d8e183898d3ed7c290f2ea5d1b8c5e1be7f9ffcc3e8c3c0193d080fc879b10cc3a962c
+SHA512 (quassel-0.14.0.tar.bz2) = ea6b9723acab5ce73f760692770c1340c03bf277d2c99a2520345bfb6a7bb6fdc64a01dccfd7026341b46ee727821e1bcc2f487be72dfbc155f1de1ad264763f