[Xedeb-commits] jlbec commits r31 - in trunk: debian/client sources
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Mon Feb 13 23:12:29 CST 2006
Author: jlbec
Date: 2006-02-13 23:11:39 -0600 (Mon, 13 Feb 2006)
New Revision: 31
Modified:
trunk/debian/client/changelog
trunk/debian/client/rules
trunk/sources/oracle-xe-client-10.2.0.1.tar.gz
trunk/sources/oracle_client.spec
Log:
o Bring client up to RC2
Modified: trunk/debian/client/changelog
===================================================================
--- trunk/debian/client/changelog 2006-02-14 05:09:14 UTC (rev 30)
+++ trunk/debian/client/changelog 2006-02-14 05:11:39 UTC (rev 31)
@@ -1,3 +1,9 @@
+oracle-xe-client (10.2.0.1-0.RC2) unstable; urgency=low
+
+ * Sync up to RC2
+
+ -- Joel Becker <joel.becker at oracle.com> Sun, 12 Feb 2006 01:20:54 -0800
+
oracle-xe-client (10.2.0.1-0.3) unstable; urgency=low
* Update to 12/13.
Modified: trunk/debian/client/rules
===================================================================
--- trunk/debian/client/rules 2006-02-14 05:09:14 UTC (rev 30)
+++ trunk/debian/client/rules 2006-02-14 05:11:39 UTC (rev 31)
@@ -40,6 +40,7 @@
mkdir -p -m 0755 debian/tmp/usr/share/gnome/vfolders
mkdir -p -m 0755 debian/tmp/usr/share/desktop-menu-files
mkdir -p -m 0755 debian/tmp/var/lib/menu/kde/Applications/oraclexe-client/gethelp
+ mkdir -p -m 0755 debian/tmp/usr/share/doc/oracle_xe_client
$(MAKE) destroot=`pwd`/debian/tmp install
Modified: trunk/sources/oracle-xe-client-10.2.0.1.tar.gz
===================================================================
(Binary files differ)
Modified: trunk/sources/oracle_client.spec
===================================================================
--- trunk/sources/oracle_client.spec 2006-02-14 05:09:14 UTC (rev 30)
+++ trunk/sources/oracle_client.spec 2006-02-14 05:11:39 UTC (rev 31)
@@ -32,8 +32,7 @@
# Check for sufficient diskspace
if [ -d /usr/lib/oracle ]
then
-# diskspace=`df -k /usr/lib/oracle | grep '^/dev*' | awk '{print $4}'`
- diskspace=`df -k /usr/lib | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
+ diskspace=`df -k /usr/lib/oracle | grep % | tr -s " " | cut -d" " -f4 | tail -1`
diskspace=`expr $diskspace / 1024`
if [ $diskspace -lt 100 ]
then
@@ -43,8 +42,7 @@
exit 1
fi
else
-# diskspace=`df -k /usr/lib | grep '^/dev*' | awk '{print $4}'`
- diskspace=`df -k /usr/lib | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
+ diskspace=`df -k /usr/lib/oracle | grep % | tr -s " " | cut -d" " -f4 | tail -1`
diskspace=`expr $diskspace / 1024`
if [ $diskspace -lt 100 ]
then
@@ -55,70 +53,6 @@
fi
fi
-# Check for sufficient SWAP space
-space=`cat /proc/meminfo | grep '^MemTotal' | awk '{print $2}'`
-PhyMem=`expr $space / 1024`
-swapspace=`free -m | grep Swap | awk '{print $4}'`
-
-if [ $PhyMem -lt 240 ]
-then
- echo "Oracle Client 10g Express Edition requires a minimum of 256 MB of physical
-memory (RAM). This system has $PhyMem MB of RAM and does not meet minimum
-requirements."
- exit 1
-fi
-
-if [ $PhyMem -gt 0 ] && [ $PhyMem -le 256 ]
-then
- required=`expr 3 \* $PhyMem`
- if [ $swapspace -lt "$required" ]
- then
- echo "This system does not meet the minimum requirements for swap space. Based on
-the amount of physical memory available on the system, Oracle Client 10g
-Express Edition requires $required MB of swap space. This system has $swapspace MB
-of swap space. Configure more swap space on the system and retry the installation."
- exit 1
- fi
-elif [ $PhyMem -gt 256 ] && [ $PhyMem -le 512 ]
-then
- required=`expr 2 \* $PhyMem`
- if [ $swapspace -lt "$required" ]
- then
- echo "This system does not meet the minimum requirements for swap space. Based on
-the amount of physical memory available on the system, Oracle Client 10g
-Express Edition requires $required MB of swap space. This system has $swapspace MB
-of swap space. Configure more swap space on the system and retry the installation."
- exit 1
- fi
-elif [ $PhyMem -gt 512 ] && [ $PhyMem -le 1024 ]
-then
- required=`echo 1.5 \* $PhyMem | bc`
- if test `echo $required \> 1024 | bc`
- then
- required=1024
- fi
-
- check=`echo $swapspace \< $required | bc`
- if test $check != 0
- then
- echo "This system does not meet the minimum requirements for swap space. Based on
-the amount of physical memory available on the system, Oracle Client 10g
-Express Edition requires $required MB of swap space. This system has $swapspace MB
-of swap space. Configure more swap space on the system and retry the installation."
- exit 1
- fi
-elif [ $PhyMem -gt 1024 ]
-then
- if [ $swapspace -lt 1024 ]
- then
- echo "This system does not meet the minimum requirements for swap space. Based on
-the amount of physical memory available on the system, Oracle Client 10g
-Express Edition requires 1024 MB of swap space. This system has $swapspace MB
-of swap space. Configure more swap space on the system and retry the installation."
- fi
-fi
-
-
%prep
rm -fr $RPM_BUILD_ROOT
%setup -q
@@ -128,39 +62,36 @@
mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/usr/lib/oracle/xe/app/oracle/product/10.2.0/client
mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/usr/lib/oracle/xe/app/oracle/doc
mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/usr/share/man/man1
-#mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/usr/share/doc/oracle_xe
mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/usr/share/pixmaps
mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/usr/share/applications
mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/usr/share/gnome/vfolders
mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/usr/share/desktop-menu-files
mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/var/lib/menu/kde/Applications/oraclexe-client/gethelp
+mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/usr/share/doc/oracle_xe_client
make install
%post
-echo "Executing Post-install steps.........."
+echo "Executing Post-install steps..."
if `grep -q ^dba: /etc/group`
then
- echo ""
+ echo ""
else
- /usr/sbin/groupadd dba
+ /usr/sbin/groupadd dba
fi
-check=`id oracle`
-if test -n "$check"
+id oracle > /dev/null 2>&1
+status=$?
+if test $status -eq 0
then
- group=`groups oracle | grep dba`
- if test -z "$group"
- then
- /usr/sbin/usermod -G dba oracle
- fi
+ groups oracle | grep dba > /dev/null
+ status=$?
+ if test $status != 0
+ then
+ /usr/sbin/usermod -G dba oracle
+ fi
else
- /usr/sbin/useradd -M -g dba -d /usr/lib/oracle/xe -s /bin/bash oracle
+ /usr/sbin/useradd -M -g dba -d /usr/lib/oracle/xe -s /bin/bash oracle
fi
-#if `grep -q oraclexe /etc/passwd`
-#then
-# /usr/sbin/usermod -G dba oraclexe
-#else
-# /usr/sbin/useradd -M -g dba -d /usr/lib/oracle/xe -s /bin/bash oraclexe
-#fi
+
/bin/chown -R oracle:dba /usr/lib/oracle/xe
/sbin/ldconfig >/dev/null
/bin/chown -R oracle:dba /usr/lib/oracle/xe
@@ -226,41 +157,26 @@
if [ -f /etc/xdg/menus/applications.menu ]
then
- cp -r /usr/share/desktop-menu-files/oraclexe-client-10g.directory /usr/share/desktop-directories/oraclexe-client-10g.directory
- cp -r /usr/share/desktop-menu-files/oraclexe-client-gethelp.directory /usr/share/desktop-directories/oraclexe-client-gethelp.directory
- cp -r /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client.menu /etc/xdg/menus
- if test -f /tmp/applications.menu.tmp
- then
- (sed -n '1,/<\/Menu>/p' /etc/xdg/menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-merge.menu ; sed -n '1,/<\/Menu>/!p' /etc/xdg/menus/applications.menu ) > /tmp/applications.menu.tmp$$
- /bin/chmod 664 /tmp/applications.menu.tmp$$
- cp -rf /tmp/applications.menu.tmp$$ /etc/xdg/menus/applications.menu
- else
- (sed -n '1,/<\/Menu>/p' /etc/xdg/menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-merge.menu ; sed -n '1,/<\/Menu>/!p' /etc/xdg/menus/applications.menu ) > /tmp/applications.menu.tmp
- /bin/chmod 664 /tmp/applications.menu.tmp
- cp -rf /tmp/applications.menu.tmp /etc/xdg/menus/applications.menu
- fi
+ cp -f /usr/share/desktop-menu-files/oraclexe-client-10g.directory /usr/share/desktop-directories/oraclexe-client-10g.directory
+ cp -f /usr/share/desktop-menu-files/oraclexe-client-gethelp.directory /usr/share/desktop-directories/oraclexe-client-gethelp.directory
+ cp -f /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client.menu /etc/xdg/menus
+ sed -i '1,/<\/Menu>/ { /<\/Menu>/ r /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-merge.menu
+ }' /etc/xdg/menus/applications.menu
elif [ -f /etc/X11/desktop-menus/applications.menu ]
then
- if test -f /tmp/applications.menu.tmp
- then
- (sed -n '1,/<\/Query>/p' /etc/X11/desktop-menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-rhel3.menu ; sed -n '1,/<\/Query>/!p' /etc/X11/desktop-menus/applications.menu ) > /tmp/applications.menu.tmp$$
- /bin/chmod 664 /tmp/applications.menu.tmp$$
- cp -rf /tmp/applications.menu.tmp$$ /etc/X11/desktop-menus/applications.menu
- else
- (sed -n '1,/<\/Query>/p' /etc/X11/desktop-menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-rhel3.menu ; sed -n '1,/<\/Query>/!p' /etc/X11/desktop-menus/applications.menu ) > /tmp/applications.menu.tmp
- /bin/chmod 664 /tmp/applications.menu.tmp
- cp -rf /tmp/applications.menu.tmp /etc/X11/desktop-menus/applications.menu
- fi
-
-fi
-
-if test -f /tmp/applications.menu.tmp
+# sed -i '1,/<\/Query>/ { /<\/Query>/ r /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-rhel3.menu
+ sed -i '1,/<\/Query>/ { /<\/Query>/ r /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-rhel3.menu
+ }' /etc/X11/desktop-menus/applications.menu
+elif [ -f /etc/xdg/menus/applications-merged/kde-essential.menu ]
then
- rm -fr /tmp/applications.menu.tmp
-else
- rm -fr /tmp/applications.menu.tmp$$
+ cp -f /usr/share/desktop-menu-files/oraclexe-client-10g.directory /usr/share/desktop-directories/oraclexe-client-10g.directory
+ cp -f /usr/share/desktop-menu-files/oraclexe-client-gethelp.directory /usr/share/desktop-directories/oraclexe-client-gethelp.directory
+ cp -f /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client.menu /etc/xdg/menus
+ sed -i '1,/<\/Menu>/ { /<\/Menu>/ r /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-asianux.menu
+ }' /etc/xdg/menus/applications-merged/kde-essential.menu
fi
+
rm -fr /usr/lib/oracle/screenrc
rm -fr /usr/lib/oracle/gtkrc
rm -fr /usr/lib/oracle/emacs
@@ -270,7 +186,6 @@
rm -fr /usr/lib/oracle/cshrc
rm -fr /usr/lib/oracle/bashrc-DEFAULT
rm -fr /usr/lib/oracle/bashrc_logout
-#rm -fr /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts
%preun
@@ -279,6 +194,7 @@
rm -fr /usr/lib/oracle/xe/app/oracle/product/10.2.0/client
rm -fr /usr/lib/oracle/xe/app/oracle/doc
+rm -fr /usr/share/doc/oracle_xe_client
rm -fr /usr/share/desktop-menu-files/oraclexe-client-10g.directory
rm -fr /usr/share/desktop-menu-files/oraclexe-client-gethelp.directory
rm -fr /var/lib/menu/kde/Applications/oraclexe-client
@@ -286,39 +202,20 @@
rm -fr /usr/share/gnome/vfolders/oraclexe-client-gethelp.directory
if [ -f /etc/xdg/menus/applications.menu ]
then
- rm -fr /usr/share/desktop-directories/oraclexe-client-10g.directory
- rm -fr /usr/share/desktop-directories/oraclexe-client-gethelp.directory
- rm -r /etc/xdg/menus/oraclexe-client.menu
- if test -f /tmp/applications.menu
- then
- sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/xdg/menus/applications.menu > /tmp/applications.menu$$
- /bin/chmod 664 /tmp/applications.menu$$
- cp -rf /tmp/applications.menu$$ /etc/xdg/menus/applications.menu
- else
- sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/xdg/menus/applications.menu > /tmp/applications.menu
- /bin/chmod 664 /tmp/applications.menu
- cp -rf /tmp/applications.menu /etc/xdg/menus/applications.menu
- fi
+ rm -f /usr/share/desktop-directories/oraclexe-client-10g.directory
+ rm -f /usr/share/desktop-directories/oraclexe-client-gethelp.directory
+ rm -f /etc/xdg/menus/oraclexe-client.menu
+ sed -i '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/d' /etc/xdg/menus/applications.menu
elif [ -f /etc/X11/desktop-menus/applications.menu ]
then
- if test -f /tmp/applications.menu
- then
- sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/X11/desktop-menus/applications.menu > /tmp/applications.menu$$
- /bin/chmod 664 /tmp/applications.menu$$
- cp -rf /tmp/applications.menu$$ /etc/X11/desktop-menus/applications.menu
- else
- sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/X11/desktop-menus/applications.menu > /tmp/applications.menu
- /bin/chmod 664 /tmp/applications.menu
- cp -rf /tmp/applications.menu /etc/X11/desktop-menus/applications.menu
- fi
-fi
-
-if test -f /tmp/applications.menu
+ sed -i '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/d' /etc/X11/desktop-menus/applications.menu
+elif [ -f /etc/xdg/menus/applications-merged/kde-essential.menu ]
then
- rm -fr /tmp/applications.menu
-else
- rm -fr /tmp/applications.menu$$
+ rm -f /usr/share/desktop-directories/oraclexe-client-10g.directory
+ rm -f /usr/share/desktop-directories/oraclexe-client-gethelp.directory
+ rm -f /etc/xdg/menus/oraclexe-client.menu
+ sed -i '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/d' /etc/xdg/menus/applications-merged/kde-essential.menu
fi
%files
@@ -333,6 +230,7 @@
/usr/lib/oracle/xe/app/oracle/product/10.2.0/client/rdbms
/usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts
/usr/lib/oracle/xe/app/oracle/product/10.2.0/client/sqlplus
+/usr/share/doc/oracle_xe_client/LICENSE
/usr/share/man/man1/client-sqlplus.1.gz
/usr/share/pixmaps/*
/usr/share/applications/oraclexe-client-gotoonlineforum.desktop
More information about the Xedeb-commits
mailing list