diff --git a/SRPMS/sun-java7/sun-java7.spec.in b/SRPMS/sun-java7/sun-java7.spec.in index 6917525..e1073e2 100644 --- a/SRPMS/sun-java7/sun-java7.spec.in +++ b/SRPMS/sun-java7/sun-java7.spec.in @@ -31,6 +31,7 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://www.oracle.com/technetwork/java/javase/overview/index.html +Source: LICENSE #Source0: http://download.oracle.com/otn-pub/java/jdk/7u6-b24/jdk-%{version}-linux-i586.tar.gz #Source1: http://download.oracle.com/otn-pub/java/jdk/7u6-b24/jdk-%{version}-linux-x64.tar.gz #Source2: http://download.oracle.com/otn-pub/java/jdk/7u6-b24/jdk-%{version}-linux-arm-sfp.tar.gz diff --git a/menu/icons/hicolor/32x32/apps/distromenu-java.png b/menu/icons/hicolor/32x32/apps/distromenu-java.png new file mode 100644 index 0000000..ff7ea27 Binary files /dev/null and b/menu/icons/hicolor/32x32/apps/distromenu-java.png differ diff --git a/menu/icons/hicolor/48x48/apps/distromenu-java.png b/menu/icons/hicolor/48x48/apps/distromenu-java.png new file mode 100644 index 0000000..2db71b5 Binary files /dev/null and b/menu/icons/hicolor/48x48/apps/distromenu-java.png differ diff --git a/menu/icons/hicolor/64x64/apps/distromenu-java.png b/menu/icons/hicolor/64x64/apps/distromenu-java.png new file mode 100644 index 0000000..f0faa97 Binary files /dev/null and b/menu/icons/hicolor/64x64/apps/distromenu-java.png differ diff --git a/openmamba-update/openmamba-netsrpms b/openmamba-update/openmamba-netsrpms index 71c04b5..650c513 100755 --- a/openmamba-update/openmamba-netsrpms +++ b/openmamba-update/openmamba-netsrpms @@ -2,7 +2,7 @@ # # netsrpm-install.sh - Build srpms that download sources from network # -# Copyright (C) 2003-2011 by Silvan Calarco +# Copyright (C) 2003-2012 by Silvan Calarco # Copyright (C) 2005 by Massimo Pintore # Copyright (C) 2005-2007 by Davide Madrisan @@ -32,9 +32,9 @@ fi function check_if_already_installed() { rpm -q $1 &>/dev/null if [ $? -eq 0 ]; then - notify-send -i $icon "$pckname" "$pckname: "$"already installed." + notify-send -a $"Network software installation" -i $icon "$pckname" "$pckname: "$"already installed." else - notify-send -i $icon "$pckname" $"There was an error installing"" $pckname!" + notify-send -a $"Network software installation" -i $icon "$pckname" $"There was an error installing"" $pckname!" fi } @@ -105,7 +105,7 @@ for pckname in $PACKAGES; do [ $? -ne 0 ] && exit 1 fi - notify-send -i $icon "$pckname" $"$pckname installation in progress..." + notify-send -a $"Network software installation" -i $icon "$pckname" $"$pckname installation in progress..." # build rpm echo "$me: "$"rebuilding package \`$SRPM_PATH'..." @@ -118,7 +118,7 @@ for pckname in $PACKAGES; do RPM_PATH=`find $tmpdir -name \*.rpm` # install rpm - sudo rpm -hUv --force $RPM_PATH + sudo smart install -y $RPM_PATH if [ $? -gt 0 ]; then echo "$me: "$"error installing \`$SRPM_PATH'."" "$"Aborting..." >&2 check_if_already_installed $pckname @@ -127,9 +127,9 @@ for pckname in $PACKAGES; do rpm -q $pckname 2>/dev/null if [ $? -eq 0 ]; then - notify-send -i $icon "$pckname" $"Installation of $pckname successfully completed." + notify-send -a $"Network software installation" -i $icon "$pckname" $"Installation of $pckname successfully completed." else - notify-send -i $icon "$pckname" $"There was an error installing $pckname!" + notify-send -a $"Network software installation" -i $icon "$pckname" $"There was an error installing $pckname!" fi rm -rf $tmpdir $tmpfile