fix syntax of macros.lang (user : instead of , as separator) [release 2.1-3mamba;Fri Aug 24 2018]

initscripts.spec

@@ -2,7 +2,7 @@
 
 Name:          initscripts
 Version:       2.1
-Release:       1mamba
+Release:       3mamba
 Summary:       Common tools used by initscripts-sysv5 and systemd in sysv5 mode
 Group:         System/Configuration
 Vendor:        openmamba
@@ -106,6 +106,15 @@ LC_COLLATE=C
 _EOF
    }
 
+   [ -e %{_sysconfdir}/rpm/macros.lang ] && sed -i "s|,|:|g" %{_sysconfdir}/rpm/macros.lang
+
+   # create /etc/rpm/macros.lang to install only translations in current LANG plus en
+   [ "$LANG" -a ! -e %{_sysconfdir}/rpm/macros.lang ] && {
+       cat >> %{_sysconfdir}/rpm/macros.lang << _EOF
+`echo -n %`_install_langs en:${LANG/_*}:${LANG/.*}
+_EOF
+   }
+
    [ -e /etc/vconsole.conf ] || {
       . /etc/sysconfig/keyboard
       . /etc/sysconfig/console
@@ -125,11 +134,9 @@ UNICODE=1
 _EOF
    }
 
-   # compatibility fixes with some routers
+   # /etc/sysctl.conf is no longer used since systemd
-   grep tcp_window_scaling /etc/sysctl.conf >/dev/null || cat >> /etc/sysctl.conf << _EOF
+   [ -e %{_sysconfdir}/sysctl.conf ] && \
-net.ipv4.tcp_ecn = 0
+       mv %{_sysconfdir}/sysctl.conf %{_sysconfdir}/sysctl.d/10-user.conf
-net.ipv4.tcp_window_scaling = 0
-_EOF
 
    # systemd wants /etc/localtime as a symlink to /usr/share/timezone/..
    if [ -e %{_sysconfdir}/timezone -a ! -L %{_sysconfdir}/localtime ]; then
@@ -270,6 +277,13 @@ exit 0
 %{_var}/init/
 
 %changelog
+* Fri Aug 24 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1-3mamba
+- fix syntax of macros.lang (user : instead of , as separator)
+
+* Thu Aug 23 2018 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1-2mamba
+- install rpm macros.lang files with current language and en in %_install_langs
+- mv /etc/sysctl.conf to /etc/sysctl.d/10-user.conf as of systemd
+
 * Wed Dec 20 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 2.1-1mamba
 - update to 2.1