Merge branch 'f23' into f22

.gitignore

@@ -7,3 +7,4 @@
 /quassel-0.11.0.tar.bz2
 /quassel-0.12.2.tar.bz2
 /quassel-0.12.3.tar.bz2
+/quassel-0.12.4.tar.bz2

quassel.spec

@@ -3,8 +3,8 @@
 
 Name:    quassel
 Summary: A modern distributed IRC system
-Version: 0.12.3
-Release: 3%{?dist}
+Version: 0.12.4
+Release: 1%{?dist}
 
 License: GPLv2 or GPLv3
 Group:   Applications/Internet
@@ -21,6 +21,7 @@ BuildRequires: qt4-devel
 BuildRequires: qt4-webkit-devel
 
 BuildRequires: systemd
+BuildRequires: firewalld-filesystem
 
 Requires: oxygen-icon-theme
 
@@ -138,8 +139,7 @@ getent passwd %{quassel_user} >/dev/null || \
 exit 0
 
 %post core
-# Install quassel service; also give quassel user ACLs on /var/lib/quassel.
-chown %{quassel_user}:%{quassel_user} %{quassel_data_dir}
+# Install quassel service.
 %systemd_post quasselcore.service
 # Reload firewalld configuration.
 %firewalld_reload
@@ -167,7 +167,7 @@ chown %{quassel_user}:%{quassel_user} %{quassel_data_dir}
 %doc COPYING README
 %doc gpl-2.0.txt gpl-3.0.txt
 %{_kde4_bindir}/quasselcore
-%{quassel_data_dir}
+%dir %attr(-,quassel,quassel) %{quassel_data_dir}
 %{_unitdir}/quasselcore.service
 %config(noreplace) %{_sysconfdir}/quassel.conf
 %{_prefix}/lib/firewalld/services/quassel.xml
@@ -179,6 +179,13 @@ chown %{quassel_user}:%{quassel_user} %{quassel_data_dir}
 
 
 %changelog
+* Mon Apr 25 2016 Ben Rosser <rosser.bjr@gmail.com> 0.12.4-1
+- Update to latest upstream quassel release
+
+* Mon Mar 21 2016 Ben Rosser <rosser.bjr@gmail.com> 0.12.3-4
+- Use attr macro instead of chown to install quassel user homedir, that's much safer
+- BuildRequires firewalld-filesystem, so the post script actually works, whoops
+
 * Wed Mar 16 2016 Ben Rosser <rosser.bjr@gmail.com> 0.12.3-3
 - Modify quassel configuration to listen on all IPv4 and IPv6 interfaces
 - Added firewalld service for tcp/4242 to core

sources

@@ -1,2 +1,3 @@
 f5473a9c5927a0e8cb3a204ced887aa8  quassel-0.12.2.tar.bz2
 a1eec91b56df7d538dfc7cafa8dfabae  quassel-0.12.3.tar.bz2
+56abcde46decc5e341888a05189cece3  quassel-0.12.4.tar.bz2