rpms/openoffice.org/devel openoffice.org.spec,1.1235,1.1236

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Fri Aug 3 10:08:59 UTC 2007


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29139

Modified Files:
	openoffice.org.spec 
Log Message:
list licenses in use in OOo


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1235
retrieving revision 1.1236
diff -u -r1.1235 -r1.1236
--- openoffice.org.spec	2 Aug 2007 19:22:52 -0000	1.1235
+++ openoffice.org.spec	3 Aug 2007 10:08:26 -0000	1.1236
@@ -1,6 +1,6 @@
 %define oootag OOF680
 %define ooomilestone 18
-%define rh_rpm_release 7
+%define rh_rpm_release 8
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -37,7 +37,7 @@
 Version:        2.2.1
 Release: 	%{ooomilestone}.%{rh_rpm_release}%{?dist}
 Epoch:		1
-License:	LGPLv2
+License:	LGPLv2 and LGPLv2+ and MPLv1.1 and BSD
 Group:		Applications/Productivity
 URL:		http://www.openoffice.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -2693,6 +2693,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Aug 03 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.8
+- clarify licenses is use in OOo
+
 * Tue Jul 24 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.7
 - Resolves: ooo#79953 inhibit screensaver during presentations
 - Resolves: rhbz#249196 propogate font width types up from the font ooo#79878




More information about the fedora-extras-commits mailing list