[Tora-cvs] tora/rpm tora-static.spec,1.61,1.62 tora.spec,1.68,1.69

[<hp...@us...>]

Update of /cvsroot/tora/tora/rpm
In directory sc8-pr-cvs1:/tmp/cvs-serv19656/rpm

Modified Files:
	tora-static.spec tora.spec 
Log Message:


Index: tora-static.spec
===================================================================
RCS file: /cvsroot/tora/tora/rpm/tora-static.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** tora-static.spec	15 Feb 2003 23:50:27 -0000	1.61
--- tora-static.spec	10 Mar 2003 02:20:12 -0000	1.62
***************
*** 1,4 ****
  %define _name		tora
! %define _version	1.3.9.2
  %define _release	1static
  %define _prefix		/usr/X11R6
--- 1,4 ----
  %define _name		tora
! %define _version	1.3.10
  %define _release	1static
  %define _prefix		/usr/X11R6

Index: tora.spec
===================================================================
RCS file: /cvsroot/tora/tora/rpm/tora.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** tora.spec	10 Mar 2003 01:20:44 -0000	1.68
--- tora.spec	10 Mar 2003 02:20:12 -0000	1.69
***************
*** 1,35 ****
  # This specfile is Mandrake Linux specific
  #
! # Requires the following .rpmmacros
! #
! # %__find_requires %(echo $HOME)/bin/find-requires-nonoracle %{?buildroot:%{buildroot}}
! #
! # Where the find-requires-nonoracle contains the following
! #
! # #!/bin/sh
! # /usr/lib/rpm/find-requires $@ | grep -v 'libclntsh\.so' | grep -v 'libwtc.*\.so'
! #
! # This is to remove dependencies to the oracle libraries in the oracle rpm.
  #
  
  
  %define _name		tora
! %define _version	1.3.9.2
! %define _release	2mdk
  %define _prefix		/usr
  %define _qtdir		/usr/lib/qt3
  
! Summary:			Toolkit for Oracle
! Name:				%{_name}
! Version:			%{_version}
! Release:			%{_release}
! Source:				%{_name}-%{_version}.tar.gz
! URL:				http://www.globecom.se/tora
! Group:				Development/Databases
! Packager:			Henrik Johnson <to...@un...>
! Distribution:			Mandrake Linux 9.1
! Copyright:			GPL
! BuildRoot:			%{_tmppath}/tora-root
! Prefix:				%{_prefix}
  
  %description
--- 1,27 ----
  # This specfile is Mandrake Linux specific
  #
! # This requires a working Oracle installation to build with a set ORACLE_HOME
! # environment. Requires at least version 8.1.7 of Oracle.
  #
  
  
  %define _name		tora
! %define _version	1.3.10
! %define _release	1mdk
  %define _prefix		/usr
  %define _qtdir		/usr/lib/qt3
  
! Summary:		Toolkit for Oracle
! Name:			%{_name}
! Version:		%{_version}
! Release:		%{_release}
! Source:			%{_name}-%{_version}.tar.gz
! URL:			http://www.globecom.se/tora
! Group:			Development/Databases
! Packager:		Henrik Johnson <to...@un...>
! Distribution:		Mandrake Linux 9.1
! Copyright:		GPL
! BuildRoot:		%{_tmppath}/tora-root
! Prefix:			%{_prefix}
  
  %description
***************
*** 95,117 ****
  
  %package oracle
! Summary:			Oracle specific plugins for %{_name}
  Group:			Development/Databases
  Requires:		%{_name} = %{_version}
  %description oracle
  Oracle specific plugins for %{_name}.
  
  %changelog
! * Tue Dec 18 2001 Henrik Johnson <to...@un...>
! - created from SuSE specfile by Pascal Bleser
! 
! * Sun Mar 9 2003 Henrik Johnson <to...@un...>
! - adapted to Mandrake Linux
  
  * Mon Mar 10 2003 Henrik Johnson <to...@un...>
  - added comment about fixing requires problem.
  
  %prep
  %setup -q
  export QTDIR="%{_qtdir}"
  CFLAGS="$RPM_OPT_FLAGS" \
  CXXFLAGS="$RPM_OPT_FLAGS" \
--- 87,118 ----
  
  %package oracle
! Summary:		Oracle specific plugins for %{_name}
  Group:			Development/Databases
  Requires:		%{_name} = %{_version}
+ Autoreq:		0
+ Requires:		tora
+ 
  %description oracle
  Oracle specific plugins for %{_name}.
  
  %changelog
! * Mon Mar 10 2003 Henrik Johnson <to...@un...>
! - added the oracle preload and a LD_LIBRARY_PATH setup to make compilation work without Oracle in your ld.so path.
! - also added a workaround of the whole requires problem for the Oracle package.
! - changed version to 1.3.10.
  
  * Mon Mar 10 2003 Henrik Johnson <to...@un...>
  - added comment about fixing requires problem.
  
+ * Sun Mar 9 2003 Henrik Johnson <to...@un...>
+ - adapted to Mandrake Linux.
+ 
+ * Tue Dec 18 2001 Henrik Johnson <to...@un...>
+ - created from SuSE specfile by Pascal Bleser.
+ 
  %prep
  %setup -q
  export QTDIR="%{_qtdir}"
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ORACLE_HOME/lib"
  CFLAGS="$RPM_OPT_FLAGS" \
  CXXFLAGS="$RPM_OPT_FLAGS" \