Compare commits

...

4 Commits

Author SHA1 Message Date
2b8f1d5c98 Release 4.0.90 2017-12-24 12:53:56 +01:00
28616db2c5 Replace smart usages with pkcon 2017-12-24 12:53:41 +01:00
8a428a76b6 Release 4.0.2 2017-10-18 15:52:58 +02:00
ab89e6ee0d sun-java8.spec.in: specfile fix for upstream release 8u152 2017-10-18 15:44:17 +02:00
5 changed files with 34 additions and 34 deletions

View File

@@ -169,10 +169,10 @@ ln -s %{_jvmdir}/%{jredir}/lib/amd64/libnpjp2.so \
install -d -m 755 %{buildroot}%{_jvmprivdir}/%{name}/jce/vanilla
for file in local_policy.jar US_export_policy.jar; do
mv %{buildroot}%{_jvmdir}/%{jredir}/lib/security/$file \
mv %{buildroot}%{_jvmdir}/%{jredir}/lib/security/policy/unlimited/$file \
%{buildroot}%{_jvmprivdir}/%{name}/jce/vanilla
# for ghosts
touch %{buildroot}%{_jvmdir}/%{jredir}/lib/security/$file
touch %{buildroot}%{_jvmdir}/%{jredir}/lib/security/policy/unlimited/$file
done
pushd %{buildroot}%{_jvmdir}
@@ -412,11 +412,11 @@ fi
%{_datadir}/fonts/ttf/j2se-%{origin} 56
%{_sbindir}/update-alternatives \
--install %{_jvmdir}/%{jrelnk}/lib/security/local_policy.jar \
--install %{_jvmdir}/%{jrelnk}/lib/security/policy/unlimited/local_policy.jar \
jce_%{javaver}_%{origin}_local_policy %{_jvmprivdir}/%{name}/jce/vanilla/local_policy.jar 56
%{_sbindir}/update-alternatives \
--install %{_jvmdir}/%{jrelnk}/lib/security/US_export_policy.jar \
--install %{_jvmdir}/%{jrelnk}/lib/security/policy/unlimited/US_export_policy.jar \
jce_%{javaver}_%{origin}_us_export_policy %{_jvmprivdir}/%{name}/jce/vanilla/US_export_policy.jar 56
:
@@ -549,8 +549,8 @@ fi
%{_jvmdir}/%{jredir}/lib/tzdb.dat
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklist
%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/trusted.libraries
%ghost %{_jvmdir}/%{jredir}/lib/security/local_policy.jar
%ghost %{_jvmdir}/%{jredir}/lib/security/US_export_policy.jar
%ghost %{_jvmdir}/%{jredir}/lib/security/policy/*limited/local_policy.jar
%ghost %{_jvmdir}/%{jredir}/lib/security/policy/*limited/US_export_policy.jar
%dir %{_jvmdir}/%{jredir}/lib/jfr
%{_jvmdir}/%{jredir}/lib/jfr/*
%{_jvmdir}/%{jredir}/lib/currency.data

View File

@@ -1 +1 @@
VERSION = 4.0.1
VERSION = 4.0.90

View File

@@ -1,5 +1,5 @@
# openmamba post installation script
# Copyright (c) 2007-2015 by Silvan Calarco <silvan.calarco@mambasoft.it>
# Copyright (c) 2007-2017 by Silvan Calarco <silvan.calarco@mambasoft.it>
#
# Released under the terms of the GNU GPLv3 License
@@ -42,8 +42,8 @@ function apt_parser() {
exit 0
}
function apt_get_parsed() {
sudo smart $@ | apt_parser
function pkg_tool() {
pkcon $@ | apt_parser
}
DCOPID=$2
@@ -95,13 +95,13 @@ TOTAL_PROGRESS=10
if [ "$INSTALL_BASE" = "1" ]; then
echo $"Installing openmamba base packages"
dcop_write $"Updating packages list..." 10
apt_get_parsed update
pkg_tool update
dcop_write $"Removing packages that are no longer needed..." 10
rpm -q msysklogd >/dev/null && apt_get_parsed remove -y msysklogd
rpm -q msysklogd >/dev/null && pkg_tool remove -y msysklogd
dcop_write $"Installing/updating openmamba base packages..." 15
rpm -q --whatprovides $BASE_PKGS >/dev/null || apt_get_parsed install -y $BASE_PKGS
rpm -q --whatprovides $BASE_PKGS >/dev/null || pkg_tool install -y $BASE_PKGS
# first time: remove mambabase from autostart
[ -e /home/$USER/.kde4/Autostart/mambabase.desktop ] && \
@@ -116,86 +116,86 @@ fi
if [ "$INSTALL_UPDATE" = "1" ]; then
echo $"Updating installed packages"
dcop_write $"Updating installed packages..." 15
apt_get_parsed upgrade -y
pkg_tool update -y
fi
if [ "$INSTALL_OFFICE" = "1" ]; then
echo $"Installing Office packages"
dcop_write $"Installing/updating Office packages..." 15
rpm -q --whatprovides $OFFICE_PKGS >/dev/null || apt_get_parsed install -y $OFFICE_PKGS
rpm -q --whatprovides $OFFICE_PKGS >/dev/null || pkg_tool install -y $OFFICE_PKGS
fi
if [ "$INSTALL_PLAYERS" = "1" ]; then
echo $"Installing Audio and Video players"
dcop_write $"Installing/updating Audio and Video players..." 15
rpm -q --whatprovides $MULTIMEDIA_PLAYERS_PKGS >/dev/null || apt_get_parsed install -y $MULTIMEDIA_PLAYERS_PKGS
rpm -q --whatprovides $MULTIMEDIA_PLAYERS_PKGS >/dev/null || pkg_tool install -y $MULTIMEDIA_PLAYERS_PKGS
fi
if [ "$INSTALL_MULTIMEDIA_EDITING" = "1" ]; then
echo $"Installing multimedia editing and production packages"
dcop_write $"Installing/updating multimedia editing and production packages..." 15
rpm -q --whatprovides $MULTIMEDIA_EDITING_PKGS >/dev/null || apt_get_parsed install -y $MULTIMEDIA_EDITING_PKGS
rpm -q --whatprovides $MULTIMEDIA_EDITING_PKGS >/dev/null || pkg_tool install -y $MULTIMEDIA_EDITING_PKGS
fi
if [ "$INSTALL_INTERNET" = "1" ]; then
echo $"Installing Internet packages"
dcop_write $"Installing/updating Internet packages..." 15
rpm -q --whatprovides $INTERNET_PKGS >/dev/null || apt_get_parsed install -y $INTERNET_PKGS
rpm -q --whatprovides $INTERNET_PKGS >/dev/null || pkg_tool install -y $INTERNET_PKGS
fi
if [ "$INSTALL_GRAPHICS" = "1" ]; then
echo $"Installing Graphics packages"
dcop_write $"Installing/updating Graphics packages..." 15
rpm -q --whatprovides $GRAPHICS_PKGS >/dev/null || apt_get_parsed install -y $GRAPHICS_PKGS
rpm -q --whatprovides $GRAPHICS_PKGS >/dev/null || pkg_tool install -y $GRAPHICS_PKGS
fi
if [ "$INSTALL_GAMES" = "1" ]; then
echo $"Installing Games packages"
dcop_write $"Installing/updating Games packages..." 15
rpm -q --whatprovides $GAMES_PKGS >/dev/null || apt_get_parsed install -y $GAMES_PKGS
rpm -q --whatprovides $GAMES_PKGS >/dev/null || pkg_tool install -y $GAMES_PKGS
fi
if [ "$INSTALL_VIRTUALIZATION" = "1" ]; then
echo $"Installing Virtualization packages"
dcop_write $"Installing/updating Virtualization packages..." 15
rpm -q --whatprovides $VIRTUALIZATION_PKGS >/dev/null || apt_get_parsed install -y $VIRTUALIZATION_PKGS
rpm -q --whatprovides $VIRTUALIZATION_PKGS >/dev/null || pkg_tool install -y $VIRTUALIZATION_PKGS
fi
if [ "$INSTALL_SERVER" = "1" ]; then
echo $"Installing Server packages"
dcop_write $"Installing/updating Server packages..." 15
rpm -q --whatprovides $SERVER_PKGS >/dev/null || apt_get_parsed install -y $SERVER_PKGS
rpm -q --whatprovides $SERVER_PKGS >/dev/null || pkg_tool install -y $SERVER_PKGS
fi
if [ "$INSTALL_DEVEL" = "1" ]; then
echo $"Installing openmamba packages"
dcop_write $"Installing/updating Development packages..." 15
rpm -q --whatprovides $DEVEL_PKGS >/dev/null || apt_get_parsed install -y $DEVEL_PKGS
rpm -q --whatprovides $DEVEL_PKGS >/dev/null || pkg_tool install -y $DEVEL_PKGS
fi
if [ "$INSTALL_NVIDIA" = "1" ]; then
echo $"Installing NVIDIA proprietary video driver (autodetected) packages"
dcop_write $"Installing/updating NVIDIA proprietary video driver (autodetected) packages..." 10
NVIDIA_DETECTED=$(/sbin/nvidia-autoselect-driver | sed "s|.* ||")
rpm -q --whatprovides $NVIDIA_DETECTED >/dev/null || apt_get_parsed install -y $NVIDIA_DETECTED
rpm -q --whatprovides $NVIDIA_DETECTED >/dev/null || pkg_tool install -y $NVIDIA_DETECTED
fi
if [ "$INSTALL_FGLRX" = "1" ]; then
echo $"Installing AMD/ATI proprietary video driver packages"
dcop_write $"Installing/updating AMD/ATI proprietary video driver packages..." 10
rpm -q --whatprovides xorg-drv-video-fglrx >/dev/null || apt_get_parsed install -y xorg-drv-video-fglrx
rpm -q --whatprovides xorg-drv-video-fglrx >/dev/null || pkg_tool install -y xorg-drv-video-fglrx
fi
if [ "$INSTALL_FGLRX_LEGACY" = "1" ]; then
echo $"Installing AMD/ATI proprietary (legacy) video driver packages"
dcop_write $"Installing/updating AMD/ATI proprietary (legacy) video driver packages..." 10
rpm -q --whatprovides xorg-drv-video-fglrx-legacy >/dev/null || apt_get_parsed install -y xorg-drv-video-fglrx-legacy
rpm -q --whatprovides xorg-drv-video-fglrx-legacy >/dev/null || pkg_tool install -y xorg-drv-video-fglrx-legacy
fi
if [ "$INSTALL_BROADCOM_STA" = "1" ]; then
echo $"Installing Broadcom proprietary wireless driver"
dcop_write $"Installing Broadcom proprietary wireless driver..." 10
rpm -q --whatprovides broadcom-sta >/dev/null || apt_get_parsed install -y broadcom-sta
rpm -q --whatprovides broadcom-sta >/dev/null || pkg_tool install -y broadcom-sta
fi
if [ "$INSTALL_B43" = "1" ]; then
@@ -246,7 +246,7 @@ if [ "$INSTALL_MSTTCF" = "1" ]; then
fi
if [ "$INSTALL_SKYPE" = "1" ]; then
rpm -q libqt4 >/dev/null || apt_get_parsed install -y libqt4
rpm -q libqt4 >/dev/null || pkg_tool install -y libqt4
dcop_write $"Installing Skype software..." 10
/usr/bin/openmamba-netsrpms skype
fi
@@ -258,12 +258,12 @@ fi
if [ "$INSTALL_JRE" = "1" ]; then
dcop_write $"Installing Sun Java Runtime Environment..." 10
apt_get_parsed install -y $SUN_JAVA_RUNTIME_PKGS
pkg_tool install -y $SUN_JAVA_RUNTIME_PKGS
fi
if [ "$INSTALL_JDK" = "1" ]; then
dcop_write $"Installing Sun Java Developers Kit..." 10
apt_get_parsed install -y $SUN_JAVA_PKGS
pkg_tool install -y $SUN_JAVA_PKGS
fi
dcop_write $"Installation completed." -1

View File

@@ -2,7 +2,7 @@
#
# netsrpm-install.sh - Build srpms that download sources from network
#
# Copyright (C) 2003-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
# Copyright (C) 2003-2017 by Silvan Calarco <silvan.calarco@mambasoft.it>
# Copyright (C) 2005 by Massimo Pintore <massimo.pintore@qilinux.it>
# Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@qilinux.it>
@@ -135,9 +135,9 @@ for pckname in $PACKAGES; do
# install rpm
if [ "$FORCE_MODE" = "1" ]; then
sudo smart remove -y $pckname
pkcon remove -y $pckname
fi
sudo smart install -y $RPM_PATH
pkcon install-local -y $RPM_PATH
if [ $? -gt 0 ]; then
echo "$me: "$"error installing \`$RPM_PATH'."" "$"Aborting..." >&2
check_if_already_installed $pckname

View File

@@ -22,7 +22,7 @@ function pkg_parser() {
}
function pkg_tool() {
sudo smart $@ | pkg_parser
pkcon $@ | pkg_parser
}
echo $"\