From fc66db96f634da264e0ab7a5847e542073beacfe Mon Sep 17 00:00:00 2001
From: Xavier Bachelot <xavier@bachelot.org>
Date: Jul 18 2019 15:53:17 +0000
Subject: Re-order some parts of spec for better readability


---

diff --git a/sympa.spec b/sympa.spec
index 14ff586..6194399 100644
--- a/sympa.spec
+++ b/sympa.spec
@@ -1,3 +1,4 @@
+# Unbundling helper macro
 # %1 is the path to dir bundling files (from)
 # %2 is the path to dir containing original files (with)
 %global unbundle_from_with() \
@@ -13,16 +14,7 @@
     fi \
   done
 
-
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%global use_systemd 1
-%else
-%global use_systemd 0
-%endif
-
-%global static_content %{_datadir}/sympa/static_content
-
-# Fonts
+# Bundled Fonts
 #
 # EL7 version (4.1.0) is missing some icons
 %global unbundle_fontawesome       0%{?fedora}%{?el6}
@@ -31,7 +23,7 @@
 # Not available
 %global unbundle_foundation_icons  0
 
-# Javascripts
+# Bundled javascripts
 #
 # Not available
 %global unbundle_foundation        0
@@ -45,7 +37,7 @@
 %global unbundle_jquery_minicolors 0
 # Not available for EL6
 %global unbundle_jquery_ui         0%{?fedora}%{?el7}
-# Only available for F29+
+# Only available for Fedora
 %global unbundle_jqplot            0%{?fedora}
 #
 %global unbundle_respond           0%{?fedora}%{?rhel}
@@ -84,6 +76,15 @@
 %global licenses_bundled %{licenses_bundled} and (MIT or GPLv2)
 %endif
 
+
+%if 0%{?fedora} || 0%{?rhel} >= 7
+%global use_systemd 1
+%else
+%global use_systemd 0
+%endif
+
+%global static_content %{_datadir}/sympa/static_content
+
 #global pre_rel b.2
 
 Name:        sympa
@@ -361,44 +362,6 @@ Provides:      bundled(js-respond) = 1.4.2
 %endif
 
 
-%package httpd
-Summary:  Sympa with Apache HTTP Server
-Summary(fr): Sympa avec Serveur HTTP Apache
-Summary(ja): SympaのApache HTTP Server対応
-Requires: %{name} = %{version}-%{release}
-Requires: httpd
-%if 0%{?fedora} || 0%{?rhel} >= 7
-Requires: spawn-fcgi
-%else
-Requires: mod_fcgid
-%endif
-Conflicts: %{name}-lighttpd, %{name}-nginx
-
-
-%package lighttpd
-Summary:  Sympa with lighttpd
-Summary(fr): Sympa avec lighttpd
-Summary(ja): Sympaのlighttpd対応
-Requires: %{name} = %{version}-%{release}
-Requires: lighttpd
-Requires: lighttpd-fastcgi
-Conflicts: %{name}-httpd, %{name}-nginx
-
-
-%package nginx
-Summary:  Sympa with nginx
-Summary(fr): Sympa avec nginx
-Summary(ja): Sympaのnginx対応
-Requires: %{name} = %{version}-%{release}
-Requires: nginx
-Requires: spawn-fcgi
-Conflicts: %{name}-httpd, %{name}-lighttpd
-
-
-%package devel-doc
-Summary: Sympa devel doc
-Requires: %{name} = %{version}-%{release}
-
 
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %{?perl_default_filter}
@@ -433,6 +396,19 @@ Sympa はスケーラブルで高いカスタマイズ性を持つメーリン�
 た、S/MIME に基づく認証や暗号化もできます。
 
 
+%package httpd
+Summary:  Sympa with Apache HTTP Server
+Summary(fr): Sympa avec Serveur HTTP Apache
+Summary(ja): SympaのApache HTTP Server対応
+Requires: %{name} = %{version}-%{release}
+Requires: httpd
+%if 0%{?fedora} || 0%{?rhel} >= 7
+Requires: spawn-fcgi
+%else
+Requires: mod_fcgid
+%endif
+Conflicts: %{name}-lighttpd, %{name}-nginx
+
 %description httpd
 Apache HTTP Server support for Sympa.
 
@@ -440,6 +416,15 @@ Apache HTTP Server support for Sympa.
 Sympa の Apache HTTP Server 対応。
 
 
+%package lighttpd
+Summary:  Sympa with lighttpd
+Summary(fr): Sympa avec lighttpd
+Summary(ja): Sympaのlighttpd対応
+Requires: %{name} = %{version}-%{release}
+Requires: lighttpd
+Requires: lighttpd-fastcgi
+Conflicts: %{name}-httpd, %{name}-nginx
+
 %description lighttpd
 lighttpd support for Sympa.
 
@@ -447,6 +432,15 @@ lighttpd support for Sympa.
 Sympa の lighttpd 対応。
 
 
+%package nginx
+Summary:  Sympa with nginx
+Summary(fr): Sympa avec nginx
+Summary(ja): Sympaのnginx対応
+Requires: %{name} = %{version}-%{release}
+Requires: nginx
+Requires: spawn-fcgi
+Conflicts: %{name}-httpd, %{name}-lighttpd
+
 %description nginx
 nginx support for Sympa.
 
@@ -454,6 +448,10 @@ nginx support for Sympa.
 Sympa の nginx 対応。
 
 
+%package devel-doc
+Summary: Sympa devel doc
+Requires: %{name} = %{version}-%{release}
+
 %description devel-doc
 Sympa documentation for developers.
 
@@ -666,6 +664,7 @@ done
 # Create directory for S/MIME user certificates
 mkdir -p %{buildroot}%{_localstatedir}/lib/sympa/X509-user-certs
 
+
 %check
 make check
 %if 0%{?do_authorcheck}
@@ -806,6 +805,7 @@ fi
 %systemd_post sympasoap.service
 %endif
 
+
 %post nginx
 # register service
 %if %{use_systemd}
@@ -834,6 +834,7 @@ fi
 %systemd_preun sympasoap.service
 %endif
 
+
 %preun nginx
 %if %{use_systemd}
 %systemd_preun wwsympa.service
@@ -864,6 +865,7 @@ fi
 %systemd_postun_with_restart sympasoap.service
 %endif
 
+
 %postun nginx
 %if %{use_systemd}
 %systemd_postun_with_restart wwsympa.service
@@ -975,6 +977,7 @@ fi
 %{_initrddir}/sympasoap
 %endif
 
+
 %files devel-doc
 %{_mandir}/man3/*