Hello community,
here is the log from the commit of package xsp for openSUSE:Factory checked in at 2019-03-18 10:43:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xsp (Old)
and /work/SRC/openSUSE:Factory/.xsp.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xsp"
Mon Mar 18 10:43:11 2019 rev:49 rq:685781 version:3.0.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/xsp/xsp.changes 2018-11-18 23:33:42.217372299 +0100
+++ /work/SRC/openSUSE:Factory/.xsp.new.28833/xsp.changes 2019-03-18 10:43:19.299148391 +0100
@@ -1,0 +2,15 @@
+Sun Mar 17 10:03:52 UTC 2019 - Jan Engelhardt
+
+- Replace URL by new one (follow the http(s) redirects)
+- Add systemd-rpm-macros and %systemd_ordering
+ to satisfy %service_*.
+- Use %make_install, and limit fdupes to the btrfs subvolume.
+- Ensure neutrality of descriptions.
+
+-------------------------------------------------------------------
+Fri Feb 15 13:25:29 UTC 2019 - josef.moellers@suse.com
+
+- Add systemd support.
+ [bsc#1116055, xsp-add-systemd-support.patch]
+
+-------------------------------------------------------------------
New:
----
xsp-add-systemd-support.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xsp.spec ++++++
--- /var/tmp/diff_new_pack.hWfqXK/_old 2019-03-18 10:43:20.615146978 +0100
+++ /var/tmp/diff_new_pack.hWfqXK/_new 2019-03-18 10:43:20.615146978 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xsp
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -22,17 +22,18 @@
%endif
Name: xsp
-Url: http://go-mono.com/
Version: 3.0.11
Release: 0
-Summary: Small Web Server Hosting ASP.NET
+Summary: Web Server Hosting ASP.NET
License: MIT
Group: Productivity/Networking/Web/Servers
+URL: https://www.mono-project.com/
Source: https://github.com/mono/xsp/archive/%{version}.tar.gz
Source1: xsp.conf
Patch1: %{name}-3.0.11-fix-bashisms.patch
Patch2: mono-440-build-fix.patch
Patch3: mono-4-install.patch
+Patch4: xsp-add-systemd-support.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
BuildRequires: autoconf
@@ -46,6 +47,7 @@
BuildRequires: monodoc-core
BuildRequires: pkgconfig
BuildRequires: sqlite-devel
+BuildRequires: systemd-rpm-macros
%if 0%{?suse_version} >= 1330
BuildRequires: strip-nondeterminism
Requires(pre): user(wwwrun)
@@ -53,14 +55,14 @@
Requires(post): user(wwwrun)
Requires(post): group(www)
%endif
-Requires(post): %insserv_prereq %fillup_prereq
+%{?systemd_ordering}
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
%define xspConfigsLocation %{_sysconfdir}/xsp/2.0
%define xspAvailableApps %{xspConfigsLocation}/applications-available
%define xspEnabledApps %{xspConfigsLocation}/applications-enabled
%description
-The XSP server is a small Web server that hosts the Mono System.Web
+The XSP server is a Web server that hosts the Mono System.Web
classes for running what is commonly known as ASP.NET.
%define mcsver %({ mcs --version | awk '{print $5}' | cut -f1 -d"." ; mcs --version | awk '{print $5}' | cut -f2 -d"." ; } | xargs printf "%03d")
@@ -82,6 +84,7 @@
%if 0%{?mcsver} >= 4000
%patch3 -p1
%endif
+%patch4 -p1
%build
NOCONFIGURE=1 ./autogen.sh
@@ -96,38 +99,46 @@
%install
[ -x /usr/bin/strip-nondeterminism ] && strip-nondeterminism docs/Mono.FastCGI/Mono.FastCGI.zip docs/Mono.WebServer/Mono.WebServer.zip
-make install DESTDIR=%{buildroot}
+%make_install
rm -rf %{buildroot}%{_prefix}/lib/xsp/unittests
mkdir -p %{buildroot}%{_datadir}
mv %{buildroot}%{_prefix}/lib/pkgconfig %{buildroot}%{_datadir}
mkdir -p %{buildroot}/%{_fwdefdir}
mkdir -p %{buildroot}/%{xspAvailableApps}
mkdir -p %{buildroot}/%{xspEnabledApps}
-mkdir -p %{buildroot}/etc/init.d/
mkdir -p %{buildroot}/etc/logrotate.d/
mkdir -p %{buildroot}/srv/xsp2
mkdir -p %{buildroot}%{_fillupdir}
mkdir -p %{buildroot}/run/xsp2
mkdir -p %{buildroot}/usr/lib/tmpfiles.d/
+mkdir -p %{buildroot}%{_sbindir}
install -m 644 man/mono-asp-apps.1 %{buildroot}%{_mandir}/man1/mono-asp-apps.1
install -m 644 packaging/opensuse/sysconfig.xsp2 %{buildroot}%{_fillupdir}
install -m 644 packaging/opensuse/xsp2.fw %{buildroot}/%{_fwdefdir}/xsp2
install -m 644 packaging/opensuse/xsp2.logrotate %{buildroot}/etc/logrotate.d/xsp2
-install -m 755 packaging/opensuse/xsp2.init %{buildroot}/etc/init.d/xsp2
+# new {
+mkdir -p %{buildroot}%{_datadir}/%{name}/scripts
+install -m 755 packaging/opensuse/xsp2.init %{buildroot}%{_datadir}/%{name}/scripts
+mkdir -p %{buildroot}%{_unitdir}
+install -m 644 packaging/opensuse/xsp2.service %{buildroot}%{_unitdir}/xsp2.service
+# } end new
install -m 755 tools/mono-asp-apps/mono-asp-apps %{buildroot}%{_bindir}/mono-asp-apps
-install -m 755 %{SOURCE1} %{buildroot}/usr/lib/tmpfiles.d/
-%fdupes %{buildroot}
+install -m 644 %{SOURCE1} %{buildroot}/usr/lib/tmpfiles.d/
+ln -s service %{buildroot}%{_sbindir}/rcxsp2
+%fdupes %{buildroot}/%{_prefix}
+
+%pre
+%service_add_pre xsp2.service
%post
-%{fillup_and_insserv -n xsp2 xsp2}
install -d -m 0711 --owner=wwwrun --group=www /run/xsp2
+%service_add_post xsp2.service
%preun
-%stop_on_removal xsp2
+%service_del_preun xsp2.service
%postun
-%restart_on_update xsp2
-%{insserv_cleanup}
+%service_del_postun xsp2.service
%files
%defattr(-,root,root)
@@ -155,16 +166,19 @@
%{_prefix}/lib/monodoc/sources/Mono.FastCGI.*
%{_prefix}/lib/xsp
%{_prefix}/share/man/*/*
+# new {
+%{_datadir}/%{name}
+# %%{_datadir}/%%{name}/scripts
+# %%{_datadir}/%%{name}/scripts/xsp2.init
+%{_unitdir}/xsp2.service
+# } end new
%config %{_fwdefdir}/xsp2
-%config /etc/init.d/xsp2
%config /etc/logrotate.d/xsp2
%{_fillupdir}/*
%attr(0711,wwwrun,www) /srv/xsp2
%ghost %attr(0711,wwwrun,www) /run/xsp2
/usr/lib/tmpfiles.d/
%{_sysconfdir}/%{name}
-
-%define __find_provides env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-provides && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-provides ; } | sort -u'
-%define __find_requires env sh -c 'filelist=($(cat)) && { printf "%s\\n" "${filelist[@]}" | /usr/lib/rpm/find-requires && printf "%s\\n" "${filelist[@]}" | /usr/bin/mono-find-requires ; } | sort -u'
+%{_sbindir}/rcxsp2
%changelog
++++++ xsp-add-systemd-support.patch ++++++
Index: xsp-3.0.11/packaging/opensuse/xsp2.service
===================================================================
--- /dev/null
+++ xsp-3.0.11/packaging/opensuse/xsp2.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Small Web Server Hosting ASP.NET
+# Required-Start: $syslog $remote_fs $local_fs $network
+Requires=syslog.socket
+Requires=remote-fs.target
+Requires=local-fs.target
+Requires=network.target
+# Should-Start: $time ypbind smtp
+Wants=time-sync.target
+Wants=ypbind.service
+# Wants=<something providing mail service>
+
+[Service]
+# Assumption due to the fact that a PIDfile is used
+Type=forking
+EnvironmentFile=/etc/sysconfig/xsp2
+PIDFile=/var/run/xsp2/xsp2.pid
+ExecStart=/usr/share/xsp/scripts/xsp2.init start
+ExecStop=/usr/share/xsp/scripts/xsp2.init stop
+
+[Install]
+WantedBy=multi-user.target