From 357f27523e28caefcca101913b6bf146cb455362 Mon Sep 17 00:00:00 2001
From: Ben Rosser <rosser.bjr@gmail.com>
Date: Tue, 14 Feb 2017 14:22:20 -0500
Subject: [PATCH] Remove firewalld service file, as firewalld upstream now
 provides it.

---
 quassel.spec | 19 ++++---------------
 quassel.xml  |  6 ------
 2 files changed, 4 insertions(+), 21 deletions(-)
 delete mode 100644 quassel.xml

diff --git a/quassel.spec b/quassel.spec
index a13fb2d..15f4a1d 100755
--- a/quassel.spec
+++ b/quassel.spec
@@ -4,7 +4,7 @@
 Name:    quassel
 Summary: A modern distributed IRC system
 Version: 0.12.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2 or GPLv3
 URL:     http://quassel-irc.org/
@@ -32,7 +32,6 @@ BuildRequires: qt5-qtscript-devel
 BuildRequires: qt5-qtwebkit-devel
 
 BuildRequires: systemd
-BuildRequires: firewalld-filesystem
 
 BuildRequires: libappstream-glib
 
@@ -46,9 +45,6 @@ Requires: %{name}-common = %{version}-%{release}
 Source1: quasselcore.service
 Source2: quassel.conf
 
-# Firewalld service definition.
-Source3: quassel.xml
-
 # Appstream metadata, for GNOME Software.
 Source4: quassel.appdata.xml
 Source5: quasselclient.appdata.xml
@@ -78,9 +74,6 @@ Summary: Quassel core component
 
 # Required for the quassel user.
 Requires(pre): shadow-utils
-# Required for firewalld service.
-Requires: firewalld-filesystem
-Requires(post): firewalld-filesystem
 
 %description core
 The Quassel IRC Core maintains a connection with the 
@@ -119,10 +112,6 @@ install -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/
 install -d -m 0755 %{buildroot}/%{_unitdir}
 install -p -m 0644 %{SOURCE1} %{buildroot}/%{_unitdir}/
 
-# Install firewalld service definition
-install -d -m 0755 %{buildroot}/%{_prefix}/lib/firewalld/services/
-install -p -m 0644 %{SOURCE3} %{buildroot}/%{_prefix}/lib/firewalld/services/
-
 # Home directory for quassel user
 install -d -m 0750 %{buildroot}/%{quassel_data_dir}
 
@@ -156,8 +145,6 @@ exit 0
 %post core
 # Install quassel service.
 %systemd_post quasselcore.service
-# Reload firewalld configuration.
-%firewalld_reload
 
 %preun core
 %systemd_preun quasselcore.service
@@ -184,7 +171,6 @@ exit 0
 %dir %attr(-,quassel,quassel) %{quassel_data_dir}
 %{_unitdir}/quasselcore.service
 %config(noreplace) %{_sysconfdir}/quassel.conf
-%{_prefix}/lib/firewalld/services/quassel.xml
 
 %files client 
 %{_kf5_bindir}/quasselclient
@@ -193,6 +179,9 @@ exit 0
 
 
 %changelog
+* Tue Feb 14 2017 Ben Rosser <rosser.bjr@gmail.com> 0.12.4-3
+- Remove firewalld service file, as firewalld upstream now provides it.
+
 * Fri Sep  9 2016 Ben Rosser <rosser.bjr@gmail.com> 0.12.4-2
 - Include appstream metadata for client and monolithic client.
 
diff --git a/quassel.xml b/quassel.xml
deleted file mode 100644
index a788b39..0000000
--- a/quassel.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<service>
-	<short>quassel</short>
-	<description>Quassel is a distributed IRC client. The core keeps your IRC connections open, and then users can connect their graphical clients to the core over the quassel protocol.</description>
-	<port protocol="tcp" port="4242"/>
-</service>