Hello community, here is the log from the commit of package libinfinity for openSUSE:Factory checked in at 2018-11-26 10:21:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libinfinity (Old) and /work/SRC/openSUSE:Factory/.libinfinity.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libinfinity" Mon Nov 26 10:21:46 2018 rev:35 rq:649252 version:0.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libinfinity/libinfinity.changes 2017-11-24 10:54:55.795278305 +0100 +++ /work/SRC/openSUSE:Factory/.libinfinity.new.19453/libinfinity.changes 2018-11-26 10:23:13.133527300 +0100 @@ -1,0 +2,8 @@ +Thu Nov 15 10:19:55 UTC 2018 - Dominique Leuenberger <[email protected]> + +- Convert sysv init script to systemd service (boo#1116016) +- Pass --with-systemd to configure: enable proper systemd + integration. +- Automatic cleanup using spec-cleaner. + +------------------------------------------------------------------- Old: ---- infinoted.init New: ---- infinoted.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libinfinity.spec ++++++ --- /var/tmp/diff_new_pack.FnYL8g/_old 2018-11-26 10:23:13.933526359 +0100 +++ /var/tmp/diff_new_pack.FnYL8g/_new 2018-11-26 10:23:13.933526359 +0100 @@ -1,7 +1,7 @@ # # spec file for package libinfinity # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -12,25 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define _version 0.7 #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - Name: libinfinity -Summary: Implementation of the Infinote collaborative editing protocol -License: LGPL-2.1+ -Group: Development/Libraries/GNOME Version: 0.7.1 Release: 0 -%define _version 0.7 -Url: http://gobby.0x539.de/ +Summary: Implementation of the Infinote collaborative editing protocol +License: LGPL-2.1-or-later +Group: Development/Libraries/GNOME +URL: http://gobby.0x539.de/ Source0: http://releases.0x539.de/libinfinity/%{name}-%{version}.tar.gz -Source1: infinoted.init +Source1: infinoted.service Source2: infinoted.sysconfig Source3: infinoted.conf # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -39,6 +38,7 @@ BuildRequires: gettext-devel BuildRequires: gtk-doc BuildRequires: pam-devel +BuildRequires: pkgconfig BuildRequires: pkgconfig(avahi-client) BuildRequires: pkgconfig(gio-2.0) >= 2.40 BuildRequires: pkgconfig(glib-2.0) >= 2.38 @@ -49,7 +49,6 @@ BuildRequires: pkgconfig(libdaemon) BuildRequires: pkgconfig(libgsasl) >= 0.2.21 BuildRequires: pkgconfig(libxml-2.0) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description libinfinity is an implementation of the Infinote protocol written in @@ -96,6 +95,7 @@ Infinote protocol. It is typically used with Gobby as a client. %lang_package + %prep %setup -q %patch0 -p1 @@ -105,6 +105,7 @@ CFLAGS="%{optflags} -fno-strict-aliasing" %configure \ --disable-static \ + --with-systemd \ --with-gio make %{?_smp_mflags} @@ -112,10 +113,11 @@ %make_install %find_lang %{name}-%{_version} find %{buildroot} -type f -name "*.la" -delete -print -# Create init.d files -install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/infinoted +# Install systemd service file +install -d -m 0755 %{buildroot}%{_unitdir} +install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/infinoted.service install -d -m 0755 %{buildroot}%{_sbindir} -ln -s %{_sysconfdir}/init.d/infinoted %{buildroot}%{_sbindir}/rcinfinoted +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcinfinoted # Create sysconfig data install -D -m 0644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.infinoted install -d -m 0755 %{buildroot}/srv/infinoted @@ -131,50 +133,48 @@ mv %{buildroot}%{_mandir}/man1/infinoted-%{_version}.1 %{buildroot}%{_mandir}/man1/infinoted.1 %fdupes %{buildroot} -%clean -rm -rf %{buildroot} - %post -n libinfinity-1_0-0 -p /sbin/ldconfig +%postun -n libinfinity-1_0-0 -p /sbin/ldconfig + +%pre -n infinoted +%service_add_pre infinoted.service %post -n infinoted %{fillup_only -n infinoted} +%service_add_post infinoted.service %preun -n infinoted %stop_on_removal infinoted - -%postun -n libinfinity-1_0-0 -p /sbin/ldconfig +%service_del_preun infinoted.service %postun -n infinoted -%restart_on_update infinoted +%service_del_postun infinoted.service %files -n libinfinity-1_0-0 -%defattr (-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS TODO +%license COPYING +%doc AUTHORS ChangeLog NEWS TODO %{_libdir}/libinf*.so.* # Only needed for the test applications, it seems %exclude %{_datadir}/icons/hicolor/*/apps/infinote.* %files devel -%defattr (-, root, root) %{_includedir}/libinf* %{_libdir}/libinf*.so %{_libdir}/pkgconfig/libinf*.pc %{_datadir}/gtk-doc/html/* %files -n infinoted -%defattr (-, root, root) %{_bindir}/infinoted %{_mandir}/man1/infinoted.1%{?ext_man} %{_libdir}/infinoted-%{_version} # default configuration %dir %{_sysconfdir}/xdg/infinoted %config(noreplace) %{_sysconfdir}/xdg/infinoted/infinoted.conf -# init.d files -%{_sysconfdir}/init.d/infinoted %{_sbindir}/rcinfinoted # sysconfig data %{_fillupdir}/sysconfig.infinoted %dir /srv/infinoted +%{_unitdir}/infinoted.service %files lang -f %{name}-%{_version}.lang ++++++ infinoted.service ++++++ [Unit] Description=collaborative text editor service Documentation=man:infinoted(1) After=network.target [Service] EnvironmentFile=-/etc/sysconfig/infinoted ExecStart=/usr/bin/infinoted ${INFINOTED_OPTIONS} [Install] WantedBy=multi-user.target
