SPECS: oracle-xe.spec - cosmetics (can't really test %files as no source0 h...

[glen]

Author: glen                         Date: Sat Mar 14 18:27:02 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cosmetics (can't really test %files as no source0 here)

---- Files affected:
SPECS:
   oracle-xe.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/oracle-xe.spec
diff -u SPECS/oracle-xe.spec:1.8 SPECS/oracle-xe.spec:1.9
--- SPECS/oracle-xe.spec:1.8	Sat Mar 14 05:46:02 2009
+++ SPECS/oracle-xe.spec	Sat Mar 14 19:26:56 2009
@@ -1,18 +1,9 @@
 # $Revision$, $Date$
 # TODO:
 # - read the license. Can we redistribute it?
-
-%define         _enable_debug_packages                  0
-%define         no_install_post_strip                   1
-%define         no_install_post_chrpath                 1
-
-%define		oracle_rel 1.0
-%define		oracle_ver 10.2.0
-%define		oracle_home /usr/lib/oracle/xe/app/oracle/product/%{oracle_ver}/server
-
-%define		mvln() \
-mv $RPM_BUILD_ROOT%{oracle_home}/%{1} $RPM_BUILD_ROOT%{2} \
-ln -s %{2}/%{1} $RPM_BUILD_ROOT%{oracle_home}/%{1}
+%define	oracle_rel	1.0
+%define	oracle_ver	10.2.0
+%define	oracle_home	/usr/lib/oracle/xe/app/oracle/product/%{oracle_ver}/server
 
 Summary:	Oracle XE
 Summary(pl.UTF-8):	Wyrocznia XE
@@ -35,6 +26,11 @@
 ExclusiveArch:	%{ix86}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_enable_debug_packages	0
+%define		no_install_post_strip	1
+%define		no_install_post_chrpath	1
+
+
 %description
 Oracle XE.
 
@@ -43,10 +39,8 @@
 
 %prep
 %setup -q -c -T
-
 rpm2cpio %{SOURCE0} | cpio -dimu
-
-sed 's#^ORACLE_HOME=$#ORACLE_HOME=%{oracle_home}#' < %{SOURCE2} > oracle-xe.sysconfig
+sed -e 's#^ORACLE_HOME=$#ORACLE_HOME=%{oracle_home}#' < %{SOURCE2} > oracle-xe.sysconfig
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,6 +56,10 @@
 install -d $RPM_BUILD_ROOT/var/lib/oracle/network/admin
 install -d $RPM_BUILD_ROOT/var/log/oracle
 
+%define	mvln() \
+mv $RPM_BUILD_ROOT%{oracle_home}/%{1} $RPM_BUILD_ROOT%{2} \
+ln -s %{2}/%{1} $RPM_BUILD_ROOT%{oracle_home}/%{1}
+
 %{mvln dbs /var/lib/oracle}
 #%%{mvln log /var/log/oracle}
 %{mvln rdbms/log /var/log/oracle}
@@ -99,17 +97,17 @@
 
 %files
 %defattr(644,root,root,755)
+%doc usr/share/doc/oracle_xe/*
 %{oracle_home}
 %dir %{_sysconfdir}/oracle-xe
-%attr(755,root,root) %{oracle_home}/bin/*
 %attr(754,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/rc.d/init.d/oracle-xe
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/oracle-xe
+%attr(755,root,root) %{oracle_home}/bin/*
 %attr(755,root,root) %{_datadir}/oracle/scripts
-%defattr(640,oracle,dba,755)
-/var/lib/oracle
-/var/log/oracle
-
-%doc usr/share/doc/oracle_xe/*
+%dir /var/lib/oracle
+%dir /var/log/oracle
+%attr(640,oracle,dba) /var/lib/oracle/*
+%attr(640,oracle,dba) /var/log/oracle/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -117,6 +115,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2009/03/14 18:26:56  glen
+- cosmetics (can't really test %files as no source0 here)
+
 Revision 1.8  2009/03/14 04:46:02  pawelz
 - do not remove tomcat user and group (-:
 
@@ -148,4 +149,3 @@
 Revision 1.1  2009/03/13 19:36:29  pawelz
 - initial
 - NFY (!)
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/oracle-xe.spec?r1=1.8&r2=1.9&f=u