Hello community, here is the log from the commit of package webyast-base for openSUSE:12.2 checked in at 2012-07-09 13:09:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/webyast-base (Old) and /work/SRC/openSUSE:12.2/.webyast-base.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "webyast-base", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/webyast-base/webyast-base.changes 2012-06-25 15:57:26.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.webyast-base.new/webyast-base.changes 2012-07-09 13:09:27.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Jul 4 09:27:30 UTC 2012 - [email protected] + +- %post - reload DBus config only when the system bus socket is + present to avoid build hangs (bnc#767066) +- 0.3.12 + +------------------------------------------------------------------- +Wed Jul 4 06:34:29 UTC 2012 - [email protected] + +- rcwebyast - prerequire $network service (bnc#764871) +- rcwebyast - print also FQDN URL (if available) +- 0.3.11 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-base.spec ++++++ --- /var/tmp/diff_new_pack.FA7pGB/_old 2012-07-09 13:09:27.000000000 +0200 +++ /var/tmp/diff_new_pack.FA7pGB/_new 2012-07-09 13:09:28.000000000 +0200 @@ -10,7 +10,7 @@ Name: webyast-base -Version: 0.3.10 +Version: 0.3.12 Release: 0 Provides: yast2-webservice = %{version} Obsoletes: yast2-webservice < %{version} @@ -412,19 +412,24 @@ if [ -d /usr/lib64 ]; then sed -i "s/passenger_root \/usr\/lib/passenger_root \/usr\/lib64/" /etc/webyast/nginx.conf fi -# + # try-reload D-Bus config (bnc#635826) -# -dbus-send --print-reply --system --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig >/dev/null ||: +# check if the system bus socket is present to avoid errors/hangs during RPM build (bnc#767066) +if [ -S /var/run/dbus/system_bus_socket ]; then + echo "Reloading DBus configuration..." + dbus-send --print-reply --system --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig >/dev/null ||: +fi # update firewall config -if grep -q webyast-ui /etc/sysconfig/SuSEfirewall2; then +if [ -f /etc/sysconfig/SuSEfirewall2 ]; then + if grep -q webyast-ui /etc/sysconfig/SuSEfirewall2; then echo "Updating firewall config..." sed -i "s/\(^[ \t]*FW_CONFIGURATIONS_.*[ \t]*=[ \t]*\".*[ \t]*\)webyast-ui\(.*$\)/\1webyast\2/" /etc/sysconfig/SuSEfirewall2 # reload the changes echo "Restarting firewall..." /sbin/rcSuSEfirewall2 try-restart + fi fi #--------------------------------------------------------------- ++++++ rcwebyast ++++++ --- /var/tmp/diff_new_pack.FA7pGB/_old 2012-07-09 13:09:28.000000000 +0200 +++ /var/tmp/diff_new_pack.FA7pGB/_new 2012-07-09 13:09:28.000000000 +0200 @@ -33,9 +33,9 @@ # ### BEGIN INIT INFO # Provides: webyast -# Required-Start: $syslog $remote_fs +# Required-Start: $syslog $remote_fs $network # Should-Start: $time ypbind sendmail -# Required-Stop: $syslog $remote_fs +# Required-Stop: $syslog $remote_fs $network # Should-Stop: $time ypbind sendmail # Default-Start: 3 5 # Default-Stop: 0 1 2 6 @@ -193,7 +193,7 @@ #generate deployment specific secret key (bnc#591345) SECRET=`cd /srv/www/webyast/ && rake -s secret` if [ -z $SECRET ]; then - echo -n "Can generate secret for session. Run 'cd /srv/www/webyast/ && rake -s secret' for details." + echo -n "Cannot generate secret for session. Run 'cd /srv/www/webyast/ && rake -s secret' for details." rc_failed rc_status -v rc_exit @@ -216,8 +216,14 @@ IFC=`LC_ALL=C route | grep "^default" | tr -s " " | cut -d " " -f 8` IP=`LC_ALL=C ifconfig $IFC | grep "inet addr" | cut -d ":" -f 2 | cut -d " " -f 1` PORT=`LC_ALL=C grep "listen" $NGINX_CONFIG|cut -d ";" -f 1|tr -s " "|cut -d " " -f 3` + HNAME=`hostname -f` + + if [ -n "$HNAME" ]; then + HNAME=" (https://$HNAME:$PORT/)" + fi + if [ -n "$IP" ]; then - echo -e "\t${done}The WebYaST client service is running at https://$IP:$PORT/${norm}\n"; + echo -e "\t${done}WebYaST is running at https://$IP:$PORT/${HNAME}${norm}\n"; else echo -e "\t${warn}WebYaST could not determine the IP address for $IFC${norm}\n" fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
