[Xedeb-commits] jlbec commits r10 - in trunk: override/server
override/server/config/scripts sources
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Wed Nov 30 00:22:03 CST 2005
Author: jlbec
Date: 2005-11-29 22:34:43 -0600 (Tue, 29 Nov 2005)
New Revision: 10
Added:
trunk/sources/oracle_client.spec
Removed:
trunk/override/server/Makefile
Modified:
trunk/override/server/config/scripts/oracle-xe
trunk/sources/oracle-xe-10.2.0.1.tar.gz
trunk/sources/oracle-xe-client-10.2.0.1.tar.gz
trunk/sources/oracle_server.spec
Log:
o Latest sources
o Makefile no longer needs override
o Integrate oracle-xe.init changes to the override
Deleted: trunk/override/server/Makefile
===================================================================
--- trunk/override/server/Makefile 2005-11-28 21:56:48 UTC (rev 9)
+++ trunk/override/server/Makefile 2005-11-30 04:34:43 UTC (rev 10)
@@ -1,61 +0,0 @@
-.PHONY: clean install
-CP = /bin/cp
-MV = /bin/mv
-MKDIR = /bin/mkdir
-destroot= /var/tmp/oracle-xe-10.2.0.1
-dest= $(destroot)/usr/lib/oracle/xe
-install:
- $(CP) -a man/sqlplus.1 $(destroot)/usr/share/man/man1
- $(CP) -a man/oracle.1 $(destroot)/usr/share/man/man1
- $(CP) -a man/exp.1 $(destroot)/usr/share/man/man1
- $(CP) -a man/imp.1 $(destroot)/usr/share/man/man1
- $(CP) -a man/sqlldr.1 $(destroot)/usr/share/man/man1
- $(CP) -a man/impdp.1 $(destroot)/usr/share/man/man1
- $(CP) -a bin $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a config $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a ctx $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a dbs $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a demo $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a hs $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a install $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a jdbc $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a ldap $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a lib $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a network $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a nls $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a opmn $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a oracore $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a plsql $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a rdbms $(dest)/app/oracle/product/10.2.0/server
- $(MV) $(dest)/app/oracle/product/10.2.0/server/rdbms/admin/patch/blafdoc.css $(dest)/app/oracle/doc
- $(MV) $(dest)/app/oracle/product/10.2.0/server/rdbms/admin/patch/dcommon $(dest)/app/oracle/doc
- $(MV) $(dest)/app/oracle/product/10.2.0/server/rdbms/admin/patch/getting_started.htm $(dest)/app/oracle/doc
- $(MV) $(dest)/app/oracle/product/10.2.0/server/rdbms/admin/patch/img $(dest)/app/oracle/doc
- $(MV) $(dest)/app/oracle/product/10.2.0/server/rdbms/admin/patch/img_text $(dest)/app/oracle/doc
- $(CP) -a slax $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a sqlplus $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a precomp $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a jlib $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a odbc $(dest)/app/oracle/product/10.2.0/server
- $(CP) -a xdk $(dest)/app/oracle/product/10.2.0/server
-# $(MKDIR) -p $(dest)/app/oracle/doc
- $(CP) -a desktop/oraclexe-dbhp.desktop $(destroot)/usr/share/applications/
- $(CP) -a desktop/oraclexe-gotoonlineforum.desktop $(destroot)/usr/share/applications/
- $(CP) -a desktop/oraclexe-readdocumentation.desktop $(destroot)/usr/share/applications/
- $(CP) -a desktop/oraclexe-registerforonlineforum.desktop $(destroot)/usr/share/applications/
- $(CP) -a desktop/oraclexe-runsql.desktop $(destroot)/usr/share/applications/
- $(CP) -a desktop/oraclexe-startdb.desktop $(destroot)/usr/share/applications/
- $(CP) -a desktop/oraclexe-stopdb.desktop $(destroot)/usr/share/applications/
- $(CP) -a desktop/oraclexe-backup.desktop $(destroot)/usr/share/applications/
- $(CP) -a desktop/oraclexe-restore.desktop $(destroot)/usr/share/applications/
- $(CP) -a desktop/oraclexe-readonlinehelp.desktop $(destroot)/usr/share/applications/
- $(CP) -a desktop/oraclexe-getstarted.desktop $(destroot)/usr/share/applications/
- $(CP) -a desktop/oraclexe-getstarteddesktop.desktop $(destroot)/usr/share/applications/
- $(CP) -a icons/* $(destroot)/usr/share/pixmaps/.
- $(CP) -a LICENSE $(destroot)/usr/share/doc/oracle_xe
-# $(CP) -a desktop/OracleXE.directory $(destroot)/var/lib/menu/kde/Applications/OracleXE.directory
-# $(CP) -a desktop/oraclexe-GetHelp.directory $(destroot)/var/lib/menu/kde/Applications/oraclexe-GetHelp.directory
- $(CP) -a desktop/oraclexe-gethelp.directory $(destroot)/usr/share/gnome/vfolders/oraclexe-gethelp.directory
- $(CP) -a desktop/oraclexe-10g.directory $(destroot)/usr/share/gnome/vfolders/oraclexe-10g.directory
- $(CP) -a desktop/oraclexe-gethelp.directory $(destroot)/usr/share/desktop-menu-files/oraclexe-gethelp.directory
- $(CP) -a desktop/oraclexe-10g.directory $(destroot)/usr/share/desktop-menu-files/oraclexe-10g.directory
Modified: trunk/override/server/config/scripts/oracle-xe
===================================================================
--- trunk/override/server/config/scripts/oracle-xe 2005-11-28 21:56:48 UTC (rev 9)
+++ trunk/override/server/config/scripts/oracle-xe 2005-11-30 04:34:43 UTC (rev 10)
@@ -178,13 +178,13 @@
# ORACLE_DBENABLED:'true' means to load the Database at system boot.
ORACLE_DBENABLED=${ORACLE_DBENABLED:-false}
-# LISTENER_PORT:
+# LISTENER_PORT: Database listener
LISTENER_PORT=${LISTENER_PORT}
-# HTTP_PORT
+# HTTP_PORT : HTTP port for HTMLDB
HTTP_PORT=${HTTP_PORT}
-#Configuration
+# Configuration : Check whether configure has been done or not
CONFIGURE_RUN=${CONFIGURE_RUN}
EOF
@@ -209,11 +209,24 @@
sed -i "s/%port%/$LISTENER_PORT/g" $ORACLE_HOME/network/admin/listener.ora
sed -i "s/%port%/$LISTENER_PORT/g" $ORACLE_HOME/network/admin/tnsnames.ora
sed -i "s/%httpport%/$HTTP_PORT/g" $ORACLE_HOME/config/scripts/postDBCreation.sql
- sed -i "s/%port%/$LISTENER_PORT/g" $ORACLE_HOME/config/scripts/init.ora
- sed -i "s/%hostname%/`hostname`/g" $ORACLE_HOME/config/scripts/init.ora
+
+ if test $LISTENER_PORT -ne 1521
+ then
+ cat >/tmp/local_listener <<EOF
+###########################################
+# Registration of instance with listsner
+###########################################
+local_listener="(ADDRESS = (PROTOCOL=TCP) (HOST=%hostname%) (PORT=%port%))"
+EOF
+ cat /tmp/local_listener >> $ORACLE_HOME/config/scripts/init.ora
+ sed -i "s/%port%/$LISTENER_PORT/g" $ORACLE_HOME/config/scripts/init.ora
+ sed -i "s/%hostname%/`hostname`/g" $ORACLE_HOME/config/scripts/init.ora
+ rm -fr /tmp/local_listener
+ fi
+
sed -i "s/%FRA_DIR%/\/usr\/lib\/oracle\/xe\/app\/oracle\/flash_recovery_area/g" $ORACLE_HOME/config/scripts/postDBCreation.sql
- sed -i "s/%httpport%/$HTTP_PORT/g" /usr/share/applications/oraclexe-dbhp.desktop
- sed -i "s/%httpport%/$HTTP_PORT/g" /usr/share/applications/oraclexe-readonlinehelp.desktop
+ sed -i "s/%httpport%/$HTTP_PORT/g" $ORACLE_HOME/config/scripts/DatabaseHomePage.sh
+ sed -i "s/%httpport%/$HTTP_PORT/g" $ORACLE_HOME/config/scripts/readonlinehelp.sh
homedir=`echo $HOME`
if [ "$homedir" == "/root" ]
@@ -272,8 +285,8 @@
echo "Done"
echo "Installation Completed Successfully."
- echo "Launching Oracle Database 10g Express Edition Home Page."
- mozilla http://127.0.0.1:$HTTP_PORT/htmldb
+
+
return 0
}
@@ -323,7 +336,7 @@
break
;;
*[^0-9]*)
- echo "Invalid http port: $LINE" > /dev/null
+ echo "Invalid http port: $LINE"
;;
*)
HTTP_PORT=$LINE
@@ -363,8 +376,13 @@
echo "Invalid port: $LINE" >&2
;;
*)
- LISTENER_PORT=$LINE
- break
+ if [ "$HTTP_PORT" != "$LINE" ]
+ then
+ LISTENER_PORT=$LINE
+ break
+ else
+ echo Database listener cannot be configured on the same port as HTML DB.
+ fi
;;
esac
done
@@ -462,6 +480,8 @@
configure_perform
CONFIGURE_RUN=true
write_sysconfig
+ echo To access the Database Home Page go to \"http://127.0.0.1:$HTTP_PORT/htmldb\"
+
}
start() {
@@ -477,10 +497,6 @@
you can start it.
exit 0
fi
- if [ "$ORACLE_DBENABLED" != "true" ]
- then
- exit 0
- fi
status=`ps -ef | grep tns | grep oracle`
if [ "$status" == "" ]
then
@@ -548,18 +564,22 @@
# See how we were called
case "$1" in
start)
- start
+ if test "$ORACLE_DBENABLED" != "true"
+ then
+ exit 0
+ fi
+ start
;;
configure)
configure
- if [ "$ORACLE_DBENABLED" = "true" ]
+ ;;
+ stop)
+ if test "$ORACLE_DBENABLED" != "true"
then
- /sbin/chkconfig --add oracle-xe
+ exit 0
fi
+ stop
;;
- stop)
- stop
- ;;
restart|reload)
stop
start
@@ -568,8 +588,18 @@
status)
dostatus
;;
+ enable)
+ ORACLEDB_ENABLED=true
+ write_sysconfig
+ ;;
+
+ disable)
+ ORACLEDB_ENABLED=false
+ write_sysconfig
+ ;;
+
*)
- echo $"Usage: $0 {start|stop|restart|configure|status}"
+ echo $"Usage: $0 {start|stop|restart|configure|status|enable|disable}"
exit 1
esac
Modified: trunk/sources/oracle-xe-10.2.0.1.tar.gz
===================================================================
(Binary files differ)
Modified: trunk/sources/oracle-xe-client-10.2.0.1.tar.gz
===================================================================
(Binary files differ)
Added: trunk/sources/oracle_client.spec
===================================================================
--- trunk/sources/oracle_client.spec 2005-11-28 21:56:48 UTC (rev 9)
+++ trunk/sources/oracle_client.spec 2005-11-30 04:34:43 UTC (rev 10)
@@ -0,0 +1,304 @@
+Summary: Oracle Client 10g Express Edition
+Name:oracle-xe-client
+Version: 10.2.0.1
+Release: 1.0
+Source0: %{name}-%{version}.tar.gz
+License: Oracle Corporation
+Packager: Oracle <www.oracle.com>
+URL: http://www.oracle.com
+Group: Applications/oraclexe-client
+ExcludeArch : sparc Aplha
+ExclusiveOS: Redhat Enterprise Linux RHEL3 and RHEL4, Suse SLES-9 Fedora Core 4, Debian 3.1,AianUnix1.0 and AsianUnix2.0
+AutoReqProv: no
+Requires: glibc >= 2.3.2
+Requires: libaio >= 0.3.96
+Buildroot: /var/tmp/%{name}-%{version}
+%ifnos : sparc,Alpha,irix
+%endif
+%ifarch : i386
+%endif
+%define _mandir %{_datadir}/man
+%description
+Oracle Client 10g Express Edition
+
+%pre
+#User must be root
+if [ $(id -u) != "0" ]
+then
+ echo "You must be the root to install the software" >&2
+ exit 1
+fi
+
+# Check for sufficient diskspace
+if [ -d /usr/lib/oracle ]
+then
+ diskspace=`df -k /usr/lib/oracle | grep '^/dev*' | awk '{print $4}'`
+ diskspace=`expr $diskspace / 1024`
+ if [ $diskspace -lt 1536 ]
+ then
+ echo "You have insufficient diskspace in the destination directory (/usr/lib/oracle)
+to install Oracle Database 10g Express Edition. The installation requires at
+least 1.5 GB free on this disk."
+ exit 1
+ fi
+else
+ diskspace=`df -k /usr/lib | grep '^/dev*' | awk '{print $4}'`
+ diskspace=`expr $diskspace / 1024`
+ if [ $diskspace -lt 1536 ]
+ then
+ echo "You have insufficient diskspace in the destination directory (/usr/lib) to
+install Oracle Database 10g Express Edition. The installation requires at
+least 1.5 GB free on this disk."
+ exit 1
+ 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 Database 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 Database 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 Database 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 Database 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
+fi
+
+
+%prep
+rm -fr $RPM_BUILD_ROOT
+%setup -q
+%build
+%install
+rm -rf ${RPM_BUILD_ROOT}
+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
+make install
+
+%post
+echo "Executing Post-install steps.........."
+if `grep -q ^dba: /etc/group`
+then
+ echo ""
+else
+ /usr/sbin/groupadd dba
+fi
+check=`id oracle`
+if test -n "$check"
+then
+ group=`groups oracle | grep dba`
+ if test -z "$group"
+ then
+ /usr/sbin/usermod -G dba oracle
+ fi
+else
+ /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
+
+#chmod 755 /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/bin/sqlplus
+
+# Start Menu icons
+
+if test -d /var/lib/menu/kde/Applications/oraclexe-client
+then
+ echo ""
+else
+ mkdir -p /var/lib/menu/kde/Applications/oraclexe-client/gethelp
+fi
+
+if [ -f /var/lib/menu/kde/Applications/oraclexe-client/.directory ]
+then
+ rm -fr /var/lib/menu/kde/Applications/oraclexe-client/.directory
+ ln -s /usr/share/desktop-menu-files/oraclexe-client-10g.directory /var/lib/menu/kde/Applications/oraclexe-client/.directory
+else
+ ln -s /usr/share/desktop-menu-files/oraclexe-client-10g.directory /var/lib/menu/kde/Applications/oraclexe-client/.directory
+fi
+
+if [ -f /var/lib/menu/kde/Applications/oraclexe-client/oraclexe-client-runsql.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/oraclexe-client/oraclexe-client-runsql.desktop
+ ln -s /usr/share/applications/oraclexe-client-runsql.desktop /var/lib/menu/kde/Applications/oraclexe-client/oraclexe-client-runsql.desktop
+else
+ ln -s /usr/share/applications/oraclexe-client-runsql.desktop /var/lib/menu/kde/Applications/oraclexe-client/oraclexe-client-runsql.desktop
+fi
+
+if [ -f /var/lib/menu/kde/Applications/oraclexe-client/gethelp/.directory ]
+then
+ rm -fr /var/lib/menu/kde/Applications/oraclexe-client/gethelp/.directory
+ ln -s /usr/share/desktop-menu-files/oraclexe-client-gethelp.directory /var/lib/menu/kde/Applications/oraclexe-client/gethelp/.directory
+else
+ ln -s /usr/share/desktop-menu-files/oraclexe-client-gethelp.directory /var/lib/menu/kde/Applications/oraclexe-client/gethelp/.directory
+fi
+
+if [ -f /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-registerforonlineforum.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-registerforonlineforum.desktop
+ ln -s /usr/share/applications/oraclexe-client-registerforonlineforum.desktop /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-registerforonlineforum.desktop
+else
+ ln -s /usr/share/applications/oraclexe-client-registerforonlineforum.desktop /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-registerforonlineforum.desktop
+fi
+
+if [ -f /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-readdocumentation.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-readdocumentation.desktop
+ ln -s /usr/share/applications/oraclexe-client-readdocumentation.desktop /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-readdocumentation.desktop
+else
+ ln -s /usr/share/applications/oraclexe-client-readdocumentation.desktop /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-readdocumentation.desktop
+fi
+
+if [ -f /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-gotoonlineforum.desktop ]
+then
+ rm -fr /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-gotoonlineforum.desktop
+ ln -s /usr/share/applications/oraclexe-client-gotoonlineforum.desktop /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-gotoonlineforum.desktop
+else
+ ln -s /usr/share/applications/oraclexe-client-gotoonlineforum.desktop /var/lib/menu/kde/Applications/oraclexe-client/gethelp/oraclexe-client-gotoonlineforum.desktop
+fi
+
+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
+ (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
+ cp -rf /tmp/applications.menu.tmp /etc/xdg/menus/applications.menu
+elif [ -f /etc/X11/desktop-menus/applications.menu ]
+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
+ cp -rf /tmp/applications.menu.tmp /etc/X11/desktop-menus/applications.menu
+fi
+
+rm -fr /tmp/applications.menu.tmp
+rm -fr /usr/lib/oracle/screenrc
+rm -fr /usr/lib/oracle/gtkrc
+rm -fr /usr/lib/oracle/emacs
+rm -fr /usr/lib/oracle/cshrc-DEFAULT_old
+rm -fr /usr/lib/oracle/cshrc-DEFAULT.06292004
+rm -fr /usr/lib/oracle/cshrc-DEFAULT
+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
+
+%postun
+/sbin/ldconfig >/dev/null
+
+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/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
+rm -fr /usr/share/gnome/vfolders/oraclexe-client-10g.directory
+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
+ sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/xdg/menus/applications.menu > /tmp/applications.menu
+ cp -rf /tmp/applications.menu /etc/xdg/menus/applications.menu
+
+elif [ -f /etc/X11/desktop-menus/applications.menu ]
+then
+ sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/X11/desktop-menus/applications.menu > /tmp/applications.menu
+ cp -rf /tmp/applications.menu /etc/X11/desktop-menus/applications.menu
+fi
+
+rm -fr /tmp/applications.menu
+
+%files
+%defattr(-,root,root)
+%dir
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/client/bin
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/client/jdbc
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/client/jlib
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/client/lib
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/client/odbc
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/client/precomp
+/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/man/man1/client-sqlplus.1.gz
+/usr/share/pixmaps/*
+/usr/share/applications/oraclexe-client-gotoonlineforum.desktop
+/usr/share/applications/oraclexe-client-readdocumentation.desktop
+/usr/share/applications/oraclexe-client-registerforonlineforum.desktop
+/usr/share/applications/oraclexe-client-runsql.desktop
+/usr/share/gnome/vfolders/oraclexe-client-10g.directory
+/usr/share/gnome/vfolders/oraclexe-client-gethelp.directory
+/usr/share/desktop-menu-files/oraclexe-client-gethelp.directory
+/usr/share/desktop-menu-files/oraclexe-client-10g.directory
+/usr/lib/oracle/xe/app/oracle/doc
+
+
+#%{_datadir}/applications/*
+#%{_datadir}/pixmaps/*
+%doc
+#%{_datadir}/applications/oraclexe.desktop
+
+%clean
+rm -fr $RPM_BUILD_ROOT
+
+%changelog
+* Fri Sep 29 2005 svaggu
+-auto rebuild in the new build environment (release 3)
Modified: trunk/sources/oracle_server.spec
===================================================================
--- trunk/sources/oracle_server.spec 2005-11-28 21:56:48 UTC (rev 9)
+++ trunk/sources/oracle_server.spec 2005-11-30 04:34:43 UTC (rev 10)
@@ -255,6 +255,7 @@
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/GetHelp
+mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/etc/init.d
make install
%post
@@ -265,11 +266,13 @@
else
/usr/sbin/groupadd dba
fi
-check=`id oracle`
-if test -n "$check"
+id oracle > /dev/null
+status=$?
+if test $status -eq 0
then
- group=`groups oracle | grep dba`
- if test -z "$group"
+ groups oracle | grep dba > /dev/null
+ status=$?
+ if test $status != 0
then
/usr/sbin/usermod -G dba oracle
fi
@@ -287,14 +290,16 @@
/sbin/ldconfig >/dev/null
/bin/chown -R oracle:dba /usr/lib/oracle/xe
-if [ -d /etc/init.d ]
-then
- /bin/cp /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oracle-xe /etc/init.d/oracle-xe
-else
- /bin/cp /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oracle-xe /etc/rc.d/init.d/oracle-xe
-fi
+#if [ -d /etc/init.d ]
+#then
+# /bin/cp /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oracle-xe /etc/init.d/oracle-xe
+mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/usr/share/pixmaps
+#else
+# /bin/cp /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oracle-xe /etc/rc.d/init.d/oracle-xe
+#fi
chmod 755 /etc/init.d/oracle-xe
+/sbin/chkconfig --add oracle-xe
# SGA & PGA algo
sgamin=146800640
@@ -508,6 +513,11 @@
%preun
sh /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/stopall.sh
+rm -f /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/admin/tnsnames.ora
+rm -f /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/admin/listener.ora
+rm -f /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/postDBCreation.sql
+/sbin/chkconfig --del oracle-xe
+rm -f /etc/init.d/oracle-xe
%postun
/sbin/ldconfig >/dev/null
@@ -519,8 +529,6 @@
/bin/rm -f /etc/oratab.xe
fi
-/sbin/chkconfig --del oracle-xe
-rm -fr /etc/rc.d/init.d/oracle-xe
rm -fr /etc/sysconfig/oracle-xe-config
rm -fr /usr/lib/oracle/xe/oradata/XE
rm -fr /usr/lib/oracle/xe/app/oracle/admin/XE
@@ -593,6 +601,12 @@
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/stopdb.sql
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/XE.sh
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/XE.sql
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/DatabaseHomePage.sh
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/gettingstarted.sh
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/gotoonlineforum.sh
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/readdocumentation.sh
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/readonlinehelp.sh
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/registerforonlineforum.sh
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/ctx
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/dbs
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/demo
@@ -614,12 +628,6 @@
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/oracore
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/plsql
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms
-#/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms
-#/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms/install
-#/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms/mesg
-#/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms/public
-#/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms/demo
-#/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms/label.info
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/slax
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/sqlplus
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/precomp
@@ -666,12 +674,13 @@
%config /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/admin/listener.ora
%config /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/admin/tnsnames.ora
%config /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/postDBCreation.sql
-#%config (noreplace) /etc/init.d/oracle-xe
+%config /etc/init.d/oracle-xe
+
%clean
rm -fr $RPM_BUILD_ROOT
%changelog
-* Wed Nov 16 2005 svaggu
+* Mon Nov 21 2005 svaggu
-auto rebuild in the new build environment (release 3)
More information about the Xedeb-commits
mailing list