[Tora-cvs] tora/rpm tora.spec.in,1.3,1.4

[Nathan N. <nn...@us...>]

Update of /cvsroot/tora/tora/rpm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21565

Modified Files:
	tora.spec.in 
Log Message:
updated spec file from Raj

Index: tora.spec.in
===================================================================
RCS file: /cvsroot/tora/tora/rpm/tora.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tora.spec.in	29 Jun 2005 20:48:45 -0000	1.3
--- tora.spec.in	13 Feb 2006 14:54:22 -0000	1.4
***************
*** 10,14 ****
  %define _version	@VERSION@
  %define _release	1
! %define _prefix		/usr
  
  Summary:		Toolkit for Oracle
--- 10,14 ----
  %define _version	@VERSION@
  %define _release	1
! %define _prefix		/usr/X11R6
  
  Summary:		Toolkit for Oracle
***************
*** 19,23 ****
  URL:			http://tora.sourceforge.net
  Group:			Development/Databases
! Packager:		Nathan Neulinger <nn...@um...>
  License:		GPL
  BuildRoot:		%{_tmppath}/tora-root
--- 19,23 ----
  URL:			http://tora.sourceforge.net
  Group:			Development/Databases
! Packager:		Raj Thukral (thukral at pobox dot com)
  License:		GPL
  BuildRoot:		%{_tmppath}/tora-root
***************
*** 31,34 ****
--- 31,35 ----
  %description
  
+ 
  TOra - Toolkit for Oracle
  =========================
***************
*** 115,119 ****
  Oracle is copyright of Oracle Corporation.
  
- 
  %package oracle
  Summary:		Oracle specific plugins for %{_name}
--- 116,119 ----
***************
*** 147,158 ****
  	--with-qt=$QTDIR \
  	--with-qt-libraries=$QTDIR/lib \
! 	--with-qt-includes=$QTDIR/include 
  
  %build
  
  %{__make}
  %{__strip} \
! 	 plugins/*.tso \
! 	 tora
  
  # Ugly hack to remove version from libclntsh.so, if someone knows a better way please let me know
--- 147,162 ----
  	--with-qt=$QTDIR \
  	--with-qt-libraries=$QTDIR/lib \
! 	--with-qt-includes=$QTDIR/include \
! 	--without-kde
  
  %build
  
  %{__make}
+ #%{__strip} \
+ 	 #plugins/*.tso \
+ 	 #tora
+ 
  %{__strip} \
! 	 .libs/*.so 
  
  # Ugly hack to remove version from libclntsh.so, if someone knows a better way please let me know
***************
*** 163,167 ****
  
  %install
! %{__rm} -rf "${RPM_BUILD_ROOT}"
  %{__mkdir_p} "${RPM_BUILD_ROOT}%{_prefix}/bin"
  %{__mkdir_p} "${RPM_BUILD_ROOT}%{_prefix}/lib"
--- 167,172 ----
  
  %install
! 
! %{__rm} -rf "${RPM_BUILD_ROOT}" 
  %{__mkdir_p} "${RPM_BUILD_ROOT}%{_prefix}/bin"
  %{__mkdir_p} "${RPM_BUILD_ROOT}%{_prefix}/lib"
***************
*** 172,179 ****
  %postun
  
- %clean
- %{__rm} -rf "${RPM_BUILD_ROOT}"
  
! %files -f rpmcommon
  %defattr(-,root,root)
  %doc BUGS INSTALL LICENSE.txt NEWS README TODO
--- 177,182 ----
  %postun
  
  
! %files 
  %defattr(-,root,root)
  %doc BUGS INSTALL LICENSE.txt NEWS README TODO
***************
*** 187,190 ****
  %{_datadir}/applnk/Development/tora.desktop
  
! %files oracle -f rpmoracle
! %defattr(-,root,root)
--- 190,196 ----
  %{_datadir}/applnk/Development/tora.desktop
  
! #%files oracle -f rpmoracle
! #%defattr(-,root,root)
! 
! %clean
! %{__rm} -rf "${RPM_BUILD_ROOT}"