[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org.spec,1.502,1.503



Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11622

Modified Files:
	openoffice.org.spec 
Log Message:
centralize that


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.502
retrieving revision 1.503
diff -u -r1.502 -r1.503
--- openoffice.org.spec	3 Oct 2005 10:48:43 -0000	1.502
+++ openoffice.org.spec	3 Oct 2005 10:52:52 -0000	1.503
@@ -1,5 +1,6 @@
 %define ooo2ver 1
 %define ooo_rpm_release 2
+%define ooo_base_name OOO680_m%{ooo2ver}
 %define build_fc5 1
 %define build_fc4 0
 %define build_rhel4 0
@@ -113,7 +114,7 @@
 Group:		Applications/Productivity
 URL:		http://www.openoffice.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-Source:		OOO680_m%{ooo2ver}.tar.bz2
+Source:		%{ooo_base_name}.tar.bz2
 Source1:	openoffice.org-jakubicons.tar.gz
 Source2:	openoffice.org-myspell-contrib.tar.gz
 Source3:	GSI_ta-IN.sdf
@@ -812,7 +813,7 @@
 Provides additional zulu translations for %{name}
 
 %prep
-%setup -q -n OOO680_m%{ooo2ver}
+%setup -q -n %{ooo_base_name}
 %patch0  -p1 -b .rh133741.alwaysgtk.desktop.patch
 %patch1  -p1 -b .rh161886.rpath.desktop.patch
 %patch2  -p1 -b .rh151357.setlangtolocale.patch
@@ -897,14 +898,14 @@
 echo "$find_provides | grep -v libxmlsec1 | grep -v libdb- | grep -v libicu" >> find-provides
 echo "exit 0" >> find-provides
 chmod +x find-provides
-%define __find_provides %{_builddir}/OOO680_m%{ooo2ver}/find-provides
+%define __find_provides %{_builddir}/%{ooo_base_name}/find-provides
 
 find_requires="%{__find_requires}"
 echo "#!/bin/sh" > find-requires
 echo "$find_requires | grep -v libxmlsec1 | grep -v libdb- | grep -v libicu | grep -v \(" >> find-requires
 echo "exit 0" >> find-requires
 chmod +x find-requires
-%define __find_requires %{_builddir}/OOO680_m%{ooo2ver}/find-requires
+%define __find_requires %{_builddir}/%{ooo_base_name}/find-requires
 #end ludicrous workaround
 %endif
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]