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

rpms/openoffice.org/devel openoffice.org.spec,1.524,1.525



Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
some defines to make SRC/OOO an easy swap


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.524
retrieving revision 1.525
diff -u -r1.524 -r1.525
--- openoffice.org.spec	3 Nov 2005 16:07:48 -0000	1.524
+++ openoffice.org.spec	4 Nov 2005 10:56:03 -0000	1.525
@@ -1,6 +1,8 @@
-%define ooo2ver 3
-%define ooo_rpm_release 7.cmc1
-%define ooo_base_name OOO680_m%{ooo2ver}
+%define oootag OOO680
+%define ooomilestone 3
+%define rh_rpm_release 7.cmc1
+%define ooo_base_name %{oootag}_m%{ooomilestone}
+
 %define build_fc5 1
 %define build_fc4 0
 %define build_rhel4 0
@@ -12,7 +14,7 @@
 
 %if %{build_rhel4}
 %define usegcc3 1
-%define release_extension 0
+%define rh_rpm_extension 0
 %define internalxmlsec 1
 %define internalicu 0
 %define internaljavabits 0
@@ -24,7 +26,7 @@
 %endif
 %if %{build_fc4}
 %define usegcc3 0
-%define release_extension 1
+%define rh_rpm_extension 1
 %define internalxmlsec 1
 %define internalicu 1
 %define internaljavabits 1
@@ -36,7 +38,7 @@
 %endif
 %if %{build_fc5}
 %define usegcc3 0
-%define release_extension 2
+%define rh_rpm_extension 2
 %define internalxmlsec 0
 %define internalicu 0
 %define internaljavabits 0
@@ -108,7 +110,7 @@
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        2.0.0
-Release: 	%{ooo2ver}.%{ooo_rpm_release}.%{release_extension}
+Release: 	%{ooomilestone}.%{rh_rpm_release}.%{rh_rpm_extension}
 Epoch:		1
 License:	LGPL
 Group:		Applications/Productivity


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