rpms/openoffice.org/devel .cvsignore, 1.181, 1.182 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.9, 1.10 openoffice.org.spec, 1.1602, 1.1603 sources, 1.309, 1.310 openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch, 1.1, NONE
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Aug 5 15:36:44 UTC 2008
- Previous message (by thread): rpms/python-tw-forms/F-9 python-tw-forms.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/kernel/devel patch-2.6.27-rc1-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.889, 1.890 git-linus.diff, 1.6, 1.7 kernel.spec, 1.850, 1.851 sources, 1.851, 1.852 upstream, 1.767, 1.768 patch-2.6.27-rc1-git5.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12859
Modified Files:
.cvsignore openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
openoffice.org.spec sources
Removed Files:
openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
Log Message:
first release version
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- .cvsignore 28 Jul 2008 11:20:56 -0000 1.181
+++ .cvsignore 5 Aug 2008 15:36:14 -0000 1.182
@@ -5,4 +5,4 @@
redhat-registry.tar.gz
redhat-langpacks.tar.gz
evolocal.odb
-DEV300_m28.tar.bz2
+OOO300_m1.tar.bz2
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:
Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 14 Apr 2008 10:28:01 -0000 1.9
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 5 Aug 2008 15:36:14 -0000 1.10
@@ -231,29 +231,6 @@
test_kde=yes
test_cups=yes
test_randr=yes
-@@ -874,12 +876,14 @@
- cygwin*) # Windows
- test_cups=no
- build_cairo=yes
-+ build_gstreamer=no
- _os=WINNT
- ;;
- darwin*) # Mac OS X
- test_cups=yes
- test_gtk=yes
- build_cairo=yes
-+ build_gstreamer=no
- test_randr=no
- _os=Darwin
- if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then
-@@ -930,6 +934,7 @@
- netbsd)
- test_gtk=yes
- build_cairo=yes
-+ build_gstreamer=yes
- test_kde=yes
- test_cups=no
- test_randr=yes
@@ -5406,6 +5411,26 @@
AC_SUBST(JCOMMON_SERIALIZER_JAR)
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1602
retrieving revision 1.1603
diff -u -r1.1602 -r1.1603
--- openoffice.org.spec 4 Aug 2008 09:09:46 -0000 1.1602
+++ openoffice.org.spec 5 Aug 2008 15:36:14 -0000 1.1603
@@ -1,6 +1,6 @@
-%define oootag DEV300
-%define ooomilestone 28
-%define rh_rpm_release 2
+%define oootag OOO300
+%define ooomilestone 1
+%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -37,7 +37,7 @@
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
Version: 3.0.0
-Release: 0.0.%{ooomilestone}.%{rh_rpm_release}%{?dist}
+Release: %{ooomilestone}.%{rh_rpm_release}%{?dist}
Epoch: 1
License: LGPLv3 and LGPLv2+ and MPLv1.1 and BSD
Group: Applications/Productivity
@@ -65,7 +65,7 @@
BuildRequires: lpsolve-devel, xalan-j2, xerces-j2, hsqldb, bsh, lucene
BuildRequires: mesa-libGLU-devel, redland-devel, ant, ant-apache-regexp
BuildRequires: jakarta-commons-codec, jakarta-commons-httpclient
-BuildRequires: jakarta-commons-lang
+BuildRequires: jakarta-commons-lang, lucene-contrib
Patch0: openoffice.org-simple-crash_report.sh
Patch1: openoffice.org-multiliblauncher.sh
@@ -103,11 +103,10 @@
Patch31: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
Patch32: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
Patch33: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch34: openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
-Patch35: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
-Patch36: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
-Patch37: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
-Patch38: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
+Patch34: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
+Patch35: openoffice.org-3.0.0.ooo91977.sd.holdreference.patch
+Patch36: openoffice.org-3.0.0.ooo92026.sd.disposed_during_disposing.patch
+Patch37: openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1255,11 +1254,10 @@
%patch31 -p1 -b .gccXXXXX.solenv.javaregistration.patch
%patch32 -p1 -b .ooo87970.vcl.samenamesubs.patch
%patch33 -p1 -b .ooo48400.svx.fixspelling.patch
-%patch34 -p1 -b .ooo90876.connectivity.evoab2.patch
-%patch35 -p1 -b .ooo86142.serbiannumbering.patch
-%patch36 -p1 -b .ooo91977.sd.holdreference.patch
-%patch37 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
-%patch38 -p1 -b .ooo92253.dbaccess.a11y.crash
+%patch34 -p1 -b .ooo86142.serbiannumbering.patch
+%patch35 -p1 -b .ooo91977.sd.holdreference.patch
+%patch36 -p1 -b .ooo92026.sd.disposed_during_disposing.patch
+%patch37 -p1 -b .ooo92253.dbaccess.a11y.crash
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1278,6 +1276,7 @@
--with-system-headers --with-system-apache-commons \
--with-commons-logging-jar=/usr/share/java/commons-logging.jar \
--with-lucene-core-jar=/usr/share/java/lucene.jar \
+ --with-lucene-analyzers-jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar \
--with-system-mozilla --with-system-libtextcat --with-system-redland \
--with-system-dicts --with-external-dict-dir=/usr/share/myspell \
--without-myspell-dicts --without-system-mspack --without-fonts --without-gpc \
@@ -3570,6 +3569,10 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Tue Aug 05 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-1.1
+- release branch
+- drop integrated openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch
+
* Sun Aug 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.28-2
- Resolves: rhbz#457193 openoffice.org-3.0.0.ooo92253.dbaccess.a11y.crash
- Resolves: rhbz#457529 reset number recognition default in writer back to
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- sources 1 Aug 2008 15:45:48 -0000 1.309
+++ sources 5 Aug 2008 15:36:14 -0000 1.310
@@ -3,6 +3,6 @@
1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
261ff401db54526e1f5cf7bbe5f2adaf redhat-langpacks.tar.gz
-16cb79cb018c6311e9797e85bd2461b2 evolocal.odb
-2362674845de839488237be1b3b2ccab DEV300_m28.tar.bz2
5ff04a5d754f6770f07e679856d682f3 redhat-registry.tar.gz
+16cb79cb018c6311e9797e85bd2461b2 evolocal.odb
+d7c686c83198c82d7c8a80cb21d34d0d OOO300_m1.tar.bz2
--- openoffice.org-3.0.0.ooo90876.connectivity.evoab2.patch DELETED ---
- Previous message (by thread): rpms/python-tw-forms/F-9 python-tw-forms.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/kernel/devel patch-2.6.27-rc1-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.889, 1.890 git-linus.diff, 1.6, 1.7 kernel.spec, 1.850, 1.851 sources, 1.851, 1.852 upstream, 1.767, 1.768 patch-2.6.27-rc1-git5.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list