Hello community, here is the log from the commit of package hiawatha for openSUSE:Factory checked in at 2019-08-16 15:44:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hiawatha (Old) and /work/SRC/openSUSE:Factory/.hiawatha.new.22127 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hiawatha" Fri Aug 16 15:44:15 2019 rev:26 rq:723506 version:10.9 Changes: -------- --- /work/SRC/openSUSE:Factory/hiawatha/hiawatha.changes 2019-03-26 15:40:43.276293571 +0100 +++ /work/SRC/openSUSE:Factory/.hiawatha.new.22127/hiawatha.changes 2019-08-16 15:44:16.645723260 +0200 @@ -1,0 +2,8 @@ +Wed Jul 24 09:26:57 UTC 2019 - matthias.gerst...@suse.com + +- removal of SuSEfirewall2 service, since SuSEfirewall2 has been replaced by + firewalld, see [1]. + + [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html + +------------------------------------------------------------------- Old: ---- hiawatha-ssl.firewall hiawatha.firewall ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hiawatha.spec ++++++ --- /var/tmp/diff_new_pack.0GceQT/_old 2019-08-16 15:44:18.421722743 +0200 +++ /var/tmp/diff_new_pack.0GceQT/_new 2019-08-16 15:44:18.421722743 +0200 @@ -20,12 +20,6 @@ %define webroot /srv/www %define mbedtls_version %(rpm -q mbedtls-devel --qf "%%{VERSION}") -%if 0%{?suse_version} >= 1500 -%define use_firewalld 1 -%else -%define use_firewalld 0 -%endif - Name: hiawatha Version: 10.9 Release: 0 @@ -36,13 +30,10 @@ Source0: http://www.hiawatha-webserver.org/files/%{name}-%{version}.tar.gz Source1: %{name}.logrotate Source2: %{name}.service -Source100: %{name}.firewall -Source101: %{name}-ssl.firewall -%if %{use_firewalld} Source102: %{name}.firewalld Source103: %{name}-ssl.firewalld -%endif BuildRequires: cmake >= 3.0 +BuildRequires: firewall-macros BuildRequires: gcc-c++ BuildRequires: mbedtls-devel >= 2.3 BuildRequires: pkgconfig @@ -51,9 +42,6 @@ BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(zlib) -%if %{use_firewalld} -BuildRequires: firewall-macros -%endif Requires: logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} @@ -128,19 +116,10 @@ # run as wwwrun user sed "s/#ServerId = www-data/ServerId = wwwrun/" -i %{buildroot}%{_sysconfdir}/hiawatha/hiawatha.conf -# susefirewall config files -install -D -m 0644 %{SOURCE100} \ - %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} -install -D -m 0644 %{SOURCE101} \ - %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl - -# firewalld config files -%if %{use_firewalld} install -D -m 0644 %{SOURCE102} \ %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml install -D -m 0644 %{SOURCE103} \ %{buildroot}%{_libexecdir}/firewalld/services/%{name}-ssl.xml -%endif %pre %service_add_pre %{name}.service @@ -170,14 +149,10 @@ %config(noreplace) %{_sysconfdir}/%{name}/index.xslt %config(noreplace) %{_sysconfdir}/%{name}/error.xslt %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} -%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl -%if %{use_firewalld} %dir %{_libexecdir}/firewalld %dir %{_libexecdir}/firewalld/services %{_libexecdir}/firewalld/services/%{name}.xml %{_libexecdir}/firewalld/services/%{name}-ssl.xml -%endif %{_mandir}/man1/{cgi-wrapper,hiawatha,ssi-cgi,wigwam}.1%{ext_man} %dir %{webroot}/%{name} %dir %{webroot}/%{name}/htdocs
