Fixing firewalld definitions and rpm spec

Author: gershnik

config/firewalls/etc/firewalld/services/wsddn-http.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <service>
   <short>WS-Discovery Host Daemon (HTTP Interface)</short>
-  <description>Allows your machine to be discovered by Windows 10 and above systems and displayed by their Explorer "Network" views.</description>
+  <description>Allows your machine to be discovered by Windows 10 and above systems and displayed by their Explorer &quot;Network&quot; views.</description>
   <port port="5357" protocol="tcp"/>
 </service>

config/firewalls/etc/firewalld/services/wsddn.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <service>
   <short>WS-Discovery Host Daemon</short>
-  <description>Allows your machine to be discovered by Windows 10 and above systems and displayed by their Explorer "Network" views.</description>
+  <description>Allows your machine to be discovered by Windows 10 and above systems and displayed by their Explorer &quot;Network&quot; views.</description>
   <port port="3702" protocol="udp"/>
   <destination ipv4="239.255.255.250" ipv6="FF02::C"/>
   <include service="wsddn-http"/>

installers/rpm/wsddn.spec

@@ -19,7 +19,7 @@ Conflicts:      wsdd
 
 %description
 Allows your Linux machine to be discovered by Windows 10 and above systems
-and displayed by their Explorer "Network" views. 
+and displayed by their Explorer "Network" views.
 
 %debug_package
 
@@ -71,8 +71,8 @@ install -m 0644 config/firewalls/etc/firewalld/services/%{name}-http.xml \
 
 %post
 %systemd_post wsddn.service
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
+if [ $1 -eq 1 ] ; then
+    # Initial installation
     firewall-cmd --reload > /dev/null 2>&1 || :
     firewall-cmd --zone=public --add-service=wsddn --permanent > /dev/null 2>&1 || :
     firewall-cmd --reload > /dev/null 2>&1 || :
@@ -83,8 +83,9 @@ fi
 
 %postun
 %systemd_postun_with_restart wsddn.service
-if [ $1 -eq 0 ] ; then 
-    # Package removal, not upgrade 
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    # Older versions opened ports explicitly without service
     firewall-cmd --zone=public --remove-port=5357/tcp --permanent > /dev/null 2>&1 || :
     firewall-cmd --zone=public --remove-port=3702/udp --permanent > /dev/null 2>&1  || :
     firewall-cmd --zone=public --remove-service=wsddn --permanent > /dev/null 2>&1  || :