Hello community, here is the log from the commit of package gnustep-base for openSUSE:Factory checked in at 2017-09-09 20:26:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnustep-base (Old) and /work/SRC/openSUSE:Factory/.gnustep-base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnustep-base" Sat Sep 9 20:26:59 2017 rev:4 rq:522369 version:1.25.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnustep-base/gnustep-base.changes 2017-07-30 11:27:49.729595043 +0200 +++ /work/SRC/openSUSE:Factory/.gnustep-base.new/gnustep-base.changes 2017-09-09 20:27:01.625926575 +0200 @@ -1,0 +2,5 @@ +Sun Sep 3 21:19:02 UTC 2017 - [email protected] + +- Remove scripts to start gdnc as daemon or on login. (Fixes boo#1055816) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnustep-base.spec ++++++ --- /var/tmp/diff_new_pack.gEE6Ed/_old 2017-09-09 20:27:02.209844271 +0200 +++ /var/tmp/diff_new_pack.gEE6Ed/_new 2017-09-09 20:27:02.209844271 +0200 @@ -68,9 +68,6 @@ %define gnustep_sh GNUstep.sh %define gs_config %{_sysconfdir}/GNUstep/GNUstep.conf -%define init_dir %{_sysconfdir}/init.d -%define gs_sysinit %{init_dir}/gdomap -%define gs_daemon gdomap %define profile_dir %{_sysconfdir}/profile.d %define gs_userstart GNUstep-start.sh %define gs_makefiles %{_datadir}/GNUstep/Makefiles @@ -156,116 +153,17 @@ %else -# Create startup/shutdown script for gdomap service. -# Note this version of the code is designed to fit in -# with SuSE linux's version of sys V init. - -install -d %{buildroot}%{init_dir} -cat > %{buildroot}%{gs_sysinit} << "EOF" -#!/bin/sh -# -# GNUstep daemons -# -### BEGIN INIT INFO -# Provides: %{gs_daemon} -# Required-Start: $syslog $local_fs $remote_fs -# Should-Start: -# Required-Stop: $syslog $local_fs $remote_fs -# Should-Stop: -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: %{gs_daemon} service -# Description: Start up the %{gs_daemon} service -# used by GNUstep applications. -### END INIT INFO - -. %{_sysconfdir}/rc.status -. %{gs_config} - -case "${1}" in - start) - echo -n "Starting %{gs_daemon}: " - startproc ${GNUSTEP_SYSTEM_TOOLS}/%{gs_daemon} - echo - - # Remember status and be verbose - rc_status -v - ;; - - stop) - echo -n "Stopping %{gs_daemon}: " - killproc ${GNUSTEP_SYSTEM_TOOLS}/%{gs_daemon} - echo - - # Remember status and be verbose - rc_status -v - ;; - - restart|reload) - ${0} stop - ${0} start - - # Remember status and be quiet - rc_status - ;; - - status) - echo -n "Checking for service %{gs_daemon} " - checkproc ${GNUSTEP_SYSTEM_TOOLS}/%{gs_daemon} - rc_status -v - ;; - - *) - echo "Usage: %{gs_sysinit} {start|stop|status|restart|reload}" - exit 1 -esac -rc_exit -EOF -chmod 755 %{buildroot}%{gs_sysinit} -install -d %{buildroot}%{_sbindir} -ln -sf ../../%{gs_sysinit} %{buildroot}%{_sbindir}/rc%{gs_daemon} # Create scripts to source GNUstep environment variables, -# start up user GNUstep services gdnc & gpbs, and update cache -# of services and applications, on user login. +# and update cache of services and applications, on user login. mkdir -p %{buildroot}%{profile_dir} cat > %{buildroot}%{profile_dir}/%{gs_userstart} << "EOF" #!/bin/sh . %{gs_config} -function runtool { -local toolpath=${GNUSTEP_SYSTEM_TOOLS}/${1} - -# Check whether the tool exists -if [ -x ${toolpath} ] -then - # Check whether the tool is already running for this user - if ! ps -U $(id -u) -o cmd --no-headers | grep -q "^${toolpath}\>" - then - ${toolpath} - fi -fi -unset toolpath -} - if [ -d ${HOME}/${GNUSTEP_USER_DIR} ] then - # Start up the GNUstep Distributed Notification Center daemon - runtool gdnc - - # Start up the GNUstep PasteBoard Server daemon, if we're running X - [ ${DISPLAY} ] && runtool gpbs - - # Start up the GNUstep Sound daemon if we have portaudio sound - if portaudiolib=$(/sbin/ldconfig -p | grep '^[[:space:]]*libportaudio.so[[:space:]]') \ - && [ -e $(echo ${portaudiolib} | sed 's/^.*=>[[:space:]]*\([^[:space:]]*\)$/\1/') ] - then - runtool gnustep_sndd - fi - unset portaudiolib - - # Run 'make_services' in background if possible. We run it in a subshell; # otherwise, shells with job control (like bash) output an annoying # message when make_services is done, while we want it to happen silently. @@ -285,69 +183,6 @@ #%check #make check -%post -#if 0%{?suse_version} > 1140 -#set_permissions %{_bindir}/%{gs_daemon} -#endif -if [ "${1}" = "1" ]; then - # Path to GNUstep libraries was added to ld.so.conf in gnustep-make. - # Run ldconfig to add gnustep-base libraries to the library cache. - /sbin/ldconfig - - # Add lines for %{gs_daemon} into /etc/services, if not already there - grep -q '^%{gs_daemon}' %{_sysconfdir}/services \ - || (echo -e "%{gs_daemon}\t\t538/tcp\t\t\t\t# GNUstep distributed objects" >> %{_sysconfdir}/services \ - && echo -e "%{gs_daemon}\t\t538/udp\t\t\t\t# GNUstep distributed objects" >> %{_sysconfdir}/services) - - # Add the %{gs_daemon} service. Note this is not started - # automatically - the user will need to start it using YaST2. -%if %{defined suse_version} - %{fillup_and_insserv -fy %{gs_daemon}} -%else - #Fedora only - /sbin/chkconfig --add %{gs_daemon} - #Apparently we can do all dist with this - just not yet - #%service_add %{gs_daemon} -%endif -fi - -#if 0%{?suse_version} > 1100 -#verifyscript -#verify_permissions -e %{_bindir}/%{gs_daemon} -#endif - -%preun -if [ "${1}" = "0" ]; then - # Stop the gdomap service -%if 0%{?suse_version} - %stop_on_removal %{gs_daemon} -%else - #Fedora only - if [ “$1” = 0 ] ; then service %{gs_daemon} stop >/dev/null 2>&1 - fi - /sbin/chkconfig --del %{gs_daemon} - #For the future - #%service_del_preun %{gs_daemon} -%endif - - # Remove lines for gdomap from /etc/services - mv -f %{_sysconfdir}/services %{_sysconfdir}/services.orig - grep -v "^%{gs_daemon}[[:space:]]*538" %{_sysconfdir}/services.orig > %{_sysconfdir}/services - rm -f %{_sysconfdir}/services.orig -fi - -%postun -/sbin/ldconfig -%if 0%{?suse_version} - %restart_on_update %{gs_daemon} - %insserv_cleanup -%else - if [ “$1” -ge 1 ] ; then - fi - service %{gs_daemon} condrestart >/dev/null 2>&1 - #For the future - #%service_del_postun %{gs_daemon} -%endif %files %defattr(-,root,root) @@ -357,6 +192,7 @@ %{_bindir}/cvtenc %{_bindir}/defaults %{_bindir}/gdnc +%{_bindir}/gdomap %{_bindir}/gspath %{_bindir}/make_strings %{_bindir}/pl2link @@ -382,12 +218,8 @@ %{_mandir}/man1/sfparse.1%{ext_man} %{_mandir}/man1/xmlparse.1%{ext_man} %{_mandir}/man8/gdomap.8%{ext_man} -#verify(not mode) %attr(6755,root,root) %{_bindir}/%{gs_daemon} -%{_bindir}/%{gs_daemon} %if 0%{?suse_version} %config(noreplace) %{profile_dir}/%{gs_userstart} -%config %{gs_sysinit} -%{_sbindir}/rc%{gs_daemon} %endif %files devel
