Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: opensuse-commit (783 mails)

< Previous Next >
commit OpenOffice_org-ure for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 24 Apr 2009 01:03:58 +0200
  • Message-id: <20090423230358.EF621678164@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package OpenOffice_org-ure for
openSUSE:Factory
checked in at Fri Apr 24 01:03:58 CEST 2009.


--------
--- OpenOffice_org-ure/OpenOffice_org-ure.changes 2009-04-15
16:11:29.000000000 +0200
+++ OpenOffice_org-ure/OpenOffice_org-ure.changes 2009-04-17
17:53:37.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Apr 17 17:43:05 CEST 2009 - pmladek@xxxxxxx
+
+- updated ooo-build to version 3.0.99.5 (3.1-beta5)
+- added the SDK stuff (bnc#428403):
+ * added sdk source tarball
+ * added prebuilt unowinreg.dll
+ * fixed build of the SDK stuff together with the ure stuff
+ * added provides and obsoletes of OpenOffice_org-sdk to
+ OpenOffice_org-ure-devel
+ * created new subpackage ure-devel-doc; it provides and obsoletes the older
+ OpenOffice_org-sdk-doc
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
ooo310-m9-sdk.tar.bz2
ooo-build-3.0.99.4-piece-sdk-with-ure.diff
unowinreg.dll

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ OpenOffice_org-ure.spec ++++++
--- /var/tmp/diff_new_pack.W11248/_old 2009-04-24 00:48:01.000000000 +0200
+++ /var/tmp/diff_new_pack.W11248/_new 2009-04-24 00:48:01.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package OpenOffice_org-ure (Version 3.0.99.4)
+# spec file for package OpenOffice_org-ure (Version 3.0.99.5)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,9 +19,9 @@


Name: OpenOffice_org-ure
-Version: 3.0.99.4
-Release: 2
-%define ooo_build_version 3.0.99.4
+Version: 3.0.99.5
+Release: 1
+%define ooo_build_version 3.0.99.5
%define piece ure
#!BuildIgnore: OpenOffice_org
BuildRequires: OpenOffice_org-bootstrap = %version
@@ -35,9 +35,15 @@
Summary: OpenOffice.org UNO Runtime Environment
Url: http://www.openoffice.org/
Source0: %ooo_build_tag-%piece.tar.bz2
+Source1: %ooo_build_tag-sdk.tar.bz2
# prebuilt mono dlls for older distributions and ppc
Source100: ooo-cli-prebuilt-3.1.tar.bz2
-Patch1000: ooo-build-3.0.99.4-mono-2.4-build-fix-workaround.diff
+# necessary for SDK,
http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html
+# FIXME: can be built using mingw32 C++ compiler
+Source101: unowinreg.dll
+# FIXME: this patch is needed to build ure and sdk pieces at the same time
+Patch990: ooo-build-3.0.99.4-piece-sdk-with-ure.diff
+Patch991: ooo-build-3.0.99.4-mono-2.4-build-fix-workaround.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc

@@ -92,6 +98,8 @@
Requires: OpenOffice_org-mono = %version
Requires: OpenOffice_org-pyuno = %version
Requires: OpenOffice_org-bootstrap = %version
+Provides: OpenOffice_org-sdk = %version
+Obsoletes: OpenOffice_org-sdk <= %version
License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public
License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE
(MPL/NPL); X11/MIT
Summary: OpenOffice.org URE Development
Group: Productivity/Office/Suite
@@ -103,17 +111,38 @@



+%package devel-doc
+Requires: %name-devel = %version
+Provides: OpenOffice_org-sdk-doc = %version
+Obsoletes: OpenOffice_org-sdk-doc <= %version
+License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public
License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE
(MPL/NPL); X11/MIT
+Summary: OpenOffice.org URE Development
+Group: Productivity/Office/Suite
+AutoReqProv: off
+
+%description devel-doc
+This package allows developement based on the OpenOffice.org UNO
+runtime environment API.
+
+
+
%prep
-%setup -q -n %ooo_build_tag-%piece
+%setup -q -b1 -n %ooo_build_tag-%piece
+mv ../%ooo_build_tag-sdk/* .
+# prebuilt stuff
mkdir -p external/cli
tar -xjf %{S:100} -C external/cli
+cp %{S:101} odk/source/unowinreg/win
# FIXME: create fake prj stuff to make build happy
mkdir -p external/prj
touch external/prj/build.lst
touch external/prj/d.lst
-# hotfix
+# hotfixes
mkdir -p ooo-build/hotfixes
-cp %{P:1000} ooo-build/hotfixes
+cp %{P:990} ooo-build/hotfixes
+%if %suse_version > 1110
+cp %{P:991} ooo-build/hotfixes
+%endif

%build
# setup env.
@@ -129,7 +158,11 @@
export OO_INSTDIR=%{_libdir}/%ooo_home
export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
export DESTDIR=$RPM_BUILD_ROOT
+# install SDK first because it removes solver
+$OO_TOOLSDIR/piece/install-generic sdk %ooo_build_tag
$OO_TOOLSDIR/piece/install-generic %piece %ooo_build_tag
+# bin the SDK-related zip files from solver; they were installed together with
URE
+find $RPM_BUILD_ROOT%ooo_prefix/%ooo_home/solver -name "*.zip" -exec rm -f {}
\;

%clean
rm -rf $RPM_BUILD_ROOT
@@ -169,12 +202,25 @@
%files -f files-pyuno.txt -n OpenOffice_org-pyuno
%defattr(-,root,root)

-%files devel
+%files -f files-sdk.txt devel
%defattr(-,root,root)
%dir %ooo_prefix/%ooo_home/solver
%ooo_prefix/%ooo_home/solver/*

+%files -f files-sdk-doc.txt devel-doc
+%defattr(-,root,root)
+
%changelog
+* Fri Apr 17 2009 pmladek@xxxxxxx
+- updated ooo-build to version 3.0.99.5 (3.1-beta5)
+- added the SDK stuff (bnc#428403):
+ * added sdk source tarball
+ * added prebuilt unowinreg.dll
+ * fixed build of the SDK stuff together with the ure stuff
+ * added provides and obsoletes of OpenOffice_org-sdk to
+ OpenOffice_org-ure-devel
+ * created new subpackage ure-devel-doc; it provides and obsoletes the older
+ OpenOffice_org-sdk-doc
* Wed Apr 15 2009 pmladek@xxxxxxx
- added a workaround to fix build with mono-2.4 (bnc#495112)
* Wed Apr 08 2009 pmladek@xxxxxxx

++++++ ooo-build-3.0.99.4-piece-sdk-with-ure.diff ++++++
--- odk/util/makefile.pmk.old 2009-04-16 15:28:52.000000000 +0200
+++ odk/util/makefile.pmk 2009-04-16 16:30:10.000000000 +0200
@@ -62,11 +62,11 @@ DESTDIRGENCPPREF=$(DESTDIRDOCU)$/cpp$/re
DESTDIRJAVADOCU=$(DESTDIRDOCU)$/java
DESTDIRGENJAVAREF=$(DESTDIRDOCU)$/java$/ref

-BINOUT=$(SOLARBINDIR)
-INCOUT=$(SOLARINCDIR)
-IDLOUT=$(SOLARIDLDIR)
-XMLOUT=$(SOLARXMLDIR)
-LIBOUT=$(SOLARLIBDIR)
+BINOUT=$(SOLARPIECE)$/$(INPATH)$/bin
+INCOUT=$(SOLARPIECE)$/$(INPATH)$/inc
+IDLOUT=$(SOLARPIECE)$/$(INPATH)$/idl
+XMLOUT=$(SOLARPIECE)$/$(INPATH)$/xml
+LIBOUT=$(SOLARPIECE)$/$(INPATH)$/lib

CONVERTTAGSCRIPT=$(SOLARENV)$/bin$/converttags.pl
CONVERTTAGFLAGNAME=converttags_html_files.flag
@@ -197,7 +197,7 @@ INCLUDETOPDIRLIST= \
$(INCOUT)$/cppuhelper \
$(INCOUT)$/bridges \
$(INCOUT)$/registry \
- $(INCOUT)$/stl
+ $(SOLARINCDIR)$/stl

.IF "$(GUI)"=="WNT"
INCLUDETOPDIRLIST += $(INCOUT)$/systools
--- unodevtools/source/skeletonmaker/makefile.mk.old 2009-04-16
15:28:40.000000000 +0200
+++ unodevtools/source/skeletonmaker/makefile.mk 2009-04-16
15:39:07.000000000 +0200
@@ -51,8 +51,8 @@ APP1OBJS = $(OBJ)$/skeletonmaker.obj \
$(OBJ)$/javacompskeleton.obj \
$(OBJ)$/cppcompskeleton.obj

-APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN)
$(SOLARLIBDIR)$/$(CODEMAKERLIBDEPN) \
- $(SOLARLIBDIR)$/$(COMMONCPPLIBDEPN) $(SOLARLIBDIR)$/$(COMMONJAVALIBDEPN)
+APP1DEPN= $(OUT)$/lib$/$(UNODEVTOOLSLIBDEPN)
$(SOLARPIECE)$/$(INPATH)$/lib$/$(CODEMAKERLIBDEPN) \
+ $(SOLARPIECE)$/$(INPATH)$/lib$/$(COMMONCPPLIBDEPN)
$(SOLARPIECE)$/$(INPATH)$/lib$/$(COMMONJAVALIBDEPN)
APP1STDLIBS =\
$(UNODEVTOOLSLIBST) $(CODEMAKERLIBST) $(COMMONCPPLIBST)
$(COMMONJAVALIBST)\
$(REGLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALHELPERLIB) $(SALLIB)
--- odk/source/unoapploader/unx/makefile.mk.old 2009-04-02 12:54:49.000000000
+0200
+++ odk/source/unoapploader/unx/makefile.mk 2009-04-16 15:50:34.000000000
+0200
@@ -57,7 +57,7 @@ APP1RPATH=NONE

APP1TARGET= $(TARGET)

-APP1OBJS= $(OBJ)$/unoapploader.obj $(SOLARLIBDIR)$/findsofficepath.obj
+APP1OBJS= $(OBJ)$/unoapploader.obj
$(SOLARPIECE)$/$(INPATH)$/lib$/findsofficepath.obj

# --- Targets ------------------------------------------------------

--- odk/pack/gendocu/makefile.mk.old 2009-04-16 15:28:52.000000000 +0200
+++ odk/pack/gendocu/makefile.mk 2009-04-16 16:00:08.000000000 +0200
@@ -107,7 +107,7 @@ $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEA
-rm $(@:d:d)$/cpp.css
$(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css
$(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css

-$(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/$$(@:f)
+$(JAVA_SRC_FILES) : $(SOLARPIECE)$/$(INPATH)$/bin$/$$(@:f)
-$(MKDIRHIER) $(@:d)
$(MY_COPY) $< $@
cd $(JAVA_SRC_DIR) && unzip -quo $(@:f)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread