wok-4.x rev 12275
tazpanel broken: down to 1.5.3
author | Dominique Corbex <domcox@slitaz.org> |
---|---|
date | Wed May 02 21:19:00 2012 +0200 (2012-05-02) |
parents | d7f899faaffd |
children | 3d5bebc4c48e |
files | tazpanel/receipt tazpanel/stuff/installer.patch |
line diff
1.1 --- a/tazpanel/receipt Wed May 02 10:02:59 2012 +0200 1.2 +++ b/tazpanel/receipt Wed May 02 21:19:00 2012 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="tazpanel" 1.7 -VERSION="1.5.5" 1.8 +VERSION="1.5.3" 1.9 CATEGORY="system-tools" 1.10 SHORT_DESC="SliTaz administration and configuration panel." 1.11 MAINTAINER="pankso@slitaz.org" 1.12 @@ -16,8 +16,12 @@ 1.13 # Rules to configure and make the package. 1.14 compile_rules() 1.15 { 1.16 - cd $src && make && 1.17 + cd $src # && make && 1.18 + # installer.cgi fixes 1.19 + patch -p1 < $stuff/installer.patch || return 1 1.20 + make && 1.21 make DESTDIR=$DESTDIR install 1.22 + 1.23 } 1.24 1.25 # Rules to gen a SliTaz package suitable for Tazpkg.
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/tazpanel/stuff/installer.patch Wed May 02 21:19:00 2012 +0200 2.3 @@ -0,0 +1,38 @@ 2.4 +--- tazpanel-1.5.3/installer.cgi 2.5 ++++ tazpanel-1.5.5/installer.cgi 2.6 +@@ -7,7 +7,7 @@ 2.7 + # Authors : Dominique Corbex <domcox@slitaz.org> 2.8 + # 2.9 + 2.10 +-VERSION=0.29 2.11 ++VERSION=0.30 2.12 + 2.13 + # Common functions from libtazpanel 2.14 + . lib/libtazpanel 2.15 +@@ -52,7 +52,7 @@ 2.16 + # Home Partition 2.17 + if [ -n "$(GET HOME_SELECT)" ] ; then 2.18 + TGT_HOME=$(echo "$(GET TGT_HOME)" | sed 's/\//\\\//'g) 2.19 +- [ -n "$(GET HOME_FS)" ] && TGT_HOME_FS=$(GET HOME_FS) 2.20 ++ [ -n "$(GET HOME_FMT)" ] && TGT_HOME_FS=$(GET HOME_FS) || TGT_HOME_FS="" 2.21 + else 2.22 + TGT_HOME="" 2.23 + TGT_HOME_FS="" 2.24 +@@ -314,7 +314,7 @@ 2.25 + <a class="button" onclick="document.forms['ConfigForm'].url.value = '$(tazinst showurl stable)'; return true;">$(gettext "Stable")</a> 2.26 + <a class="button" onclick="document.forms['ConfigForm'].url.value = '$(tazinst showurl cooking)'; return true;">$(gettext "Cooking")</a> 2.27 + $(gettext "URL:") 2.28 +-<input id="url" type="url" size="55" name="SRC_WEB" value="$get_SRC_WEB" placeholder="$(gettext "Full url to an ISO image file")" /> 2.29 ++<input id="url" type="url" size="55" name="SRC_WEB" $([ "$INST_TYPE" == "web" ] && echo -e "value=\"$SRC_FILE\"") placeholder="$(gettext "Full url to an ISO image file")" /> 2.30 + </label> 2.31 + </div> 2.32 + EOT 2.33 +@@ -542,7 +542,7 @@ 2.34 + local code 2.35 + code=0 2.36 + # Check tazinst 2.37 +- if ! tazinst usage | grep -q Usage: ; then 2.38 ++ if ! [ -x /usr/sbin/tazinst ] ; then 2.39 + cat <<EOT 2.40 + <h3>$(gettext "Tazinst Error")</h3> 2.41 + <p><strong>tazinst</strong>, $(gettext "the lightweight SliTaz HDD installer