File project.diff of Package dahdi-tools

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package dahdi-tools (Revision 619c2fecccbbd72fa69768ba7d25e87e)

Currently displaying revision 619c2fecccbbd72fa69768ba7d25e87e , Show latest

--- dahdi-tools.changes.orig
+++ dahdi-tools.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Fri Aug 27 12:49:01 UTC 2021 - Martin Hauke <mardnh@gmx.de>
+
+- Add bcond for packaging of the old SysV init script.
+- Don't install the old init script on Tumbleweed systems.
+
+-------------------------------------------------------------------
 Sun Jan  3 23:10:34 UTC 2021 - Martin Hauke <mardnh@gmx.de>
 
 - Drop the bundled and outdated version of sethdlc and "Require:"
--- dahdi-tools.spec.orig
+++ dahdi-tools.spec
@@ -15,6 +15,12 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%if 0%{?suse_version} < 1550
+%bcond_without init
+%else
+%bcond_with    init
+%endif
+
 Name:           dahdi-tools
 Version:        3.1.0
 Release:        0
@@ -46,7 +52,10 @@ BuildRequires:  pkg-config
 BuildRequires:  wget
 BuildRequires:  pkgconfig(libusb-1.0)
 BuildRequires:  pkgconfig(libxml-2.0)
-Requires(pre):  %insserv_prereq %fillup_prereq
+Requires(pre):  %fillup_prereq
+%if %{with init}
+Requires(pre):  %insserv_prereq
+%endif
 Requires:       perl = %perl_version
 Requires:       udev
 Recommends:     sethdlc
@@ -101,9 +110,11 @@ make install-config DESTDIR="$b"
 rm -f "$b/%_libdir"/*.la
 
 # Install the init script and sysconfig file  
+%if %{with init}
 install -D -m0755 "%{S:5}" "$b/%_initrddir/dahdi"
 ln -sf "%_sysconfdir/init.d/dahdi" "$b/%_sbindir/rcdahdi"
 install -D -m0644 "%{S:6}" "$b/%_fillupdir/sysconfig.dahdi"
+%endif
 touch "$b/%_sysconfdir/dahdi/modules"
 install -D -m0644 "system.conf.sample" "$b/%_sysconfdir/dahdi/system.conf"
 
@@ -134,11 +145,17 @@ rm %buildroot/%_sbindir/sethdlc
 %{stop_on_removal dahdi}
 
 %post 
+%if %{with init}
 %{fillup_and_insserv dahdi}
+%else
+%{fillup_only dahdi}
+%endif
 
 %postun
+%if %{with init}
 %restart_on_update dahdi
 %insserv_cleanup
+%endif
 
 %post   -n libtonezone2_0 -p /sbin/ldconfig
 %postun -n libtonezone2_0 -p /sbin/ldconfig
@@ -156,8 +173,10 @@ rm %buildroot/%_sbindir/sethdlc
 #config %%_sysconfdir/hotplug/usb/xpp_fxloader.usermap
 %dir %_sysconfdir/modprobe.d
 %config %_sysconfdir/modprobe.d/dahdi-blacklist.conf
+%if %{with init}
 %_initddir/dahdi
 %_fillupdir/sysconfig.dahdi
+%endif
 %perl_vendorlib/*
 %_sbindir/*
 %_mandir/man8/*

Places

File project.diff of Package dahdi-tools (Revision 619c2fecccbbd72fa69768ba7d25e87e)

Places