diff --git a/quassel.spec b/quassel.spec index 8eb219c..1444792 100755 --- a/quassel.spec +++ b/quassel.spec @@ -4,7 +4,7 @@ Name: quassel Summary: A modern distributed IRC system Version: 0.12.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 or GPLv3 URL: http://quassel-irc.org/ @@ -33,7 +33,6 @@ BuildRequires: qt5-qtscript-devel BuildRequires: qt5-qtwebkit-devel BuildRequires: systemd -BuildRequires: firewalld-filesystem BuildRequires: libappstream-glib @@ -47,9 +46,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 @@ -79,9 +75,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 @@ -120,10 +113,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} @@ -157,8 +146,6 @@ exit 0 %post core # Install quassel service. %systemd_post quasselcore.service -# Reload firewalld configuration. -%firewalld_reload %preun core %systemd_preun quasselcore.service @@ -185,7 +172,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 @@ -194,6 +180,9 @@ exit 0 %changelog +* Tue Feb 14 2017 Ben Rosser - 0.12.4-4 +- Remove quassel firewalld service file now that firewalld ships it. + * Sat Feb 11 2017 Fedora Release Engineering - 0.12.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/quassel.xml b/quassel.xml deleted file mode 100644 index a788b39..0000000 --- a/quassel.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - quassel - 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. - -