rpms/openoffice.org/devel .cvsignore, 1.80, 1.81 openoffice.org.spec, 1.493, 1.494 sources, 1.117, 1.118 workspace.cmcfixes19.patch, 1.2, 1.3
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Sep 26 12:26:01 UTC 2005
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15721
Modified Files:
.cvsignore openoffice.org.spec sources
workspace.cmcfixes19.patch
Log Message:
release candidate
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- .cvsignore 16 Sep 2005 07:09:18 -0000 1.80
+++ .cvsignore 26 Sep 2005 12:25:58 -0000 1.81
@@ -139,3 +139,4 @@
javavendors.xml
SRC680_m129.tar.bz2
SRC680_m130.tar.bz2
+OOO680_m1.tar.bz2
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.493
retrieving revision 1.494
diff -u -r1.493 -r1.494
--- openoffice.org.spec 23 Sep 2005 09:54:49 -0000 1.493
+++ openoffice.org.spec 26 Sep 2005 12:25:58 -0000 1.494
@@ -1,5 +1,5 @@
-%define ooo2ver 130
-%define ooo_rpm_release 2
+%define ooo2ver 1
+%define ooo_rpm_release 1
%define build_fc5 1
%define build_fc4 0
%define build_rhel4 0
@@ -11,7 +11,7 @@
%if %{build_rhel4}
%define usegcc3 1
-%define release_extension .0.rhel4
+%define release_extension 0
%define internalxmlsec 1
%define internalicu 1
%define internaljavabits 1
@@ -23,7 +23,7 @@
%endif
%if %{build_fc4}
%define usegcc3 0
-%define release_extension .1.fc4
+%define release_extension 1
%define internalxmlsec 1
%define internalicu 1
%define internaljavabits 1
@@ -35,7 +35,7 @@
%endif
%if %{build_fc5}
%define usegcc3 0
-%define release_extension .2.fc5
+%define release_extension 2
%define internalxmlsec 0
%define internalicu 0
%define internaljavabits 0
@@ -106,14 +106,14 @@
ExclusiveArch: %{ix86} ppc
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
-Version: 1.9.%{ooo2ver}
-Release: %{ooo_rpm_release}%{release_extension}
+Version: 2.0.0
+Release: %{ooo2ver}.%{ooo_rpm_release}.%{release_extension}
Epoch: 1
License: LGPL
Group: Applications/Productivity
URL: http://www.openoffice.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Source: SRC680_m%{ooo2ver}.tar.bz2
+Source: OOO680_m%{ooo2ver}.tar.bz2
Source1: openoffice.org-jakubicons.tar.gz
Source2: openoffice.org-myspell-contrib.tar.gz
Source3: GSI_ta-IN.sdf
@@ -813,7 +813,7 @@
Provides additional zulu translations for %{name}
%prep
-%setup -q -n SRC680_m%{ooo2ver}
+%setup -q -n OOO680_m%{ooo2ver}
%patch0 -p1 -b .rh133741.alwaysgtk.desktop.patch
%patch1 -p1 -b .rh161886.rpath.desktop.patch
%patch2 -p1 -b .rh151357.setlangtolocale.patch
@@ -895,14 +895,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}/SRC680_m%{ooo2ver}/find-provides
+%define __find_provides %{_builddir}/000680_m%{ooo2ver}/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}/SRC680_m%{ooo2ver}/find-requires
+%define __find_requires %{_builddir}/000680_m%{ooo2ver}/find-requires
#end ludicrous workaround
%endif
@@ -1117,9 +1117,9 @@
#make up some /usr/bin scripts
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-echo \#\!/bin/sh > $RPM_BUILD_ROOT/usr/bin/openoffice.org-1.9
-echo exec %{instdir}/program/soffice \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-1.9
-chmod a+x $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-1.9
+echo \#\!/bin/sh > $RPM_BUILD_ROOT/usr/bin/openoffice.org-2.0
+echo exec %{instdir}/program/soffice \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0
+chmod a+x $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0
echo \#\!/bin/sh > $RPM_BUILD_ROOT/usr/bin/ooffice
echo exec %{instdir}/program/soffice \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/ooffice
@@ -2735,7 +2735,7 @@
#spellchecking lib
%{instdir}/program/liblnth680*.so
#launchers
-%{_bindir}/openoffice.org-1.9
+%{_bindir}/openoffice.org-2.0
%{_bindir}/ooffice
%{_bindir}/ooviewdoc
#gnome integration
@@ -2784,10 +2784,10 @@
%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
%{_bindir}/oobase
%dir %{_datadir}/applications
-%{_datadir}/applications/openoffice.org-1.9-base.desktop
+%{_datadir}/applications/openoffice.org-*-base.desktop
%dir %{_datadir}/mimelnk
%dir %{_datadir}/mimelnk/application
-%{_datadir}/mimelnk/application/openoffice.org-1.9-oasis-database.desktop
+%{_datadir}/mimelnk/application/openoffice.org-*-oasis-database.desktop
%endif
%post core
@@ -2823,10 +2823,10 @@
%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
%{_bindir}/oobase
%dir %{_datadir}/applications
-%{_datadir}/applications/openoffice.org-1.9-base.desktop
+%{_datadir}/applications/openoffice.org-*-base.desktop
%dir %{_datadir}/mimelnk
%dir %{_datadir}/mimelnk/application
-%{_datadir}/mimelnk/application/openoffice.org-1.9-oasis-database.desktop
+%{_datadir}/mimelnk/application/openoffice.org-*-oasis-database.desktop
%post base
update-desktop-database -q %{_datadir}/applications
@@ -2886,7 +2886,7 @@
%{instdir}/share/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
%dir %{_datadir}/applications
-%{_datadir}/applications/openoffice.org-1.9-calc.desktop
+%{_datadir}/applications/openoffice.org-*-calc.desktop
%dir %{_datadir}/mimelnk
%dir %{_datadir}/mimelnk/application
%{_datadir}/mimelnk/application/*spreadsheet*
@@ -2936,7 +2936,7 @@
%{instdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
%dir %{_datadir}/applications
%if ! %{cripplemenus}
-%{_datadir}/applications/openoffice.org-1.9-draw.desktop
+%{_datadir}/applications/openoffice.org-*-draw.desktop
%endif
%dir %{_datadir}/mimelnk
%dir %{_datadir}/mimelnk/application
@@ -3021,7 +3021,7 @@
%{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
%dir %{_datadir}/applications
-%{_datadir}/applications/openoffice.org-1.9-writer.desktop
+%{_datadir}/applications/openoffice.org-*-writer.desktop
%dir %{_datadir}/mimelnk
%dir %{_datadir}/mimelnk/application
%{_datadir}/mimelnk/application/*master*
@@ -3078,7 +3078,7 @@
%{instdir}/share/registry/schema/org/openoffice/Office/UI/Effects.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
%dir %{_datadir}/applications
-%{_datadir}/applications/openoffice.org-1.9-impress.desktop
+%{_datadir}/applications/openoffice.org-*-impress.desktop
%dir %{_datadir}/mimelnk
%dir %{_datadir}/mimelnk/application
%{_datadir}/mimelnk/application/*presentation*
@@ -3132,7 +3132,7 @@
%{instdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
%dir %{_datadir}/applications
%if ! %{cripplemenus}
-%{_datadir}/applications/openoffice.org-1.9-math.desktop
+%{_datadir}/applications/openoffice.org-*-math.desktop
%endif
%dir %{_datadir}/mimelnk
%dir %{_datadir}/mimelnk/application
@@ -3239,6 +3239,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Mon Sep 26 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-1.1
+- release candidate 1
+
* Thu Sep 22 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.130-2
- add openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
- add openoffice.org-1.9.130.ooo54708.sc.patch
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- sources 16 Sep 2005 07:09:18 -0000 1.117
+++ sources 26 Sep 2005 12:25:58 -0000 1.118
@@ -7,4 +7,4 @@
66ee360bd11d33b0ba2283922d853706 opens___.ttf
f2fc336c9bd7672a13e58d39bbb4553f GSI_ga.sdf
49c02048e40f0b51a97abdb94d97dc1f javavendors.xml
-f4c1d0123e28319a2eac6df7d3b7c38d SRC680_m130.tar.bz2
+8755f66657a1ff1d01548af6ed9b7a3f OOO680_m1.tar.bz2
workspace.cmcfixes19.patch:
config_office/configure.in | 2 ++
filter/prj/build.lst | 2 +-
filter/source/config/fragments/makefile.mk | 8 ++++----
readlicense_oo/docs/readme.xsl | 2 +-
readlicense_oo/util/makefile.pmk | 12 ++++--------
sc/addin/datefunc/makefile.mk | 2 +-
sc/addin/rot13/makefile.mk | 4 ++--
sc/util/makefile.mk | 3 ++-
scp2/source/ooo/file_ooo.scp | 2 ++
scp2/source/ooo/makefile.mk | 4 ++++
svx/source/intro/makefile.mk | 1 +
svx/source/unodialogs/textconversiondlgs/makefile.mk | 2 ++
sw/util/makefile.mk | 1 +
wizards/prj/build.lst | 2 +-
14 files changed, 28 insertions(+), 19 deletions(-)
Index: workspace.cmcfixes19.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.cmcfixes19.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.cmcfixes19.patch 23 Sep 2005 12:33:54 -0000 1.2
+++ workspace.cmcfixes19.patch 26 Sep 2005 12:25:58 -0000 1.3
@@ -170,7 +170,7 @@
@+$(SED) -e "s#\([ \t]\)//\(.*\)#\1/*\2 */#" -e "s#^//\(.*\)#/*\1 */#" $(SOLARINCDIR)$/tools$/lang.hxx >$@
-$(SLOFILES) : $(INCCOM)$/xlang.h
-+$(SLOFILES) : $(INCCOM)$/xlang.h $(CFILES)
++$(SLOFILES) : $(INCCOM)$/xlang.h $(MISC)$/x$(TARGET).c
$(MISC)$/$(TARGET).lst : \
$(MISC)$/x$(TARGET).c \
@@ -182,12 +182,16 @@
diff -u -p -u -r1.6 -r1.6.12.1
--- openoffice.org.orig/sc/addin/rot13/makefile.mk 8 Sep 2005 17:20:04 -0000 1.6
+++ openoffice.org/sc/addin/rot13/makefile.mk 22 Sep 2005 11:55:34 -0000 1.6.12.1
-@@ -94,7 +94,7 @@ $(MISC)$/cl2c.pl: ..$/util$/cl2c.pl
- $(INCCOM)$/xlang.h : $(SOLARINCDIR)$/tools$/lang.hxx
+@@ -91,10 +91,10 @@
+ .ENDIF
+
+ # convert C++ //... comments to C /*...*/ comments without affecting http://...
+-$(INCCOM)$/xlang.h : $(SOLARINCDIR)$/tools$/lang.hxx
++$(INCCOM)$/xlang.h : $(SOLARINCDIR)$/tools$/lang.hxx $(MISC)$/x$(TARGET).c
@+$(SED) -e "s#\([ \t]\)//\(.*\)#\1/*\2 */#" -e "s#^//\(.*\)#/*\1 */#" $(SOLARINCDIR)$/tools$/lang.hxx >$@
-$(SLOFILES) : $(INCCOM)$/xlang.h
-+$(SLOFILES) : $(INCCOM)$/xlang.h $(CFILES)
++$(SLOFILES) : $(INCCOM)$/xlang.h
$(MISC)$/rot.lst : \
$(MISC)$/x$(TARGET).c \
More information about the fedora-cvs-commits
mailing list