rpm/libreoffice
SHA256
1
0
Fork 0
forked from pool/libreoffice
Code Pull Requests Activity

Accepting request 112476 from LibreOffice:Unstable

Browse Source 
- updated to libreoffice-3.5.5.2 (3.5.2-rc2)
- did some clean up

OBS-URL: https://build.opensuse.org/request/show/112476
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=30
This commit is contained in:
Stephan Kulow 2012-04-04 17:20:25 +00:00 committed by Git OBS Bridge
parent 2f663aef22
commit da85248be7
120 changed files with 2290 additions and 26139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2
size 14884071

3
0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dfb8933dada706a1b3188b162fc5a9686b5ed46323bf09548ce291e8dd4545e2
size 467089

3
128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5677badffc48a8d332e345ea4fe225e3577f53fc95deeec8306000b256829655
size 540999

3
34dd7951abbda99b7a75a09993a37965-libwps-0.2.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:48a5bcc0fa8e51a27ec949937dba384e16c2f13a2ec727864af78df077d20c9f
size 314984

3
5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d823f4b2ddfe349cca09e40bd57af8220e8bf935bcfb66be520e02ba4d327dc6
size 326684

3
7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78e6244c96c29c01babf38cd5176bcd9b5bafa8730bb84082340c691c70dfe76
size 373519

22230
801-sdbc-postgresql.diff
View File

File diff suppressed because it is too large Load Diff

19
802-sdbc-postgresql-build-lst.diff
View File

@ -1,19 +0,0 @@
---
connectivity/prj/build.lst | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git connectivity/prj/build.lst connectivity/prj/build.lst
index 0b15c06..b693d45 100644
--- connectivity/prj/build.lst
+++ connectivity/prj/build.lst
@@ -18,6 +18,7 @@ cn connectivity\source\drivers\calc nmake - all cn_calc cn_f
cn connectivity\source\drivers\odbcbase nmake - all cn_odbcbase cn_dbtools cn_inc NULL
cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_odbcbase cn_inc NULL
cn connectivity\source\drivers\mysql nmake - all cn_mysql cn_dbtools cn_inc NULL
+cn connectivity\source\drivers\postgresql nmake - all cn_postgresql cn_dbtools cn_inc NULL
cn connectivity\source\drivers\jdbc nmake - all cn_jdbc cn_dbtools cn_inc NULL
cn connectivity\source\drivers\adabas nmake - all cn_adabas cn_dbtools cn_odbcbase cn_inc NULL
cn connectivity\source\drivers\file nmake - all cn_file cn_dbtools cn_inc NULL
--
1.7.0.1

1402
803-connectivity-workben-postgresql.diff
View File

File diff suppressed because it is too large Load Diff

87
804-gcc-4.3-postgresql.diff
View File

@ -1,87 +0,0 @@
---
.../drivers/postgresql/pq_preparedstatement.cxx | 2 ++
.../drivers/postgresql/pq_resultsetmetadata.cxx | 1 +
.../source/drivers/postgresql/pq_statement.cxx | 1 +
.../source/drivers/postgresql/pq_statics.cxx | 2 ++
.../source/drivers/postgresql/pq_tools.cxx | 1 +
.../drivers/postgresql/pq_updateableresultset.cxx | 2 ++
6 files changed, 9 insertions(+), 0 deletions(-)
diff --git connectivity/source/drivers/postgresql/pq_preparedstatement.cxx connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 1d66a8a..5fadf16 100644
--- connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -77,6 +77,8 @@
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
+#include <string.h>
+
using osl::Mutex;
using osl::MutexGuard;
diff --git connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index d351b4c..1c7b768 100644
--- connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -69,6 +69,7 @@
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
+#include <string.h>
using osl::Mutex;
using osl::MutexGuard;
diff --git connectivity/source/drivers/postgresql/pq_statement.cxx connectivity/source/drivers/postgresql/pq_statement.cxx
index b60edfc..086cd22 100644
--- connectivity/source/drivers/postgresql/pq_statement.cxx
+++ connectivity/source/drivers/postgresql/pq_statement.cxx
@@ -86,6 +86,7 @@
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <string.h>
using osl::Mutex;
using osl::MutexGuard;
diff --git connectivity/source/drivers/postgresql/pq_statics.cxx connectivity/source/drivers/postgresql/pq_statics.cxx
index 177571d..71fbbff 100644
--- connectivity/source/drivers/postgresql/pq_statics.cxx
+++ connectivity/source/drivers/postgresql/pq_statics.cxx
@@ -64,6 +64,8 @@
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <string.h>
+
using rtl::OUString;
using com::sun::star::uno::Sequence;
using com::sun::star::uno::Any;
diff --git connectivity/source/drivers/postgresql/pq_tools.cxx connectivity/source/drivers/postgresql/pq_tools.cxx
index c6b16e0..1f91984 100644
--- connectivity/source/drivers/postgresql/pq_tools.cxx
+++ connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -16,6 +16,7 @@
#include "pq_statics.hxx"
#include <libpq-fe.h>
+#include <string.h>
using rtl::OUString;
using rtl::OUStringBuffer;
diff --git connectivity/source/drivers/postgresql/pq_updateableresultset.cxx connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
index 7efa005..6793373 100644
--- connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
+++ connectivity/source/drivers/postgresql/pq_updateableresultset.cxx
@@ -12,6 +12,8 @@
#include "pq_tools.hxx"
#include "pq_statics.hxx"
+#include <string.h>
+
using osl::MutexGuard;
using rtl::OUString;
--
1.7.0.1

48
805-sdbc-postgresql-config_office.diff
View File

@ -1,48 +0,0 @@
---
configure.in | 17 +++++++++++++++++
set_soenv.in | 1 +
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git configure.in configure.in
index cc0f65b..3620984 100644
--- configure.in
+++ configure.in
@@ -4239,6 +4239,23 @@ AC_SUBST(SYSTEM_HSQLDB)
AC_SUBST(HSQLDB_JAR)
dnl ===================================================================
+dnl Check for PostgreSQL stuff
+dnl ===================================================================
+AC_PATH_PROG(PGCONFIG, pg_config)
+if test -z "$PGCONFIG"; then
+ AC_MSG_ERROR([pg_config needed])
+fi
+save_CFLAGS=$CFLAGS
+save_LIBS=$LIBS
+CFLAGS="-I`pg_config --includedir`"
+AC_CHECK_HEADER([libpq-fe.h], [], [AC_MSG_ERROR([libpq-fe.h is needed])], [])
+AC_HAVE_LIBRARY(pq, [], [AC_MSG_ERROR(libpq is needed)], [])
+CFLAGS=$save_CFLAGS
+LIBS=$save_LIBS
+SYSTEM_POSTGRESQL=YES # only option atm :-)
+AC_SUBST(SYSTEM_POSTGRESQL)
+
+dnl ===================================================================
dnl Check for system beanshell
dnl ===================================================================
AC_MSG_CHECKING([which beanshell to use])
diff --git set_soenv.in set_soenv.in
index d36115a..ababa63 100644
--- set_soenv.in
+++ set_soenv.in
@@ -1935,6 +1935,7 @@ ToFile( "USE_XINERAMA", "@USE_XINERAMA@", "e" );
ToFile( "SYSTEM_REDLAND", "@SYSTEM_REDLAND@", "e" );
ToFile( "REDLAND_CFLAGS", "@REDLAND_CFLAGS@", "e" );
ToFile( "REDLAND_LIBS", "@REDLAND_LIBS@", "e" );
+ToFile( "SYSTEM_POSTGRESQL", "@SYSTEM_POSTGRESQL@", "e" );
ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );
ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );
--
1.7.0.1

72
806-sdbc-postgresql-oxt.diff
View File

@ -1,72 +0,0 @@
--- connectivity/source/drivers/postgresql/manifest.xml.old 2010-11-26 19:01:13.000000000 +0100
+++ connectivity/source/drivers/postgresql/manifest.xml 2010-11-25 21:18:03.000000000 +0100
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
+<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
+ manifest:full-path="postgresql-sdbc-impl.uno.so"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
+ manifest:full-path="postgresql-sdbc.uno.so"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+ manifest:full-path="postgresql.xcu"/>
+</manifest:manifest>
--- connectivity/source/drivers/postgresql/description.xml.old 2010-11-26 19:01:26.000000000 +0100
+++ connectivity/source/drivers/postgresql/description.xml 2010-11-26 18:59:36.000000000 +0100
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dep="http://openoffice.org/extensions/description/2006">
+ <version value="0.7.6b" />
+ <identifier value="postgresql-sdbc" />
+ <display-name>
+ <name lang="en-US">Postgresql-SDBC Driver</name>
+ </display-name>
+ <dependencies>
+ <OpenOffice.org-minimal-version value="3.3" dep:name="OpenOffice.org 3.3"/>
+ </dependencies>
+ <publisher>
+ <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name>
+ </publisher>
+</description>
--- connectivity/source/drivers/postgresql/makefile.mk.old 2010-11-19 22:21:03.000000000 +0100
+++ connectivity/source/drivers/postgresql/makefile.mk 2010-11-26 19:54:38.000000000 +0100
@@ -176,7 +176,7 @@ SHL2VERSIONMAP=$(SOLARENV)$/src$/compone
SLOFILES= $(LIB1OBJFILES) $(LIB2OBJFILES)
-DRIVERNAME=postgresql-sdbc-$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO).zip
+DRIVERNAME=postgresql-sdbc-$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO).oxt
ALLTAR : $(DLLDEST)$/$(DRIVERNAME)
# --- Targets ------------------------------------------------------
@@ -191,19 +191,29 @@
$(DLLDEST)$/$(SHL1TARGET)$(INI_EXT): $(SHL1TARGET)
+cp $? $@
-
$(DLLDEST)$/$(DRIVERNAME): \
+ $(DLLDEST)$/META-INF$/manifest.xml \
+ $(DLLDEST)$/description.xml \
$(DLLDEST)$/postgresql.xcu \
$(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) \
$(DLLDEST)$/$(SHL2TARGET)$(DLLPOST) \
$(DLLDEST)$/$(SHL1TARGET)$(INI_EXT)
+cd $(DLLDEST) && \
zip -r $(DRIVERNAME) \
+ META-INF$/manifest.xml \
$(SHL1TARGET)$(DLLPOST) \
$(SHL2TARGET)$(DLLPOST) \
$(SHL1TARGET)$(INI_EXT) \
+ description.xml \
postgresql.xcu
+$(DLLDEST)$/META-INF$/manifest.xml : manifest.xml
+ -mkdir -p $(DLLDEST)$/META-INF
+ +cp $? $@
+
+$(DLLDEST)$/description.xml : description.xml
+ +cp $? $@
+
$(DLLDEST)$/postgresql.xcu : postgresql.xcu
-rm -f $@
cat postgresql.xcu > $@

101
807-sdbc-postgresql-obsolete-hash-map.diff
View File

@ -1,101 +0,0 @@
--- connectivity/source/drivers/postgresql/pq_connection.hxx.old 2011-08-16 12:26:22.000000000 +0200
+++ connectivity/source/drivers/postgresql/pq_connection.hxx 2011-08-16 16:39:55.000000000 +0200
@@ -61,7 +61,7 @@
#ifndef _PQ_CONNECTION_HXX_
#define _PQ_CONNECTION_HXX_
-#include <hash_map>
+#include <tr1/unordered_map>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -168,7 +168,7 @@ struct HashByteSequence
}
};
-typedef ::std::hash_map<
+typedef std::tr1::unordered_map<
::rtl::ByteSequence,
::com::sun::star::uno::WeakReference< com::sun::star::sdbc::XCloseable >,
HashByteSequence,
@@ -179,11 +179,11 @@ typedef ::std::vector< rtl::OString, All
-typedef std::hash_map
+typedef std::tr1::unordered_map
<
const sal_Int32,
rtl::OUString,
- ::std::hash< sal_Int32 >,
+ ::std::tr1::hash< sal_Int32 >,
::std::equal_to< sal_Int32 >,
Allocator< ::std::pair< sal_Int32, ::rtl::OUString > >
> Int2StringMap;
--- connectivity/source/drivers/postgresql/pq_statics.hxx.old 2011-08-16 12:26:22.000000000 +0200
+++ connectivity/source/drivers/postgresql/pq_statics.hxx 2011-08-16 16:45:07.000000000 +0200
@@ -61,7 +61,7 @@
#ifndef _PQ_STATICS_HXX_
#define _PQ_STATICS_HXX_
-#include <hash_map>
+#include <tr1/unordered_map>
#include <vector>
#include <rtl/uuid.h>
@@ -131,7 +131,7 @@ struct TypeDetails
sal_Bool isSearchable;
};
-typedef ::std::hash_map
+typedef ::std::tr1::unordered_map
<
rtl::OUString,
sal_Int32,
--- connectivity/source/drivers/postgresql/pq_xcontainer.hxx.old 2011-08-16 12:26:22.000000000 +0200
+++ connectivity/source/drivers/postgresql/pq_xcontainer.hxx 2011-08-16 16:44:56.000000000 +0200
@@ -61,7 +61,7 @@
#ifndef _PQ_CONTAINER_HXX_
#define _PQ_CONTAINER_HXX_
-#include <hash_map>
+#include <tr1/unordered_map>
#include <vector>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -111,7 +111,7 @@ public:
}
};
-typedef ::std::hash_map
+typedef ::std::tr1::unordered_map
<
rtl::OUString,
sal_Int32,
--- connectivity/source/drivers/postgresql/pq_tools.hxx.old 2011-08-16 12:26:22.000000000 +0200
+++ connectivity/source/drivers/postgresql/pq_tools.hxx 2011-08-16 16:46:51.000000000 +0200
@@ -154,7 +154,7 @@ com::sun::star::uno::Sequence< sal_Int32
com::sun::star::uno::Sequence< rtl::OUString > convertMappedIntArray2StringArray(
const Int2StringMap &map, const com::sun::star::uno::Sequence< sal_Int32> &source );
-typedef std::hash_map
+typedef std::tr1::unordered_map
<
::rtl::OString,
::rtl::OString,
--- connectivity/source/drivers/postgresql/pq_databasemetadata.cxx.old 2011-08-16 12:26:22.000000000 +0200
+++ connectivity/source/drivers/postgresql/pq_databasemetadata.cxx 2011-08-16 16:50:26.000000000 +0200
@@ -1107,11 +1107,11 @@ struct DatabaseTypeDescription
OUString typeType;
};
-typedef std::hash_map
+typedef std::tr1::unordered_map
<
sal_Int32,
DatabaseTypeDescription,
- ::std::hash< sal_Int32 >,
+ ::std::tr1::hash< sal_Int32 >,
::std::equal_to< sal_Int32 >,
Allocator< ::std::pair< sal_Int32, DatabaseTypeDescription > >
> Oid2DatabaseTypeDescriptionMap;

9
808-sdbc-postgresql-deliver.diff
View File

@ -1,9 +0,0 @@
--- connectivity/prj/d.lst.old 2011-05-19 12:27:40.000000000 +0200
+++ connectivity/prj/d.lst 2011-08-16 17:29:34.000000000 +0200
@@ -1,5 +1,6 @@
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
+..\%__SRC%\lib\*.oxt %_DEST%\bin%_EXT%\*.oxt
..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
..\%__SRC%\lib\*.jnilib %_DEST%\lib%_EXT%\*.jnilib

15
809-sdbc-postgresql-gcc-4.6.diff
View File

@ -1,15 +0,0 @@
--- connectivity/source/drivers/postgresql/pq_allocator.hxx.old 2011-08-18 20:20:44.000000000 +0200
+++ connectivity/source/drivers/postgresql/pq_allocator.hxx 2011-08-18 20:20:44.000000000 +0200
@@ -176,6 +176,12 @@ public:
}
//-----------------------------------------
+ void construct (pointer p)
+ {
+ new ((void*)p)T;
+ }
+
+ //-----------------------------------------
void destroy (pointer p)
{
p->~T();

20
810-sdbc-postgresql-lo-3.4-registration.diff
View File

@ -1,20 +0,0 @@
--- connectivity/source/drivers/postgresql/makefile.mk.old 2011-08-29 19:17:52.000000000 +0200
+++ connectivity/source/drivers/postgresql/makefile.mk 2011-08-29 19:17:52.000000000 +0200
@@ -115,7 +115,7 @@ SHL1STDLIBS= \
SHL1LIBS= $(LIB1TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
-SHL1VERSIONMAP=$(SOLARENV)$/src$/component.map
+SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
# use the static version
.IF "$(GUI)"=="WNT"
@@ -170,7 +170,7 @@ SHL2STDLIBS= \
SHL2LIBS= $(LIB2TARGET)
SHL2DEF= $(MISC)$/$(SHL2TARGET).def
DEF2NAME= $(SHL2TARGET)
-SHL2VERSIONMAP=$(SOLARENV)$/src$/component.map
+SHL2VERSIONMAP=$(SOLARENV)$/src$/reg-component.map
SLOFILES= $(LIB1OBJFILES) $(LIB2OBJFILES)

52
831-mozilla-no-xul-config.diff
View File

@ -1,52 +0,0 @@
--- configure.in.old 2011-08-25 18:51:45.000000000 +0200
+++ configure.in 2011-08-29 14:29:38.000000000 +0200
@@ -5093,13 +5093,20 @@ if test -n "$with_system_mozilla" && tes
PKG_CHECK_MODULES( MOZ_NSPR, $MOZ_FLAVOUR-nspr )
fi
- if test "$MOZ_FLAVOUR" != "libxul"; then
+ WITH_MOZILLA_XUL=YES
+ if test "$MOZ_FLAVOUR" = "mozilla"; then
+ # firefox changed the development model, so there is not longer a stable API
+ # some distros provide only mozilla-nss and mozilla-nspr but not the XUL stuff
+ PKG_CHECK_EXISTS($MOZ_FLAVOUR-xpcom, , [WITH_MOZILLA_XUL=NO])
+ fi
+
+ if test "$MOZ_FLAVOUR" != "libxul" -a "$WITH_MOZILLA_XUL" = "YES" ; then
PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom, HASXPCOM="TRUE", HASXPCOM="" )
MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
fi
- if test -z "$HASXPCOM"; then
+ if test -z "$HASXPCOM" -a "$WITH_MOZILLA_XUL" = "YES" ; then
PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
MOZ_LIB=`$PKG_CONFIG --variable=libdir libxul`
@@ -5327,6 +5332,7 @@ AC_SUBST(ENABLE_NSS_MODULE)
AC_SUBST(MOZILLABUILD)
AC_SUBST(SYSTEM_MOZILLA)
AC_SUBST(MOZ_FLAVOUR)
+AC_SUBST(WITH_MOZILLA_XUL)
AC_SUBST(MOZ_INC)
AC_SUBST(MOZ_LIB)
AC_SUBST(MOZ_LIB_XPCOM)
--- set_soenv.in.old 2011-08-25 18:51:45.000000000 +0200
+++ set_soenv.in 2011-08-29 14:52:00.000000000 +0200
@@ -1411,7 +1411,7 @@ elsif ($platform =~ m/darwin/)
}
-if ($SYSTEM_MOZILLA eq "YES")
+if ($SYSTEM_MOZILLA eq "YES" && "@MOZ_LIB@" ne "")
{
$SOLARLIB .= $L."@MOZ_LIB@"
}
@@ -1892,6 +1892,7 @@ ToFile( "WITH_OPENLDAP", "@WITH_OPEN
ToFile( "WITH_MOZILLA", "@WITH_MOZILLA@", "e" );
ToFile( "SYSTEM_MOZILLA", "@SYSTEM_MOZILLA@", "e" );
ToFile( "MOZ_FLAVOUR", "@MOZ_FLAVOUR@", "e" );
+ToFile( "WITH_MOZILLA_XUL", "@WITH_MOZILLA_XUL@", "e" );
ToFile( "NSPR_LIB", "@NSPR_LIB@", "e" );
ToFile( "NSS_LIB", "@NSS_LIB@", "e" );
ToFile( "MOZ_INC", "@MOZ_INC@", "e" );

3
831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba148991ebb48988ddd97706574ff6fec8a60d06c88d0e26961979636f7a5a6a
size 169510

24
832-mozilla-no-xul-cui.diff
View File

@ -1,24 +0,0 @@
--- cui/source/options/treeopt.cxx.old 2011-05-20 18:05:12.000000000 +0200
+++ cui/source/options/treeopt.cxx 2011-08-29 17:03:53.000000000 +0200
@@ -2128,7 +2128,7 @@ void OfaTreeOptionsDialog::Initialize( c
if ( nPageId == RID_SVXPAGE_INET_MAIL )
continue;
#endif
-#if defined MACOSX
+#if defined MACOSX || !defined WITH_MOZILLA_XUL
// Disable Mozilla Plug-in tab-page on Mac
if ( nPageId == RID_SVXPAGE_INET_MOZPLUGIN )
continue;
--- cui/source/options/makefile.mk.old 2011-08-29 18:30:17.000000000 +0200
+++ cui/source/options/makefile.mk 2011-08-29 16:28:25.000000000 +0200
@@ -38,6 +38,10 @@ ENABLE_EXCEPTIONS=TRUE
CFLAGS+= -DENABLE_LAYOUT=1 -I../$(PRJ)/layout/inc -I../$(PRJ)/layout/$(INPATH)/inc
.ENDIF # ENABLE_LAYOUT == TRUE
+.IF "$(WITH_MOZILLA_XUL)" == "YES"
+CFLAGS+= -DWITH_MOZILLA_XUL
+.ENDIF
+
# --- Files --------------------------------------------------------
SRS1NAME=options

53
833-mozilla-no-xul-extensions.diff
View File

@ -1,53 +0,0 @@
--- extensions/source/plugin/unx/makefile.mk.old 2011-05-20 18:05:12.000000000 +0200
+++ extensions/source/plugin/unx/makefile.mk 2011-08-29 16:36:14.000000000 +0200
@@ -48,7 +48,7 @@ INCPRE+=-I$(SOLARINCDIR)$/mozilla$/nspr
CDEFS+=-DOJI
.ENDIF
-.IF "$(WITH_MOZILLA)" != "NO"
+.IF "$(WITH_MOZILLA)" != "NO" && "$(WITH_MOZILLA_XUL)" != "NO"
.IF "$(DISABLE_XAW)" == "TRUE"
CDEFS+=-DDISABLE_XAW
--- extensions/source/plugin/base/makefile.mk.old 2011-05-20 18:05:12.000000000 +0200
+++ extensions/source/plugin/base/makefile.mk 2011-08-29 14:57:18.000000000 +0200
@@ -44,7 +44,7 @@ CDEFS+=-DOJI
CDEFS+=-DDISABLE_XAW
.ENDIF
-.IF "$(WITH_MOZILLA)" != "NO"
+.IF "$(WITH_MOZILLA)" != "NO" && "$(WITH_MOZILLA_XUL)" != "NO"
.IF "$(GUIBASE)"=="aqua"
CFLAGSCXX+=$(OBJCXXFLAGS)
--- extensions/source/plugin/util/makefile.pmk.old 2011-05-19 11:11:12.000000000 +0200
+++ extensions/source/plugin/util/makefile.pmk 2011-08-29 14:58:04.000000000 +0200
@@ -28,7 +28,7 @@ NOUNODOC=true
.INCLUDE : settings.mk
-.IF "$(SYSTEM_MOZILLA)" == "YES"
+.IF "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA_XUL)" != "NO"
CFLAGS+=-DSYSTEM_MOZILLA
PKGCONFIG_MODULES+=$(MOZ_FLAVOUR)-plugin
.ENDIF
--- extensions/source/plugin/util/makefile.mk.old 2011-05-19 11:11:12.000000000 +0200
+++ extensions/source/plugin/util/makefile.mk 2011-08-29 16:30:52.000000000 +0200
@@ -36,7 +36,7 @@ TARGETTYPE=GUI
# --- Files --------------------------------------------------------
-.IF "$(WITH_MOZILLA)" != "NO"
+.IF "$(WITH_MOZILLA)" != "NO" && "$(WITH_MOZILLA_XUL)" != "NO"
LIB1TARGET = $(SLB)$/plall.lib
LIB1FILES = \
@@ -91,7 +91,7 @@ SHL1STDLIBS+=$(X11LINK_DYNAMIC)
SHL1STDLIBS+=$(SHL1OWNLIBS)
-.ENDIF # $(WITH_MOZILLA) != "NO"
+.ENDIF # $(WITH_MOZILLA) != "NO" && "$(WITH_MOZILLA_XUL)" != "NO"
# --- Targets ------------------------------------------------------

62
834-mozilla-no-xul-scp2.diff
View File

@ -1,62 +0,0 @@
--- scp2/source/ooo/makefile.mk.old 2011-08-23 18:42:11.000000000 +0200
+++ scp2/source/ooo/makefile.mk 2011-08-29 15:18:24.000000000 +0200
@@ -127,6 +127,10 @@ SCPDEFS+=-DSYSTEM_DB
SCPDEFS+=-DWITHOUT_MOZILLA
.ENDIF
+.IF "$(WITH_MOZILLA_XUL)" == "YES"
+SCPDEFS+=-DWITH_MOZILLA_XUL
+.ENDIF
+
.IF "$(WITH_MYSPELL_DICTS)" == "NO"
SCPDEFS+=-DWITHOUT_MYSPELL_DICTS
.ENDIF
--- scp2/source/ooo/file_library_ooo.scp.old 2011-08-23 18:42:11.000000000 +0200
+++ scp2/source/ooo/file_library_ooo.scp 2011-08-29 15:19:43.000000000 +0200
@@ -1086,7 +1086,7 @@ End
STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deploymentmisc)
-#ifndef WITHOUT_MOZILLA
+#if ! defined(WITHOUT_MOZILLA) && defined (WITH_MOZILLA_XUL)
STD_LIB_FILE( gid_File_Lib_Pl , pl)
#endif
--- scp2/source/ooo/common_brand.scp.old 2011-08-25 18:51:45.000000000 +0200
+++ scp2/source/ooo/common_brand.scp 2011-08-29 16:42:11.000000000 +0200
@@ -618,7 +618,7 @@ File gid_Brand_File_Bin_Libxml2
End
#endif
-#if !defined WITHOUT_MOZILLA && (!defined UNX || defined ENABLE_GTK)
+#if !defined WITHOUT_MOZILLA && (!defined UNX || defined ENABLE_GTK) && defined WITH_MOZILLA_XUL
File gid_Brand_File_Lib_Npsoplugin
BIN_FILE_BODY;
Name = SPECIAL_NAME(npsoplugin);
--- scp2/source/ooo/file_ooo.scp.old 2011-08-25 18:51:45.000000000 +0200
+++ scp2/source/ooo/file_ooo.scp 2011-08-29 16:44:15.000000000 +0200
@@ -122,6 +122,7 @@ End
#ifndef WITHOUT_MOZILLA
#if !defined(UNX) || defined(ENABLE_GTK)
+#if defined(WITH_MOZILLA_XUL)
File gid_File_Exe_Nsplugin
BIN_FILE_BODY;
Styles = (PACKED);
@@ -134,6 +135,7 @@ File gid_File_Exe_Nsplugin
End
#endif
#endif
+#endif
File gid_File_Bin_Gengal
BIN_FILE_BODY;
@@ -164,7 +166,7 @@ File gid_File_Profile_Gengal
Name = PROFILENAME(gengal);
End
-#if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
+#if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ) && defined(WITH_MOZILLA_XUL)
File gid_File_Bin_Pluginapp
BIN_FILE_BODY;

3
83d4029aebf290c0a9a8fee9c99638d3-libwps-0.2.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b5eea01d2579e1371b18c676a4fc6fe8ff303d8d63fed0c2c090b2e55339892
size 295533

3
8d265a592619166f29c4672ea54812b7-libwpd-0.9.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cc52efc05136876f90166d9bb778fb0d6be1dd05f3bce4435d42baa281109f1a
size 614862

3
9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0bc8854af5affbcf6f91731d867163b96c4991220f8e3b28b9d49ca3cfba169
size 335521

8
README-mono.txt Normal file
View File

@ -0,0 +1,8 @@
Dear customer,
the mono support is temporary disabled due to technical problems. We will
provide it in a later bugfix release. Thanks for understanding.
Sincerely,
Your openSUSE team

2
SUSE-10.1.conf
View File

@ -3,7 +3,6 @@
--without-fonts --without-fonts
--with-system-jpeg --with-system-jpeg
--with-system-libxml --with-system-libxml
--with-system-mozilla
--with-system-openssl --with-system-openssl
--with-system-python --with-system-python
--with-system-stdlibs --with-system-stdlibs
@ -39,7 +38,6 @@
--with-system-dicts --with-system-dicts
--with-system-expat --with-system-expat
--with-system-libxslt --with-system-libxslt
--with-system-mozilla=xulrunner
--with-system-neon --with-system-neon
--with-system-odbc --with-system-odbc
--with-xulrunner --with-xulrunner

2
SUSE-11.1.conf
View File

@ -3,7 +3,6 @@
--without-fonts --without-fonts
--with-system-jpeg --with-system-jpeg
--with-system-libxml --with-system-libxml
--with-system-mozilla
--with-system-openssl --with-system-openssl
--with-system-python --with-system-python
--with-system-stdlibs --with-system-stdlibs
@ -47,7 +46,6 @@
--with-system-icu --with-system-icu
--with-system-libxslt --with-system-libxslt
--with-system-lpsolve --with-system-lpsolve
--with-system-mozilla=libxul
--with-system-neon --with-system-neon
--with-system-odbc --with-system-odbc
--with-system-sablot --with-system-sablot

2
SUSE-11.2.conf
View File

@ -3,7 +3,6 @@
--without-fonts --without-fonts
--with-system-jpeg --with-system-jpeg
--with-system-libxml --with-system-libxml
--with-system-mozilla
--with-system-openssl --with-system-openssl
--with-system-python --with-system-python
--with-system-stdlibs --with-system-stdlibs
@ -48,7 +47,6 @@
--with-system-icu --with-system-icu
--with-system-libxslt --with-system-libxslt
--with-system-lpsolve --with-system-lpsolve
--with-system-mozilla=libxul
--with-system-neon --with-system-neon
--with-system-odbc --with-system-odbc
--with-system-sablot --with-system-sablot

2
SUSE-11.3.conf
View File

@ -3,7 +3,6 @@
--without-fonts --without-fonts
--with-system-jpeg --with-system-jpeg
--with-system-libxml --with-system-libxml
--with-system-mozilla
--with-system-openssl --with-system-openssl
--with-system-python --with-system-python
--with-system-stdlibs --with-system-stdlibs
@ -48,7 +47,6 @@
--with-system-icu --with-system-icu
--with-system-libxslt --with-system-libxslt
--with-system-lpsolve --with-system-lpsolve
--with-system-mozilla=libxul
--with-system-neon --with-system-neon
--with-system-odbc --with-system-odbc
--with-system-sablot --with-system-sablot

2
SUSE-11.4.conf
View File

@ -3,7 +3,6 @@
--without-fonts --without-fonts
--with-system-jpeg --with-system-jpeg
--with-system-libxml --with-system-libxml
--with-system-mozilla
--with-system-openssl --with-system-openssl
--with-system-python --with-system-python
--with-system-stdlibs --with-system-stdlibs
@ -48,7 +47,6 @@
--with-system-icu --with-system-icu
--with-system-libxslt --with-system-libxslt
--with-system-lpsolve --with-system-lpsolve
--with-system-mozilla=libxul
--with-system-neon --with-system-neon
--with-system-odbc --with-system-odbc
--with-system-sablot --with-system-sablot

2
SUSE.conf
View File

@ -3,7 +3,6 @@
--without-fonts --without-fonts
--with-system-jpeg --with-system-jpeg
--with-system-libxml --with-system-libxml
--with-system-mozilla
--with-system-openssl --with-system-openssl
--with-system-python --with-system-python
--with-system-stdlibs --with-system-stdlibs
@ -48,7 +47,6 @@
--with-system-icu --with-system-icu
--with-system-libxslt --with-system-libxslt
--with-system-lpsolve --with-system-lpsolve
--with-system-mozilla=libxul
--with-system-neon --with-system-neon
--with-system-odbc --with-system-odbc
--with-system-sablot --with-system-sablot

3
b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c3ed36476e1279ba35d7c675961bfa9c40b1360153472e80508a99963c8d46c
size 11922684

3
b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:27ac68831ff430882b29a23e4af041fff646c1bfd143b76cd1b1ecbc09e0f29d
size 72340

88
bash-completion-for-loffice.diff
View File

@ -1,88 +0,0 @@
--- bin/generate-bash-completion.old 2011-07-11 20:30:31.000000000 +0200
+++ bin/generate-bash-completion 2011-10-19 16:23:32.000000000 +0200
@@ -43,6 +43,7 @@ my @EXTENSIONS=("oxt");
# use "" if you want to disable any wrapper
my %APPS = (
office => "libreoffice",
+ office_short => "loffice",
master => "",
base => "lobase",
calc => "localc",
@@ -65,6 +66,7 @@ sub usage()
print " $0 [--binsuffix=suffix]\n";
print "\t\t[--compat-oowrappers]\n";
print "\t\t[--office=wrapper_name]\n";
+ print "\t\t[--office-short=wrapper_name]\n";
print "\t\t[--master=wrapper_name]\n";
print "\t\t[--base=wrapper_name]\n";
print "\t\t[--calc=wrapper_name]\n";
@@ -97,22 +99,25 @@ foreach my $arg (@ARGV) {
usage();
exit 0;
} elsif ( $arg =~ /--compat-oowrappers/ ) {
- $APPS{'office'} = "ooffice";
- $APPS{'master'} = "";
- $APPS{'base'} = "oobase";
- $APPS{'calc'} = "oocalc";
- $APPS{'draw'} = "oodraw";
- $APPS{'impress'} = "ooimpress";
- $APPS{'math'} = "oomath";
- $APPS{'template'} = "oofromtemplate";
- $APPS{'unopkg'} = "unopkg";
- $APPS{'web'} = "ooweb";
- $APPS{'writer'} = "oowriter";
+ $APPS{'office'} = "openoffice";
+ $APPS{'office_short'} = "ooffice";
+ $APPS{'master'} = "";
+ $APPS{'base'} = "oobase";
+ $APPS{'calc'} = "oocalc";
+ $APPS{'draw'} = "oodraw";
+ $APPS{'impress'} = "ooimpress";
+ $APPS{'math'} = "oomath";
+ $APPS{'template'} = "oofromtemplate";
+ $APPS{'unopkg'} = "unopkg";
+ $APPS{'web'} = "ooweb";
+ $APPS{'writer'} = "oowriter";
$office_shell_function = "_ooexp_";
} elsif ( $arg =~ /--binsuffix=(.*)/ ) {
$binsuffix = "$1";
} elsif ( $arg =~ /--office=(.*)/ ) {
$APPS{'office'} = "$1";
+ } elsif ( $arg =~ /--office-short=(.*)/ ) {
+ $APPS{'office_short'} = "$1";
} elsif ( $arg =~ /--master=(.*)/ ) {
$APPS{'master'} = "$1";
} elsif ( $arg =~ /--base=(.*)/ ) {
@@ -182,19 +187,20 @@ sub print_suffixes_checks {
# skip the disabled wrapper
next if ( $APPS{$app} eq "" );
- if ($app eq "draw" ) { print_suffixes_check ($APPS{$app}, @DRAWDOCS); }
- if ($app eq "writer") { print_suffixes_check ($APPS{$app}, @WRITERDOCS, @MASTERDOCS); }
- if ($app eq "web") { print_suffixes_check ($APPS{$app}, @WEBDOCS); }
- if ($app eq "math") { print_suffixes_check ($APPS{$app}, @MATHDOCS); }
- if ($app eq "impress") { print_suffixes_check ($APPS{$app}, @IMPRESSDOCS); }
- if ($app eq "base") { print_suffixes_check ($APPS{$app}, @BASEDOCS); }
- if ($app eq "calc") { print_suffixes_check ($APPS{$app}, @CALCDOCS); }
- if ($app eq "master") { print_suffixes_check ($APPS{$app}, @MASTERDOCS); }
- if ($app eq "template") { print_suffixes_check ($APPS{$app}, @TEMPLATES); }
- # libreoffice should contain all...
- if ($app eq "office") { print_suffixes_check ($APPS{$app}, @DRAWDOCS, @WRITERDOCS, @MATHDOCS, @IMPRESSDOCS, @BASEDOCS, @CALCDOCS, @MASTERDOCS, @TEMPLATES, @WEBDOCS); }
+ if ($app eq "draw" ) { print_suffixes_check ($APPS{$app}, @DRAWDOCS); }
+ if ($app eq "writer") { print_suffixes_check ($APPS{$app}, @WRITERDOCS, @MASTERDOCS); }
+ if ($app eq "web") { print_suffixes_check ($APPS{$app}, @WEBDOCS); }
+ if ($app eq "math") { print_suffixes_check ($APPS{$app}, @MATHDOCS); }
+ if ($app eq "impress") { print_suffixes_check ($APPS{$app}, @IMPRESSDOCS); }
+ if ($app eq "base") { print_suffixes_check ($APPS{$app}, @BASEDOCS); }
+ if ($app eq "calc") { print_suffixes_check ($APPS{$app}, @CALCDOCS); }
+ if ($app eq "master") { print_suffixes_check ($APPS{$app}, @MASTERDOCS); }
+ if ($app eq "template") { print_suffixes_check ($APPS{$app}, @TEMPLATES); }
+ # libreoffice should contain all...
+ if (($app eq "office") || ($app eq "office_short"))
+ { print_suffixes_check ($APPS{$app}, @DRAWDOCS, @WRITERDOCS, @MATHDOCS, @IMPRESSDOCS, @BASEDOCS, @CALCDOCS, @MASTERDOCS, @TEMPLATES, @WEBDOCS); }
# unopkg is a standalone tool
- if ($app eq "unopkg") { print_suffixes_check ($APPS{$app}, @EXTENSIONS); }
+ if ($app eq "unopkg") { print_suffixes_check ($APPS{$app}, @EXTENSIONS); }
}
}

11
build-helpcontent-do-not-check-cups.diff Normal file
View File

@ -0,0 +1,11 @@
--- configure.in.old 2012-03-22 18:15:24.000000000 +0100
+++ configure.in 2012-03-22 18:30:53.000000000 +0100
@@ -72,7 +72,7 @@ dnl ====================================
#defaults unless the os test overrides this:
test_randr=yes
test_xrender=yes
-test_cups=yes
+test_cups=no
test_fontconfig=yes
case "$host_os" in

11
buildfix-ucb-glib-2.31.diff
View File

@ -1,11 +0,0 @@
--- ucb/source/ucp/gvfs/gvfs_content.hxx.old 2011-05-19 12:27:43.000000000 +0200
+++ ucb/source/ucp/gvfs/gvfs_content.hxx 2012-01-11 15:00:28.000000000 +0100
@@ -35,7 +35,7 @@
#include <com/sun/star/ucb/XContentCreator.hpp>
#include <ucbhelper/contenthelper.hxx>
-#include <glib/gthread.h>
+#include <glib.h>
#include <libgnomevfs/gnome-vfs-ops.h>
#include <libgnomevfs/gnome-vfs-directory.h>

3
c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7895f0cf07ac98bd88f6d5cf26ba7f1d72fd8acaeb43b27ffa24846fccc80343
size 629054

3
d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8433f409d36bba672b80062f9f72842a174aeb4363ff54288b132f05a88940db
size 382285

3
d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92565e1283cd9834bfef155ba29ff6f4e62699ef0debdf86687e21e9fbc9b68e
size 636510

34
desktop-submenu.diff
View File

@ -1,5 +1,5 @@
--- sysui/desktop/menus/math.desktop.old 2011-10-19 14:20:44.000000000 +0200 --- sysui/desktop/menus/math.desktop.old 2012-02-24 16:34:51.000000000 +0100
+++ sysui/desktop/menus/math.desktop 2011-10-19 16:04:05.000000000 +0200 +++ sysui/desktop/menus/math.desktop 2012-03-01 16:35:23.000000000 +0100
@@ -4,7 +4,7 @@ Terminal=false @@ -4,7 +4,7 @@ Terminal=false
NoDisplay=true NoDisplay=true
Icon=math Icon=math
@ -7,10 +7,10 @@
-Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other; -Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
+Categories=Office;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other; +Categories=Office;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
Exec=${UNIXBASISROOTNAME} --math %U Exec=${UNIXBASISROOTNAME} --math %U
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;application/vnd.oasis.opendocument.formula-template;text/mathml; MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
Name=%PRODUCTNAME Math Name=%PRODUCTNAME Math
--- sysui/desktop/menus/base.desktop.old 2011-05-20 18:05:59.000000000 +0200 --- sysui/desktop/menus/base.desktop.old 2012-02-24 16:34:51.000000000 +0100
+++ sysui/desktop/menus/base.desktop 2011-10-19 16:01:23.000000000 +0200 +++ sysui/desktop/menus/base.desktop 2012-03-01 16:35:23.000000000 +0100
@@ -3,7 +3,7 @@ Version=1.0 @@ -3,7 +3,7 @@ Version=1.0
Terminal=false Terminal=false
Icon=base Icon=base
@ -20,8 +20,8 @@
Exec=${UNIXBASISROOTNAME} --base %U Exec=${UNIXBASISROOTNAME} --base %U
MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base; MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base;
Name=%PRODUCTNAME Base Name=%PRODUCTNAME Base
--- sysui/desktop/menus/calc.desktop.old 2011-09-06 19:50:30.000000000 +0200 --- sysui/desktop/menus/calc.desktop.old 2012-02-24 16:34:51.000000000 +0100
+++ sysui/desktop/menus/calc.desktop 2011-10-19 16:01:50.000000000 +0200 +++ sysui/desktop/menus/calc.desktop 2012-03-01 16:35:23.000000000 +0100
@@ -3,7 +3,7 @@ Version=1.0 @@ -3,7 +3,7 @@ Version=1.0
Terminal=false Terminal=false
Icon=calc Icon=calc
@ -29,10 +29,10 @@
-Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets; -Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
+Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets; +Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets;
Exec=${UNIXBASISROOTNAME} --calc %U Exec=${UNIXBASISROOTNAME} --calc %U
MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/spreadsheet;text/tab-separated-values;text/x-comma-separated-values;text/x-csv; MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;
Name=%PRODUCTNAME Calc Name=%PRODUCTNAME Calc
--- sysui/desktop/menus/draw.desktop.old 2011-09-06 19:50:30.000000000 +0200 --- sysui/desktop/menus/draw.desktop.old 2012-02-24 16:34:51.000000000 +0100
+++ sysui/desktop/menus/draw.desktop 2011-10-19 16:02:22.000000000 +0200 +++ sysui/desktop/menus/draw.desktop 2012-03-01 16:35:23.000000000 +0100
@@ -3,7 +3,7 @@ Version=1.0 @@ -3,7 +3,7 @@ Version=1.0
Terminal=false Terminal=false
Icon=draw Icon=draw
@ -40,10 +40,10 @@
-Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing; -Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing;
+Categories=Office;FlowChart;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing; +Categories=Office;FlowChart;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing;
Exec=${UNIXBASISROOTNAME} --draw %U Exec=${UNIXBASISROOTNAME} --draw %U
MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;application/x-wpg; MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
Name=%PRODUCTNAME Draw Name=%PRODUCTNAME Draw
--- sysui/desktop/menus/impress.desktop.old 2011-09-06 19:50:30.000000000 +0200 --- sysui/desktop/menus/impress.desktop.old 2012-02-24 16:34:51.000000000 +0100
+++ sysui/desktop/menus/impress.desktop 2011-10-19 16:02:59.000000000 +0200 +++ sysui/desktop/menus/impress.desktop 2012-03-01 16:35:23.000000000 +0100
@@ -3,7 +3,7 @@ Version=1.0 @@ -3,7 +3,7 @@ Version=1.0
Terminal=false Terminal=false
Icon=impress Icon=impress
@ -51,10 +51,10 @@
-Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations; -Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations;
+Categories=Office;Presentation;X-Red-Hat-Base;X-MandrivaLinux-Office-Presentations; +Categories=Office;Presentation;X-Red-Hat-Base;X-MandrivaLinux-Office-Presentations;
Exec=${UNIXBASISROOTNAME} --impress %U Exec=${UNIXBASISROOTNAME} --impress %U
MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow; MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
Name=%PRODUCTNAME Impress Name=%PRODUCTNAME Impress
--- sysui/desktop/menus/writer.desktop.old 2011-09-06 19:50:30.000000000 +0200 --- sysui/desktop/menus/writer.desktop.old 2012-02-24 16:34:51.000000000 +0100
+++ sysui/desktop/menus/writer.desktop 2011-10-19 16:05:38.000000000 +0200 +++ sysui/desktop/menus/writer.desktop 2012-03-01 16:35:23.000000000 +0100
@@ -3,7 +3,7 @@ Version=1.0 @@ -3,7 +3,7 @@ Version=1.0
Terminal=false Terminal=false
Icon=writer Icon=writer
@ -62,5 +62,5 @@
-Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors; -Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors;
+Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors; +Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors;
Exec=${UNIXBASISROOTNAME} --writer %U Exec=${UNIXBASISROOTNAME} --writer %U
MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain; MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;
Name=%PRODUCTNAME Writer Name=%PRODUCTNAME Writer

75
distro-install-file-lists-3.5.diff Normal file
View File

@ -0,0 +1,75 @@
--- bin/distro-install-file-lists.old 2012-03-21 18:45:58.000000000 +0100
+++ bin/distro-install-file-lists 2012-03-22 10:37:48.000000000 +0100
@@ -74,7 +74,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
rm -f common_list.txt
for module in gid_Module_Root gid_Module_Root_Brand \
- gid_Module_Root_Files_Images \
gid_Module_Root_Files_[0-9] \
gid_Module_Root_Hack \
gid_Module_Oo_Linguistic \
@@ -82,6 +81,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
merge_flists $module $FILELISTSDIR/common_list.txt
done
+ # it is not a real extension; it used to be in the main package...
+ merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Javascript $FILELISTSDIR/common_list.txt
+
if test "$SPLIT_APP_MODULES" = "YES" ; then
merge_flists gid_Module_Prg_Base_Bin $FILELISTSDIR/base_list.txt
merge_flists gid_Module_Prg_Calc_Bin $FILELISTSDIR/calc_list.txt
@@ -114,6 +116,15 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt
fi
+ if test "$SPLIT_APP_MODULES" = "YES" -a "$OOO_VENDOR" = "Novell, Inc." ; then
+ # move the prebuilt icons into a hacky temporary package
+ # we want to repack them into a noarch package as soon as possible
+ # without the build dependency on the huge devel package
+ merge_flists gid_Module_Root_Files_Images $FILELISTSDIR/icon_themes_prebuilt.txt
+ else
+ merge_flists gid_Module_Root_Files_Images $FILELISTSDIR/common_list.txt
+ fi
+
if test "$SPLIT_OPT_FEATURES" = "YES" ; then
if test "z$OOO_VENDOR" = "zMandriva" ; then
merge_flists gid_Module_Optional_Binfilter $FILELISTSDIR/filter-binfilter_list.txt
@@ -235,6 +246,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
add_used_directories mono_list.txt common_list.txt
# add the files from GAC if it was installed
test -f mono_gac && cat mono_gac >>mono_list.txt
+
+ # postgresql subpackage
+ test -f $DESTDIR/gid_Module_Optional_PostgresqlSdbc && cp $DESTDIR/gid_Module_Optional_PostgresqlSdbc postgresql_list.txt || :
# mailmerge
if test "$SPLIT_OPT_FEATURES" = "YES" ; then
@@ -247,8 +261,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
add_used_directories $flist common_list.txt
fi
- if test "z$OOO_VENDOR" = "zNovell" ; then
+ if test "z$OOO_VENDOR" = "zNovell, Inc." ; then
# officebean subpackage
+ test -f $DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell && cp $DESTDIR/gid_Module_Optional_Extensions_Script_Provider_For_Beanshell officebean_list.txt || :
mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/program/classes/officebean.jar
mv_file_between_flists officebean_list.txt common_list.txt $INSTALLDIR/program/libofficebean.so
add_used_directories officebean_list.txt common_list.txt
@@ -267,17 +282,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; th
add_used_directories sdk_doc_list.txt sdk_list.txt
fi
- if test "$OOO_VENDOR" = "Novell, Inc." -a "$SPLIT_APP_MODULES" = "YES" ; then
- # move the prebuilt icons into a hacky temporary package
- # we want to repack them into a noarch package as soon as possible
- # without the build dependency on the huge devel package
- mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_classic8.zip
- mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_crystal.zip
- mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_hicontrast.zip
- mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_industrial.zip
- mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images_tango.zip
- mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $INSTALLDIR/share/config/images.zip
- fi
# Mandriva packaging
if test "$OOO_VENDOR" = "Mandriva"; then

10
do-not-display-math-in-desktop-menu.diff
View File

@ -1,10 +0,0 @@
--- sysui/desktop/menus/math.desktop.old 2011-09-06 19:50:30.000000000 +0200
+++ sysui/desktop/menus/math.desktop 2011-10-19 14:20:44.000000000 +0200
@@ -1,6 +1,7 @@
[Desktop Entry]
Version=1.0
Terminal=false
+NoDisplay=true
Icon=math
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;

3
e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:389e95ebf50f32c261185897cca877101eb9e10660e16de4f2dfbe7194ea1a3c
size 947288

38
gengal-scp2.diff
View File

@ -1,38 +0,0 @@
--- scp2/source/ooo/file_ooo.scp.old 2011-08-04 13:43:31.000000000 +0200
+++ scp2/source/ooo/file_ooo.scp 2011-08-04 20:04:29.000000000 +0200
@@ -135,6 +135,35 @@ End
#endif
#endif
+File gid_File_Bin_Gengal
+ BIN_FILE_BODY;
+ Dir = gid_Brand_Dir_Program;
+ Styles = (PACKED);
+ #ifdef UNX
+ Name = "gengal.bin";
+ #else
+ Name = "gengal.exe";
+ #endif
+End
+
+#ifdef UNX
+
+File gid_File_Script_Gengal
+ BIN_FILE_BODY;
+ Dir = gid_Brand_Dir_Program;
+ Styles = (PACKED);
+ Name = "gengal";
+End
+
+#endif
+
+File gid_File_Profile_Gengal
+ BIN_FILE_BODY;
+ Dir = gid_Brand_Dir_Program;
+ Styles = (PACKED);
+ Name = PROFILENAME(gengal);
+End
+
#if !defined(WITHOUT_MOZILLA) && defined(UNX) && !defined(QUARTZ)
File gid_File_Bin_Pluginapp

281
gengal-svx.diff
View File

@ -1,281 +0,0 @@
--- svx/source/gengal/gengal.sh.old 2011-08-04 14:29:39.000000000 +0200
+++ svx/source/gengal/gengal.sh 2011-08-04 20:00:34.000000000 +0200
@@ -0,0 +1,103 @@
+#!/bin/sh
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# enable file locking
+SAL_ENABLE_FILE_LOCKING=1
+export SAL_ENABLE_FILE_LOCKING
+
+# resolve installation directory
+sd_cwd="`pwd`"
+if [ -h "$0" ] ; then
+ sd_basename=`basename "$0"`
+ sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"`
+ cd "`dirname "$0"`"
+ cd "`dirname "$sd_script"`"
+else
+ cd "`dirname "$0"`"
+fi
+
+sd_prog="`pwd`"
+
+cd ..
+sd_binary=`basename "$0"`".bin"
+sd_inst="`pwd`"
+
+# change back directory
+cd "$sd_cwd"
+
+# check if all required patches are installed
+if [ -x "$sd_prog/sopatchlevel.sh" ]; then
+ "$sd_prog/sopatchlevel.sh"
+ if [ $? -eq 1 ]; then
+ exit 0
+ fi
+fi
+
+# set search path for shared libraries
+sd_platform=`uname -s`
+sd_prog1="$sd_prog/../basis-link/program"
+sd_prog2="$sd_prog/../basis-link/ure-link/lib"
+case $sd_platform in
+ AIX)
+ LIBPATH=${sd_prog1}:${sd_prog2}${LIBPATH+:${LIBPATH}}
+ export LIBPATH
+ ;;
+
+ Darwin)
+ DYLD_LIBRARY_PATH=${sd_prog1}:${sd_prog2}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}
+ export DYLD_LIBRARY_PATH
+ ;;
+
+ HP-UX)
+ SHLIB_PATH=${sd_prog1}:${sd_prog2}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}}
+ export SHLIB_PATH
+ ;;
+
+ *)
+ LD_LIBRARY_PATH=${sd_prog1}:${sd_prog2}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ export LD_LIBRARY_PATH
+ ;;
+esac
+
+# misc. environment variables
+unset XENVIRONMENT
+
+# set path so that other apps can be started just by name
+PATH="$sd_prog":$PATH
+export PATH
+
+OOO_INSTALL_PREFIX=${OOO_INSTALL_PREFIX-$sd_prog/../..}
+if ! test -e $OOO_INSTALL_PREFIX/basis-link; then
+ # Hack for vanilla OOo binaries' split install layout
+ OOO_INSTALL_PREFIX=$OOO_INSTALL_PREFIX/../openoffice.org3
+fi
+
+export OOO_INSTALL_PREFIX
+
+# execute binary
+exec "$sd_prog/$sd_binary" "$@"
--- svx/source/gengal/gengalrc.in.old 2011-08-04 14:29:39.000000000 +0200
+++ svx/source/gengal/gengalrc.in 2011-08-04 17:16:04.000000000 +0200
@@ -0,0 +1,12 @@
+OOO_INSTALL_PREFIX_URL=file://${OOO_INSTALL_PREFIX}
+OOO_BASIS_URL=${OOO_INSTALL_PREFIX_URL}/basis-link
+OOO_BASIS_BIN_URL=${OOO_BASIS_URL}/program
+OOO_URE_URL=${OOO_BASIS_URL}/ure-link
+#
+#CFG_INIFILE=${OOO_BASIS_BIN_URL}/configmgrrc
+#BaseInstallation=${OOO_BASIS_URL}
+BRAND_BASE_DIR=${OOO_INSTALL_PREFIX_URL}
+OOO_BASE_DIR=${OOO_BASIS_URL}
+#
+UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb
+UNO_SERVICES=${OOO_URE_URL}/share/misc/services.rdb ${OOO_BASIS_BIN_URL}/services.rdb
--- svx/source/gengal/gengal.cxx.old 2011-05-19 12:27:42.000000000 +0200
+++ svx/source/gengal/gengal.cxx 2011-08-04 17:16:04.000000000 +0200
@@ -68,7 +68,7 @@
#include <osl/process.h>
#include <rtl/bootstrap.hxx>
-#include <galtheme.hxx>
+#include <svx/galtheme.hxx>
#include <svx/gallery1.hxx>
using namespace ::com::sun::star::uno;
@@ -101,7 +101,7 @@ void disposeGallery( Gallery* pGallery )
static void createTheme( rtl::OUString aThemeName,
rtl::OUString aGalleryURL,
rtl::OUString aDestDir,
- UINT32 nNumFrom,
+ sal_uInt32 nNumFrom,
FileNameList &rFiles )
{
Gallery * pGallery( createGallery( aGalleryURL ) );
@@ -279,10 +279,10 @@ int GalApp::Main()
bool bHelp = false;
rtl::OUString aPath, aDestDir;
rtl::OUString aName(RTL_CONSTASCII_USTRINGPARAM("Default name"));
- UINT32 nNumFrom = 0;
+ sal_uInt32 nNumFrom = 0;
FileNameList aFiles;
- for( USHORT i = 0; i < GetCommandLineParamCount(); i++ )
+ for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ )
{
rtl::OUString aParam = GetCommandLineParam( i );
--- svx/Module_svx.mk.old 2011-05-19 12:27:42.000000000 +0200
+++ svx/Module_svx.mk 2011-08-04 17:38:49.000000000 +0200
@@ -37,6 +37,8 @@ $(eval $(call gb_Module_add_targets,svx,
AllLangResTarget_textconversiondlgs \
Package_inc \
Package_sdi \
+ Package_gengal \
+ Executable_gengal.bin \
))
$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\
--- svx/Executable_gengal.bin.mk.old 2011-08-04 14:29:39.000000000 +0200
+++ svx/Executable_gengal.bin.mk 2011-08-04 17:38:02.000000000 +0200
@@ -0,0 +1,78 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Executable_Executable,gengal.bin))
+
+$(eval $(call gb_Executable_set_include,gengal.bin,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/svx/inc/ \
+ -I$(SRCDIR)/svx/inc/pch \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Executable_set_cxxflags,gengal.bin,\
+ $$(CXXFLAGS) \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+ sal \
+ tl \
+ svl \
+ comphelper \
+ cppu \
+ cppuhelper \
+ vcl \
+ ucbhelper \
+ svxcore \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,gengal.bin,\
+ svx/source/gengal/gengal \
+))
+
+$(eval $(call gb_Executable_add_linked_static_libs,gengal.bin,\
+ vclmain \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+ kernel32 \
+ msvcrt \
+ oldnames \
+ user32 \
+ uwinapi \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_linked_libs,gengal.bin,\
+ dl \
+ pthread \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
--- svx/Package_gengal.mk.old 2011-08-04 17:36:37.000000000 +0200
+++ svx/Package_gengal.mk 2011-08-04 17:38:29.000000000 +0200
@@ -0,0 +1,32 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,svx_gengal,$(SRCDIR)/svx/source/gengal))
+$(eval $(call gb_Package_add_file,svx_gengal,bin/gengalrc,gengalrc.in))
+$(eval $(call gb_Package_add_file,svx_gengal,bin/gengal,gengal.sh))
+
+# vim: set noet ts=4 sw=4:

10
javasetting-mark-config.diff Normal file
View File

@ -0,0 +1,10 @@
--- bin/distro-install-file-lists.old 2012-02-24 16:34:51.000000000 +0100
+++ bin/distro-install-file-lists 2012-03-19 11:56:31.000000000 +0100
@@ -539,6 +539,7 @@ if test "z$RPM_CONFIG_FILE_TAGS" != "z"
-e "s|^($INSTALLDIR/program/[a-zA-Z0-9_\.]*rc)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-e "s|^($INSTALLDIR/program/.*\.xsl)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-e "s|^($INSTALLDIR/share/config/[a-zA-Z0-9]*rc)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
+ -e "s|^($INSTALLDIR/share/config/javasettingsunopkginstall.xml)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-e "s|^($INSTALLDIR/share/dict/ooo/.*\.lst)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-e "s|^($INSTALLDIR/share/psprint/.*\.conf)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \
-e "s|^($INSTALLDIR/share/registry/.*\.xcu)\$|$RPM_CONFIG_FILE_TAGS \\1|;" \

58
kde4-tooltips-style.diff
View File

@ -1,58 +0,0 @@
commit c2f539bcd920de8d2fa2983e700895a7ea308c9b
Author: Luboš Luňák <l.lunak@suse.cz>
Date: Tue Oct 18 17:37:22 2011 +0200
style tooltips properly with KDE4 vclplug (fdo#40461)
ACK by Kendy.
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index ab6bf1a..f9ae9f3 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -38,6 +38,8 @@
#include <kmainwindow.h>
#include <kapplication.h>
#include <ktoolbar.h>
+#include <qdebug.h>
+#include <qtooltip.h>
#undef Region
@@ -240,11 +242,9 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
style.SetFieldTextColor( aText );
style.SetFieldRolloverTextColor( aText );
style.SetWindowTextColor( aText );
- style.SetHelpTextColor( aText );
// Base
style.SetFieldColor( aBase );
- style.SetHelpColor( aBase );
style.SetWindowColor( aBase );
style.SetActiveTabColor( aBase );
@@ -280,11 +280,14 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
style.SetHighlightColor( aHigh );
style.SetHighlightTextColor( toColor(pal.color( QPalette::HighlightedText)) );
+ // Tooltip
+ style.SetHelpColor( toColor( QToolTip::palette().color( QPalette::Active, QPalette::ToolTipBase )));
+ style.SetHelpTextColor( toColor( QToolTip::palette().color( QPalette::Active, QPalette::ToolTipText )));
+
// Font
Font aFont = toFont( kapp->font(), rSettings.GetUILocale() );
style.SetAppFont( aFont );
- style.SetHelpFont( aFont );
style.SetMenuFont( aFont ); // will be changed according to pMenuBar
//style.SetToolFont( aFont ); //already set above
@@ -303,6 +306,8 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
}
style.SetFloatTitleFont( aFont );
+ style.SetHelpFont( toFont( QToolTip::font(), rSettings.GetUILocale()));
+
int flash_time = QApplication::cursorFlashTime();
style.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );

73
library-link-order-to-build-with-as-needed.diff Normal file
View File

@ -0,0 +1,73 @@
From 29fe15039fd1d99b9597c51c96e1c429bcdcefe3 Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Tue, 23 Aug 2011 18:56:03 +0200
Subject: [PATCH] fix library link order to build with --as-needed
---
connectivity/source/drivers/kab/makefile.mk | 4 ++--
fpicker/source/unx/kde/makefile.mk | 7 +++++--
sfx2/Library_qstart.mk | 4 ++++
shell/source/backends/kdebe/makefile.mk | 5 +++--
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
index 13d4857..1894558 100755
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -110,14 +110,14 @@ SHL2VERSIONMAP=$(TARGET2).map
SHL2TARGET= $(TARGET2)$(KAB_MAJOR)
SHL2OBJS=$(SLO2FILES)
-SHL2LINKFLAGS+=$(KAB_LIB)
SHL2STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(DBTOOLSLIB) \
- $(COMPHELPERLIB)
+ $(COMPHELPERLIB) \
+ $(KAB_LIB)
SHL2DEPN=
SHL2IMPLIB= i$(TARGET2)
diff --git a/fpicker/source/unx/kde/makefile.mk b/fpicker/source/unx/kde/makefile.mk
index e1bc4db..d131aa9 100644
--- a/fpicker/source/unx/kde/makefile.mk
+++ b/fpicker/source/unx/kde/makefile.mk
@@ -60,8 +60,11 @@ SLOFILES =\
APP1TARGET=$(TARGET)
APP1OBJS=$(SLOFILES)
APP1RPATH=OOO
-APP1LINKFLAGS=$(KDE_LIBS) -lkio -lX11
-APP1STDLIBS=$(SALLIB)
+APP1STDLIBS=\
+ $(SALLIB) \
+ $(KDE_LIBS) \
+ -lkio \
+ -lX11
.ENDIF # "$(GUIBASE)" != "unx" || "$(ENABLE_KDE)" != "TRUE"
diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk
index b1b12ad..265a3b6 100755
--- a/shell/source/backends/kdebe/makefile.mk
+++ b/shell/source/backends/kdebe/makefile.mk
@@ -63,11 +63,12 @@ SHL1OBJS=$(SLOFILES)
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1IMPLIB=i$(SHL1TARGET)
-SHL1LINKFLAGS+=$(KDE_LIBS) -lkio
SHL1STDLIBS= \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(SALLIB)
+ $(SALLIB) \
+ $(KDE_LIBS) \
+ -lkio
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
--
1.7.8.3

70
libreoffice-3.5-unpack-sources.diff Normal file
View File

@ -0,0 +1,70 @@
--- bin/unpack-sources
+++ bin/unpack-sources
@@ -73,13 +73,13 @@
echo "Error: Please, define where to unpack sources, try --help"
fi
-if ! test -d $start_dir/src -a -f $start_dir/solenv/inc/target.mk ; then
- echo "Error: $start_dir is not a valid bootstrap directory"
+if ! test -f $start_dir/Repository.mk -a -f $start_dir/solenv/inc/target.mk ; then
+ echo "Error: $start_dir is not a valid LibreOffice core source directory"
exit 1;
fi
-if test ! -f $start_dir/bootstrap.ver -o -d $start_dir/.git ; then
- echo "Warning: bootstrap sources are from git and not from tarball"
+if test ! -f $start_dir/core.ver -o -d $start_dir/.git ; then
+ echo "Warning: core sources are from git and not from tarball"
echo " Do nothing."
exit 0;
fi
@@ -89,17 +89,18 @@
mkdir -p "$lo_src_dir"
for tarball in $tarballs ; do
- tarname=`basename $tarball | sed -e "s/.tar.bz2//"`
+ tarname=`basename $tarball | sed -e "s/\.tar\..*//"`
if test -d $lo_src_dir/$tarname ; then
echo "Warning: $lo_src_dir/$tarname already exists => skipping"
continue;
fi
echo "Unpacking $tarname..."
- tar -xjf "$tarball" -C "$lo_src_dir"
+ echo tar -xf "$tarball" -C "$lo_src_dir"
+ tar -xf "$tarball" -C "$lo_src_dir"
- # create symlinks
- for dir in `find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d -printf "$tarname/%f\n"` ; do
+ # create symlinks for module directories; ignore git-hooks directory
+ for dir in `find "$lo_src_dir/$tarname" -mindepth 1 -maxdepth 1 -type d -path $lo_src_dir/$tarname/git-hooks -o -printf "$tarname/%f\n"` ; do
ln -sf "src/$dir" "$start_dir"
done
done
--- download.old 2012-02-24 16:34:51.000000000 +0100
+++ download 2012-03-01 14:51:54.000000000 +0100
@@ -181,17 +181,17 @@ if [ "$COM" = "MSC" ]; then
downloaditem "http://download.microsoft.com/download/a/b/c/abc45517-97a0-4cee-a362-1957be2f24e1/" "WindowsXP-KB975337-x86-ENU.exe" "946d00d87e4094f3a6e425e2d538eadd"
fi
-if [ -f $start_dir/bootstrap.ver -a ! -d $start_dir/.git ] ; then
- # bootstrap is from sources, so get the other source tarballs
- . $start_dir/bootstrap.ver
+if [ -f $start_dir/core.ver -a ! -d $start_dir/.git ] ; then
+ # core is from sources, so get the other source tarballs
+ . $start_dir/core.ver
lo_src_dir="$start_dir/src"
mkdir -p "$lo_src_dir"
for piece in `cat $start_dir/bin/repo-list` ; do
- tarname="libreoffice-$piece-$lo_bootstrap_ver"
- if [ ! -f "$TARFILE_LOCATION/$tarname.tar.bz2" ] ; then
- downloaditem "http://download.documentfoundation.org/libreoffice/src/" "$tarname.tar.bz2" ""
+ tarname="libreoffice-$piece-$lo_core_ver"
+ if [ ! -f "$TARFILE_LOCATION/$tarname.tar.xz" ] ; then
+ downloaditem "http://download.documentfoundation.org/libreoffice/src/" "$tarname.tar.xz" ""
fi
- $start_dir/bin/unpack-sources $start_dir $TARFILE_LOCATION/$tarname.tar.bz2
+ $start_dir/bin/unpack-sources $start_dir $TARFILE_LOCATION/$tarname.tar.xz
done
fi

3
libreoffice-artwork-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:36f208c9935a353265c0fafd86e64be2b8edf8aec69b20a860c07912b6ad347c
size 13725486

3
libreoffice-base-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79c83d786f92a9c56ab9458eec498db960dc1fae0b7cf7cbdb6a80ef5b058ef1
size 2071694

3
libreoffice-binfilter-3.5.2.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9cf26a246babe2813008dc195227c2c3c8ea95871c3fa7a568b05d284327d029
size 6493757

3
libreoffice-bootstrap-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d5c66393840f90aba7d523514bafbfdf81020c4f920d120873cc4caea6f625a
size 2756195

264
libreoffice-bootstrap-optional-helpcontent.diff
View File

@ -1,264 +0,0 @@
--- configure.in.old 2011-07-07 19:22:48.000000000 +0200
+++ configure.in 2011-07-08 17:09:18.000000000 +0200
@@ -167,6 +167,11 @@ AC_ARG_ENABLE(activex_component,
[Remove support for ActiveX embedding of LibO.]),
,enable_activex_component=yes)
+AC_ARG_ENABLE(helpcontent,
+ AS_HELP_STRING([--disable-helpcontent],
+ [Do not build helpcontent. The wiki help is enough.]),
+,)
+
AC_ARG_ENABLE(odk,
AS_HELP_STRING([--disable-odk],
[LibO includes an ODK, office development kit which some packagers may
@@ -3837,6 +3842,18 @@ fi
AC_SUBST(BUILD_STAX)
dnl ===================================================================
+dnl Check for building helpcontent
+dnl ===================================================================
+AC_MSG_CHECKING([whether to build helpcontent])
+if test "$enable_helpcontent" != "no" ; then
+ BUILD_TYPE="$BUILD_TYPE HELPCONTENT2"
+ SCPDEFS="$SCPDEFS -DWITH_HELPCONTENT2"
+ AC_MSG_RESULT([yes])
+else
+ AC_MSG_RESULT([no, wikihelp is enough])
+fi
+
+dnl ===================================================================
dnl Check for building ODK
dnl ===================================================================
AC_MSG_CHECKING([whether to build the ODK])
--- scp2/source/draw/file_draw.scp.old 2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/draw/file_draw.scp 2011-07-08 16:59:32.000000000 +0200
@@ -34,6 +34,8 @@ File gid_File_Share_Registry_Draw_Xcd
Name = "draw.xcd";
End
+#ifdef WITH_HELPCONTENT2
+
File gid_File_Help_Sdraw_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -41,6 +43,8 @@ File gid_File_Help_Sdraw_Zip
Patchfiles = ();
End
+#endif
+
File gid_File_Exe_Sdraw
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
--- scp2/source/base/file_base.scp.old 2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/base/file_base.scp 2011-07-08 17:00:37.000000000 +0200
@@ -72,6 +72,8 @@ STD_RES_FILE( gid_File_Res_Rptui, rptui)
STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
+#ifdef WITH_HELPCONTENT2
+
File gid_File_Help_Sdatabase_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -79,6 +81,8 @@ File gid_File_Help_Sdatabase_Zip
Patchfiles = ();
End
+#endif
+
File gid_File_Share_Registry_Base_Xcd
TXT_FILE_BODY;
Styles = (PACKED);
--- scp2/source/writer/file_writer.scp.old 2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/writer/file_writer.scp 2011-07-08 16:59:11.000000000 +0200
@@ -53,6 +53,8 @@ File gid_File_Exe_Sweb
End
#endif
+#ifdef WITH_HELPCONTENT2
+
File gid_File_Help_Swriter_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -60,6 +62,8 @@ File gid_File_Help_Swriter_Zip
Patchfiles = ();
End
+#endif
+
/*
File gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml
TXT_FILE_BODY;
--- scp2/source/calc/file_calc.scp.old 2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/calc/file_calc.scp 2011-07-08 16:58:38.000000000 +0200
@@ -65,6 +65,8 @@ STD_RES_FILE( gid_File_Res_Date, date)
STD_RES_FILE( gid_File_Res_Sc, sc )
+#ifdef WITH_HELPCONTENT2
+
File gid_File_Help_Scalc_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -72,6 +74,8 @@ File gid_File_Help_Scalc_Zip
Patchfiles = ();
End
+#endif
+
// new user interface configuration files
/*
File gid_File_Share_Config_Sofficecfg_Calc_Menubar_Xml
--- scp2/source/impress/file_impress.scp.old 2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/impress/file_impress.scp 2011-07-08 16:58:11.000000000 +0200
@@ -44,6 +44,8 @@ File gid_File_Share_Registry_Impress_Xcd
Name = "impress.xcd";
End
+#ifdef WITH_HELPCONTENT2
+
File gid_File_Help_Simpress_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -51,6 +53,8 @@ File gid_File_Help_Simpress_Zip
Patchfiles = ();
End
+#endif
+
File gid_File_Exe_Simpress
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
--- scp2/source/math/file_math.scp.old 2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/math/file_math.scp 2011-07-08 16:57:51.000000000 +0200
@@ -50,6 +50,8 @@ File gid_File_Share_Registry_Math_Xcd
Name = "math.xcd";
End
+#ifdef WITH_HELPCONTENT2
+
File gid_File_Help_Smath_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -57,6 +59,8 @@ File gid_File_Help_Smath_Zip
Patchfiles = ();
End
+#endif
+
File gid_File_Exe_Smath
BIN_FILE_BODY;
Dir = gid_Brand_Dir_Program;
--- scp2/source/ooo/directory_ooo.scp.old 2011-06-13 10:46:50.000000000 +0200
+++ scp2/source/ooo/directory_ooo.scp 2011-07-08 13:26:42.000000000 +0200
@@ -1215,6 +1215,8 @@ Directory gid_Dir_Basis_Sdk
DosName = "sdk";
End
+#ifdef WITH_HELPCONTENT2
+
Directory gid_Dir_Help
#if defined MACOSX
ParentID = gid_Brand_Dir_BasisLink;
@@ -1234,6 +1236,8 @@ Directory gid_Dir_Help_Isolanguage
#endif
End
+#endif
+
#ifdef UNX
Directory gid_Dir_User_Psprint
--- scp2/source/ooo/file_ooo.scp.old 2011-05-20 18:04:45.000000000 +0200
+++ scp2/source/ooo/file_ooo.scp 2011-07-08 16:12:23.000000000 +0200
@@ -362,6 +362,8 @@ STD_FILTER_FILE( gid_File_Filter_Iti, it
STD_RES_FILE( gid_File_Res_Eps, eps )
+#ifdef WITH_HELPCONTENT2
+
File gid_File_Help_Common_Zip
Dir = gid_Dir_Help_Isolanguage;
ARCHIVE_TXT_FILE_BODY_HELPPACK;
@@ -388,6 +390,8 @@ File gid_File_Help_Schart_Zip
EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
End
+#endif
+
#if defined WNT
File gid_File_Jar_Accessbridge
--- scp2/source/ooo/common_brand.scp.old 2011-05-20 18:04:45.000000000 +0200
+++ scp2/source/ooo/common_brand.scp 2011-07-08 16:13:36.000000000 +0200
@@ -167,6 +167,8 @@ Directory gid_Brand_Dir_Readme
DosName = "readmes";
End
+#ifdef WITH_HELPCONTENT2
+
Directory gid_Brand_Dir_Help
#if defined MACOSX
ParentID = gid_Dir_Bundle_Contents;
@@ -181,6 +183,8 @@ Directory gid_Brand_Dir_Help_Isolanguage
DIR_ISOLANGUAGE_ALL_LANG;
End
+#endif
+
Directory gid_Brand_Dir_Share
#if defined MACOSX
ParentID = gid_Dir_Bundle_Contents;
--- scp2/source/ooo/module_helppack.scp.old 2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/ooo/module_helppack.scp 2011-07-08 16:15:09.000000000 +0200
@@ -27,6 +27,8 @@
#include "macros.inc"
+#ifdef WITH_HELPCONTENT2
+
Module gid_Module_Helppack_Helproot
ParentID = gid_Module_Root;
XPDParentID = "root";
@@ -40,3 +42,5 @@ Module gid_Module_Helppack_Helproot
End
#include "allhelpmodules.inc"
+
+#endif
--- scp2/source/ooo/module_help_template.scp.old 2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/ooo/module_help_template.scp 2011-07-08 16:16:14.000000000 +0200
@@ -25,6 +25,8 @@
*
************************************************************************/
+#ifdef WITH_HELPCONTENT2
+
Module gid_Module_Helppack_Help_Template
ParentID = gid_Module_Helppack_Helproot;
Name = "gid_Module_Helppack_Help_Template";
@@ -44,3 +46,5 @@ Module gid_Module_Helppack_Help_Template
End
#include "allhelpmodules_root.inc"
+
+#endif
--- scp2/source/templates/module_helppack_root.sct.old 2011-05-18 17:51:47.000000000 +0200
+++ scp2/source/templates/module_helppack_root.sct 2011-07-08 16:19:16.000000000 +0200
@@ -25,6 +25,8 @@
*
************************************************************************/
+#ifdef WITH_HELPCONTENT2
+
Module gid_Module_Helppack_Help_<LANGUAGE_>
ParentID = gid_Module_Helppack_Root_<LANGUAGE_>;
Sortkey = "200";
@@ -35,3 +37,5 @@ Module gid_Module_Helppack_Help_<LANGUAG
PackageInfo = "packinfo_office_help.txt";
Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
End
+
+#endif

15
libreoffice-branding-upstream.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Mar 28 15:43:47 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.5.5.2 (3.5.2-rc2)
-------------------------------------------------------------------
Wed Mar 14 14:34:11 UTC 2012 - pmladek@suse.com
- libreoffice-3.4.5.5 == SUSE 3.4.5-rc3 == final
-------------------------------------------------------------------
Mon Mar 12 18:58:39 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.4.5.5 (SUSE 3.4.5-rc3)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com

11
libreoffice-branding-upstream.spec
View File

@ -17,13 +17,12 @@
Name: libreoffice-branding-upstream Name: libreoffice-branding-upstream
Version: 3.4.5.4 Version: 3.5.2.2
Release: 0 Release: 0
%define lo_build_version 3.4.5.4 %define lo_build_version 3.5.2.2
%define lo_piece_version 3.4.5.4 %define lo_piece_version 3.5.2.2
%define lo_sourcedirname libreoffice-build-%lo_piece_version %define lo_sourcedirname libreoffice-build-%lo_piece_version
%define lo_home libreoffice %define lo_home libreoffice
%define lo_basis_dir basis3.4
Summary: Original Branding for LibreOffice Summary: Original Branding for LibreOffice
License: LGPL-3.0 License: LGPL-3.0
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
@ -38,7 +37,7 @@ Conflicts: otherproviders(libreoffice-branding)
Supplements: packageand(branding-upstream:libreoffice) Supplements: packageand(branding-upstream:libreoffice)
%endif %endif
Url: http://www.documentfoundation.org/ Url: http://www.documentfoundation.org/
Source0: libreoffice-artwork-%version.tar.bz2 Source0: libreoffice-core-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc #!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch BuildArch: noarch
@ -79,7 +78,7 @@ office suite.
%prep %prep
%setup -q -n libreoffice-artwork-%version %setup -q -n libreoffice-core-%version
%build %build

3
libreoffice-calc-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eed9c61f68558ff1886d4acf6284734947604654b04b507b88a3e6e8efdf2443
size 9531699

11
libreoffice-cc-detection.diff
View File

@ -1,11 +0,0 @@
--- configure.in.old 2011-07-13 15:23:06.000000000 +0200
+++ configure.in 2011-07-14 16:08:55.000000000 +0200
@@ -1342,6 +1342,8 @@ if test "$EUID" -eq "0" -a "z`uname -o
AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an administrative account])
fi
+AC_PROG_CC
+
save_CC=$CC
save_CXX=$CXX

3
libreoffice-components-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2808d5f869141c3d08d43f55b2f4a0389475b4cfdd777aaaf981798d48bcc379
size 5122168

11
libreoffice-configure-typo-fontconfig.diff
View File

@ -1,11 +0,0 @@
--- configure.in.old 2011-07-12 15:23:56.000000000 +0200
+++ configure.in 2011-07-13 15:23:06.000000000 +0200
@@ -1733,7 +1733,7 @@ AC_SUBST(ENABLE_CUPS)
# check for fontconfig support
AC_MSG_CHECKING([whether to enable fontconfig support])
-if test "z$test_fontconfig" = "zyes" -a "z$enable_fontconfig" != "no"; then
+if test "$test_fontconfig" = "yes" -a "$enable_fontconfig" != "no"; then
ENABLE_FONTCONFIG="TRUE"
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])

3
libreoffice-core-3.5.2.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:449118133af40cc73871debf0eac7eebd5c8b4978fd97c22055a39640860d570
size 128070188

3
libreoffice-extensions-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71ab90d8e98a4f700e450ee417e80b1c2c9a4090d5f1a0a192cd1fac61c0c0fc
size 4224264

3
libreoffice-extras-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f059c7c632708b0f26bd498b573f05f3b1ba7c770db8346d8506828fba557469
size 38652624

3
libreoffice-filters-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cfb6fb9e61d285c23120cd0e41570642b8f2bc57a3cd9886fa065582ef43a220
size 11923110

3
libreoffice-help-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5a1175a36cf339945e7c4db09d6a540b073adb591951daebe3041708e4dcc667
size 1846985

3
libreoffice-help-3.5.2.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:556d112f9a2358925bb795fba34ae20bc8b4e60695e0973c63f73338d3e3d77e
size 1872179

33
libreoffice-help-en-US.changes
View File

@ -1,3 +1,36 @@
-------------------------------------------------------------------
Wed Apr 4 13:39:46 UTC 2012 - pmladek@suse.com
- clean up lo-help-gen-spec according to lo-l10n-gen-spec
- do not supplement l10n packages; we provide support for the given locale;
the extra recommends annoys users when updating on Live-CD (bnc#551003)
- use Requires(pre) instead of PreReq on never distributions
-------------------------------------------------------------------
Wed Mar 28 15:43:47 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.5.5.2 (3.5.2-rc2)
- basis subdirectory does not longer exists on the installed system
- mozilla is not longer used for build:
* use --disable-mozilla, --without-system-mozilla, --with-system-nss,
--disable-ldap, --enable-xmlsec instead of --with-system-mozilla,
--with-system-mozilla=xulrunner
- use internal hacked make version 3.82, snapshot 20120301 to get fast
and reliable parallel build
- build zip-3.0 on openSUSE < 11.4; --filesync is needed during build
- libreoffice-3.5-unpack-sources.diff: allow to unpack source tarballs
- build-helpcontent-do-not-check-cups.diff: cups is not needed for helpcontent
-------------------------------------------------------------------
Wed Mar 14 14:34:11 UTC 2012 - pmladek@suse.com
- libreoffice-3.4.5.5 == SUSE 3.4.5-rc3 == final
-------------------------------------------------------------------
Mon Mar 12 18:58:39 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.4.5.5 (SUSE 3.4.5-rc3)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com

96
libreoffice-help-en-US.spec
View File

@ -22,15 +22,13 @@ Name: libreoffice-help-en-US
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US ## perl lo-help-gen-spec libreoffice-help-en-US.spec.in lo-help-en-US
################################################################### ###################################################################
Version: 3.4.5.4 Version: 3.5.2.2
Release: 0 Release: 0
%define piece help %define gnu_make_version 3.82
%define lo_build_version 3.4.5.4 %define gnu_make_snapshot 20120301
%define lo_piece_version 3.4.5.4 %define zip_version 3.0
%define lo_langs "" %define lo_langs ""
%define lo_sourcedirname libreoffice-build-%lo_piece_version %define lo_home libreoffice
%define lo_home libreoffice
%define lo_basis_dir basis3.4
# prepare_build: 0 = no # prepare_build: 0 = no
# 1 = yes (just build, install and create packages; without %%prep section and configure) # 1 = yes (just build, install and create packages; without %%prep section and configure)
%define prepare_build 1 %define prepare_build 1
@ -69,10 +67,20 @@ BuildRequires: update-alternatives
BuildRequires: perl-Compress-Zlib BuildRequires: perl-Compress-Zlib
%endif %endif
Provides: locale(libreoffice:en_US) Provides: locale(libreoffice:en_US)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-en-US Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-en-US = %version Provides: OpenOffice_org-help-en-US = %version
Obsoletes: OpenOffice_org-help-en-US < %version Obsoletes: OpenOffice_org-help-en-US < %version
@ -94,16 +102,15 @@ Summary: American Help Localization for LibreOffice
License: LGPL-3.0 License: LGPL-3.0
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/ Url: http://www.documentfoundation.org/
Source0: libreoffice-bootstrap-%version.tar.bz2 Source0: libreoffice-core-%version.tar.bz2
Source1: libreoffice-artwork-%version.tar.bz2 Source1: libreoffice-help-%version.tar.bz2
Source2: libreoffice-help-%version.tar.bz2 Source2: libreoffice-translations-%version.tar.bz2
Source3: libreoffice-libs-core-%version.tar.bz2 # make-3.82 is needed for parallel build
Source4: libreoffice-libs-extern-sys-%version.tar.bz2 # this version extends plain make-3.82 with --warn-undefined-functions option
Source5: libreoffice-libs-extern-%version.tar.bz2 # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
Source6: libreoffice-libs-gui-%version.tar.bz2 Source30: make-%gnu_make_version-gbuild-%gnu_make_snapshot.tar.bz2
Source7: libreoffice-testing-%version.tar.bz2 # zip-3.0 or newer is required because of the --filesync feature
Source8: libreoffice-translations-%version.tar.bz2 Source31: zip-%zip_version.tar.bz2
Source9: libreoffice-ure-%version.tar.bz2
# SUSE config files # SUSE config files
Source100: SUSE.conf Source100: SUSE.conf
Source101: SUSE-10.1.conf Source101: SUSE-10.1.conf
@ -115,11 +122,10 @@ Source105: SUSE-11.4.conf
Source200: libreoffice-help-en-US.spec.in Source200: libreoffice-help-en-US.spec.in
Source201: lo-help-gen-spec Source201: lo-help-gen-spec
Source202: lo-help-en-US Source202: lo-help-en-US
# # allow to unpack source tarballs
Patch0: libreoffice-configure-typo-fontconfig.diff Patch0: libreoffice-3.5-unpack-sources.diff
# OBJEXT variable was not set correctly if AC_PROC_CC was not called early # cups is not needed for helpcontent build
# I think that it worked only by chance when there was checks for more system librarires Patch1: build-helpcontent-do-not-check-cups.diff
Patch1: libreoffice-cc-detection.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc #!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch BuildArch: noarch
@ -131,21 +137,29 @@ stuff is in LibreOffice-l10n-en-US.
%prep %prep
%if %prepare_build == 0 %if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version %setup -D -T -q -n libreoffice-core-%version
%else %else
%setup -q -n libreoffice-bootstrap-%version %setup -q -a30 -a31 -n libreoffice-core-%version
bin/unpack-sources `pwd` \ %patch0
%{S:1} %{S:2} %{S:3} %{S:4} %{S:5} \ bin/unpack-sources `pwd` %{S:1} %{S:2}
%{S:6} %{S:7} %{S:8} %{S:9}
# SUSE config files # SUSE config files
cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
# extra fixes # extra fixes
%patch0
%patch1 %patch1
%endif %endif
%build %build
%if %prepare_build != 0 %if %prepare_build != 0
# first build make-3.82
cd make-*
CFLAGS=$RPM_OPT_FLAGS ./configure
make %{?_smp_mflags}
cd -
#
# second build zip-3.0
cd zip30
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
cd -
# #
# Parallel build settings ... # Parallel build settings ...
# parallel build of modules; it makes sense on machines with more CPUs # parallel build of modules; it makes sense on machines with more CPUs
@ -186,7 +200,8 @@ export JAVA_HOME=%{java_home}
# use RPM_OPT_FLAGS, ... # use RPM_OPT_FLAGS, ...
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
# FIXME: genccode from the system icu is in /usr/sbin # FIXME: genccode from the system icu is in /usr/sbin
export PATH="$PATH:/usr/sbin" # FIXME: we need make-3.82 for parallel build
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh \ ./autogen.sh \
--with-external-tar="$RPM_SOURCE_DIR" \ --with-external-tar="$RPM_SOURCE_DIR" \
@ -228,27 +243,26 @@ export PATH="$PATH:/usr/sbin"
--disable-evolution2 --disable-evolution2
%endif %endif
./bootstrap ./bootstrap
. ./*[Ee]nv.[Ss]et.sh . ./Env.Host.sh
cd helpcontent2 cd helpcontent2
build --all $PARALLEL_BUILD build --all $PARALLEL_BUILD
%install %install
. ./*Env.Set.sh . ./Env.Host.sh
test -z "%lo_langs" && langs="en-US" || langs="%lo_langs" test -z %lo_langs && langs="en-US" || langs=%lo_langs
mkdir -p file-lists mkdir -p file-lists
for lang in $langs ; do for lang in $langs ; do
test "$lang" = "en-US" && langdir="en" || langdir="$lang" test "$lang" = "en-US" && langdir="en" || langdir="$lang"
mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do
unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
done done
lang_underscore=`echo $lang | sed "s/-/_/g"` lang_underscore=`echo $lang | sed "s/-/_/g"`
filelist=help_${lang_underscore}_list.txt filelist=help_${lang_underscore}_list.txt
echo "%dir %_datadir/%lo_home" >file-lists/$filelist echo "%dir %_datadir/%lo_home" >file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir" >>file-lists/$filelist echo "%dir %_datadir/%lo_home/help" >>file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir/help" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type f -printf "%_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type f -printf "%_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist
# the file list is needed to create compat symlinks # the file list is needed to create compat symlinks
cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist

139
libreoffice-help-en-US.spec.in
View File

@ -15,40 +15,68 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: libreoffice-help-en-US Name: libreoffice-help-en-US
@DO_NOT_EDIT_COMMENT@ @DO_NOT_EDIT_COMMENT@
Version: 3.4.5.4 Version: 3.5.2.2
Release: 1 Release: 0
%define piece help %define gnu_make_version 3.82
%define lo_build_version 3.4.5.4 %define gnu_make_snapshot 20120301
%define lo_piece_version 3.4.5.4 %define zip_version 3.0
%define lo_langs "" %define lo_langs ""
%define lo_sourcedirname libreoffice-build-%lo_piece_version %define lo_home libreoffice
%define lo_home libreoffice
%define lo_basis_dir basis3.4
# prepare_build: 0 = no # prepare_build: 0 = no
# 1 = yes (just build, install and create packages; without %%prep section and configure) # 1 = yes (just build, install and create packages; without %%prep section and configure)
%define prepare_build 1 %define prepare_build 1
#!BuildIgnore: libreoffice #!BuildIgnore: libreoffice
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
BuildRequires: ant ant-apache-regexp automake bison boost-devel db-devel flac-devel flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip xorg-x11-devel zip BuildRequires: ant
BuildRequires: ant-apache-regexp
BuildRequires: automake
BuildRequires: bison
BuildRequires: boost-devel
BuildRequires: db-devel
BuildRequires: flac-devel
BuildRequires: flex
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: gperf
BuildRequires: icu
BuildRequires: java-devel
BuildRequires: libcppunit-devel
BuildRequires: libexpat-devel
BuildRequires: libicu-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: openssl-devel
BuildRequires: perl-Archive-Zip
BuildRequires: perl-Compress-Zlib
BuildRequires: pkg-config
BuildRequires: python-devel
BuildRequires: unzip
BuildRequires: xorg-x11-devel
BuildRequires: zip
%if 0%{?suse_version} == 01010 %if 0%{?suse_version} == 01010
# is not required by Java SDKs by mistake on SLED10 # is not required by Java SDKs by mistake on SLED10
BuildRequires: update-alternatives BuildRequires: update-alternatives
# needed by perl-Archive-Zip; is included in main perl package on newer distros # needed by perl-Archive-Zip; is included in main perl package on newer distros
BuildRequires: perl-Compress-Zlib BuildRequires: perl-Compress-Zlib
%endif %endif
License: LGPL-3.0
Group: Productivity/Office/Suite
AutoReqProv: on
Provides: locale(libreoffice:en_US) Provides: locale(libreoffice:en_US)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-en-US Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-en-US = %version Provides: OpenOffice_org-help-en-US = %version
Obsoletes: OpenOffice_org-help-en-US < %version Obsoletes: OpenOffice_org-help-en-US < %version
@ -67,17 +95,18 @@ Provides: libreoffice-help-pa-IN = %version
Obsoletes: libreoffice-help-pa-IN < %version Obsoletes: libreoffice-help-pa-IN < %version
# #
Summary: American Help Localization for LibreOffice Summary: American Help Localization for LibreOffice
License: LGPL-3.0
Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/ Url: http://www.documentfoundation.org/
Source0: libreoffice-bootstrap-%version.tar.bz2 Source0: libreoffice-core-%version.tar.bz2
Source1: libreoffice-artwork-%version.tar.bz2 Source1: libreoffice-help-%version.tar.bz2
Source2: libreoffice-help-%version.tar.bz2 Source2: libreoffice-translations-%version.tar.bz2
Source3: libreoffice-libs-core-%version.tar.bz2 # make-3.82 is needed for parallel build
Source4: libreoffice-libs-extern-sys-%version.tar.bz2 # this version extends plain make-3.82 with --warn-undefined-functions option
Source5: libreoffice-libs-extern-%version.tar.bz2 # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
Source6: libreoffice-libs-gui-%version.tar.bz2 Source30: make-%gnu_make_version-gbuild-%gnu_make_snapshot.tar.bz2
Source7: libreoffice-testing-%version.tar.bz2 # zip-3.0 or newer is required because of the --filesync feature
Source8: libreoffice-translations-%version.tar.bz2 Source31: zip-%zip_version.tar.bz2
Source9: libreoffice-ure-%version.tar.bz2
# SUSE config files # SUSE config files
Source100: SUSE.conf Source100: SUSE.conf
Source101: SUSE-10.1.conf Source101: SUSE-10.1.conf
@ -89,16 +118,14 @@ Source105: SUSE-11.4.conf
Source200: libreoffice-help-en-US.spec.in Source200: libreoffice-help-en-US.spec.in
Source201: lo-help-gen-spec Source201: lo-help-gen-spec
Source202: lo-help-en-US Source202: lo-help-en-US
# # allow to unpack source tarballs
Patch0: libreoffice-configure-typo-fontconfig.diff Patch0: libreoffice-3.5-unpack-sources.diff
# OBJEXT variable was not set correctly if AC_PROC_CC was not called early # cups is not needed for helpcontent build
# I think that it worked only by chance when there was checks for more system librarires Patch1: build-helpcontent-do-not-check-cups.diff
Patch1: libreoffice-cc-detection.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc #!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch BuildArch: noarch
%description %description
American help localization for LibreOffice. The other localized American help localization for LibreOffice. The other localized
stuff is in LibreOffice-l10n-en-US. stuff is in LibreOffice-l10n-en-US.
@ -106,22 +133,29 @@ stuff is in LibreOffice-l10n-en-US.
%prep %prep
%if %prepare_build == 0 %if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version %setup -D -T -q -n libreoffice-core-%version
%else %else
%setup -q -n libreoffice-bootstrap-%version %setup -q -a30 -a31 -n libreoffice-core-%version
bin/unpack-sources `pwd` \ %patch0
%{S:1} %{S:2} %{S:3} %{S:4} %{S:5} \ bin/unpack-sources `pwd` %{S:1} %{S:2}
%{S:6} %{S:7} %{S:8} %{S:9}
# SUSE config files # SUSE config files
cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
# extra fixes # extra fixes
%patch0
%patch1 %patch1
%endif %endif
%build %build
%if %prepare_build != 0 %if %prepare_build != 0
# first build make-3.82
cd make-*
CFLAGS=$RPM_OPT_FLAGS ./configure
make %{?_smp_mflags}
cd -
#
# second build zip-3.0
cd zip30
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
cd -
# #
# Parallel build settings ... # Parallel build settings ...
# parallel build of modules; it makes sense on machines with more CPUs # parallel build of modules; it makes sense on machines with more CPUs
@ -162,7 +196,8 @@ export JAVA_HOME=%{java_home}
# use RPM_OPT_FLAGS, ... # use RPM_OPT_FLAGS, ...
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
# FIXME: genccode from the system icu is in /usr/sbin # FIXME: genccode from the system icu is in /usr/sbin
export PATH="$PATH:/usr/sbin" # FIXME: we need make-3.82 for parallel build
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh \ ./autogen.sh \
--with-external-tar="$RPM_SOURCE_DIR" \ --with-external-tar="$RPM_SOURCE_DIR" \
@ -204,40 +239,34 @@ export PATH="$PATH:/usr/sbin"
--disable-evolution2 --disable-evolution2
%endif %endif
./bootstrap ./bootstrap
. ./*[Ee]nv.[Ss]et.sh . ./Env.Host.sh
cd helpcontent2 cd helpcontent2
build --all $PARALLEL_BUILD build --all $PARALLEL_BUILD
%install %install
. ./*Env.Set.sh . ./Env.Host.sh
test -z "%lo_langs" && langs="en-US" || langs="%lo_langs" test -z %lo_langs && langs="en-US" || langs=%lo_langs
mkdir -p file-lists mkdir -p file-lists
for lang in $langs ; do for lang in $langs ; do
test "$lang" = "en-US" && langdir="en" || langdir="$lang" test "$lang" = "en-US" && langdir="en" || langdir="$lang"
mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do
unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
done done
lang_underscore=`echo $lang | sed "s/-/_/g"` lang_underscore=`echo $lang | sed "s/-/_/g"`
filelist=help_${lang_underscore}_list.txt filelist=help_${lang_underscore}_list.txt
echo "%dir %_datadir/%lo_home" >file-lists/$filelist echo "%dir %_datadir/%lo_home" >file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir" >>file-lists/$filelist echo "%dir %_datadir/%lo_home/help" >>file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir/help" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type f -printf "%_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type f -printf "%_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist
# the file list is needed to create compat symlinks # the file list is needed to create compat symlinks
cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done done
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@SUBPACKAGES_SCRIPTS@ @SUBPACKAGES_SCRIPTS@
@SUBPACKAGES_FILELIST@ @SUBPACKAGES_FILELIST@
%changelog %changelog

34
libreoffice-help-group1.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Wed Apr 4 13:39:46 UTC 2012 - pmladek@suse.com
- clean up lo-help-gen-spec according to lo-l10n-gen-spec
- do not supplement l10n packages; we provide support for the given locale;
the extra recommends annoys users when updating on Live-CD (bnc#551003)
- use Requires(pre) instead of PreReq on never distributions
-------------------------------------------------------------------
Wed Mar 28 15:43:47 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.5.5.2 (3.5.2-rc2)
- basis subdirectory does not longer exists on the installed system
- mozilla is not longer used for build:
* use --disable-mozilla, --without-system-mozilla, --with-system-nss,
--disable-ldap, --enable-xmlsec instead of --with-system-mozilla,
--with-system-mozilla=xulrunner
- enable python during build; it is needed to localize the sources
- use internal hacked make version 3.82, snapshot 20120301 to get fast
and reliable parallel build
- build zip-3.0 on openSUSE < 11.4; --filesync is needed during build
- libreoffice-3.5-unpack-sources.diff: allow to unpack source tarballs
- build-helpcontent-do-not-check-cups.diff: cups is not needed for helpcontent
-------------------------------------------------------------------
Wed Mar 14 14:34:11 UTC 2012 - pmladek@suse.com
- libreoffice-3.4.5.5 == SUSE 3.4.5-rc3 == final
-------------------------------------------------------------------
Mon Mar 12 18:58:39 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.4.5.5 (SUSE 3.4.5-rc3)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com

159
libreoffice-help-group1.spec
View File

@ -22,14 +22,12 @@ Name: libreoffice-help-group1
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 3.4.5.4 Version: 3.5.2.2
Release: 0 Release: 0
%define piece help %define gnu_make_version 3.82
%define lo_build_version 3.4.5.4 %define gnu_make_snapshot 20120301
%define lo_piece_version 3.4.5.4 %define zip_version 3.0
%define lo_sourcedirname libreoffice-build-%lo_piece_version %define lo_home libreoffice
%define lo_home libreoffice
%define lo_basis_dir basis3.4
# test_build_langs: 1 = de and cs # test_build_langs: 1 = de and cs
# 2 = all supported languages # 2 = all supported languages
%define test_build_langs 2 %define test_build_langs 2
@ -89,16 +87,15 @@ Summary: LibreOffice Help Development
License: LGPL-3.0 License: LGPL-3.0
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/ Url: http://www.documentfoundation.org/
Source0: libreoffice-bootstrap-%version.tar.bz2 Source0: libreoffice-core-%version.tar.bz2
Source1: libreoffice-artwork-%version.tar.bz2 Source1: libreoffice-help-%version.tar.bz2
Source2: libreoffice-help-%version.tar.bz2 Source2: libreoffice-translations-%version.tar.bz2
Source3: libreoffice-libs-core-%version.tar.bz2 # make-3.82 is needed for parallel build
Source4: libreoffice-libs-extern-sys-%version.tar.bz2 # this version extends plain make-3.82 with --warn-undefined-functions option
Source5: libreoffice-libs-extern-%version.tar.bz2 # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
Source6: libreoffice-libs-gui-%version.tar.bz2 Source30: make-%gnu_make_version-gbuild-%gnu_make_snapshot.tar.bz2
Source7: libreoffice-testing-%version.tar.bz2 # zip-3.0 or newer is required because of the --filesync feature
Source8: libreoffice-translations-%version.tar.bz2 Source31: zip-%zip_version.tar.bz2
Source9: libreoffice-ure-%version.tar.bz2
# SUSE config files # SUSE config files
Source100: SUSE.conf Source100: SUSE.conf
Source101: SUSE-10.1.conf Source101: SUSE-10.1.conf
@ -110,13 +107,10 @@ Source105: SUSE-11.4.conf
Source200: libreoffice-help-groupX.spec.in Source200: libreoffice-help-groupX.spec.in
Source201: lo-help-gen-spec Source201: lo-help-gen-spec
Source202: lo-help-groupX Source202: lo-help-groupX
# # allow to unpack source tarballs
Patch0: libreoffice-configure-typo-fontconfig.diff Patch0: libreoffice-3.5-unpack-sources.diff
# OBJEXT variable was not set correctly if AC_PROC_CC was not called early # cups is not needed for helpcontent build
# I think that it worked only by chance when there was checks for more system librarires Patch1: build-helpcontent-do-not-check-cups.diff
Patch1: libreoffice-cc-detection.diff
# it created 3.8GB build log; Build Service refused to build such package
Patch2: translations-no-warnigns-from-po2oo.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc #!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch BuildArch: noarch
@ -125,17 +119,25 @@ BuildArch: noarch
This package provides files related to the LibreOffice help This package provides files related to the LibreOffice help
development. development.
%if %test_build_langs >= 1 %if %test_build_langs >= 1
%package -n libreoffice-help-cs %package -n libreoffice-help-cs
Summary: Czech Help Localization for LibreOffice Summary: Czech Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:cs) Provides: locale(libreoffice:cs)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-cs Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-cs = %version Provides: OpenOffice_org-help-cs = %version
Obsoletes: OpenOffice_org-help-cs <= %version Obsoletes: OpenOffice_org-help-cs <= %version
@ -145,7 +147,6 @@ Provides: OpenOffice_org-cs:%_prefix/ooo-2.0/help/cs/default.css
Czech help localization for LibreOffice. The other localized stuff Czech help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-cs. is in libreoffice-l10n-cs.
%endif %endif
%if %test_build_langs >= 2 %if %test_build_langs >= 2
@ -153,10 +154,20 @@ is in libreoffice-l10n-cs.
Summary: Danish Help Localization for LibreOffice Summary: Danish Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:da) Provides: locale(libreoffice:da)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-da Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-da = %version Provides: OpenOffice_org-help-da = %version
Obsoletes: OpenOffice_org-help-da <= %version Obsoletes: OpenOffice_org-help-da <= %version
@ -166,7 +177,6 @@ Provides: OpenOffice_org-da:%_prefix/ooo-2.0/help/da/default.css
Danish help localization for LibreOffice. The other localized stuff Danish help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-da. is in libreoffice-l10n-da.
%endif %endif
%if %test_build_langs >= 1 %if %test_build_langs >= 1
@ -174,10 +184,20 @@ is in libreoffice-l10n-da.
Summary: German Help Localization for LibreOffice Summary: German Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:de) Provides: locale(libreoffice:de)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-de Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-de = %version Provides: OpenOffice_org-help-de = %version
Obsoletes: OpenOffice_org-help-de <= %version Obsoletes: OpenOffice_org-help-de <= %version
@ -187,7 +207,6 @@ Provides: OpenOffice_org-de:%_prefix/ooo-2.0/help/de/default.css
German help localization for LibreOffice. The other localized stuff German help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-de. is in libreoffice-l10n-de.
%endif %endif
%if %test_build_langs >= 2 %if %test_build_langs >= 2
@ -195,10 +214,20 @@ is in libreoffice-l10n-de.
Summary: British Help Localization for LibreOffice Summary: British Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:en_GB) Provides: locale(libreoffice:en_GB)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-en-GB Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-en-GB = %version Provides: OpenOffice_org-help-en-GB = %version
Obsoletes: OpenOffice_org-help-en-GB <= %version Obsoletes: OpenOffice_org-help-en-GB <= %version
@ -212,22 +241,29 @@ is in libreoffice-l10n-en-GB.
%prep %prep
%if %prepare_build == 0 %if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version %setup -D -T -q -n libreoffice-core-%version
%else %else
%setup -q -n libreoffice-bootstrap-%version %setup -q -a30 -a31 -n libreoffice-core-%version
bin/unpack-sources `pwd` \ %patch0
%{S:1} %{S:2} %{S:3} %{S:4} %{S:5} \ bin/unpack-sources `pwd` %{S:1} %{S:2}
%{S:6} %{S:7} %{S:8} %{S:9}
# SUSE config files # SUSE config files
cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
# extra fixes # extra fixes
%patch0
%patch1 %patch1
%patch2
%endif %endif
%build %build
%if %prepare_build != 0 %if %prepare_build != 0
# first build make-3.82
cd make-*
CFLAGS=$RPM_OPT_FLAGS ./configure
make %{?_smp_mflags}
cd -
#
# second build zip-3.0
cd zip30
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
cd -
# #
# Parallel build settings ... # Parallel build settings ...
# parallel build of modules; it makes sense on machines with more CPUs # parallel build of modules; it makes sense on machines with more CPUs
@ -268,7 +304,8 @@ export JAVA_HOME=%{java_home}
# use RPM_OPT_FLAGS, ... # use RPM_OPT_FLAGS, ...
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
# FIXME: genccode from the system icu is in /usr/sbin # FIXME: genccode from the system icu is in /usr/sbin
export PATH="$PATH:/usr/sbin" # FIXME: we need make-3.82 for parallel build
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh \ ./autogen.sh \
--with-external-tar="$RPM_SOURCE_DIR" \ --with-external-tar="$RPM_SOURCE_DIR" \
@ -288,7 +325,6 @@ export PATH="$PATH:/usr/sbin"
--disable-fontconfig \ --disable-fontconfig \
--without-junit \ --without-junit \
--without-system-jpeg \ --without-system-jpeg \
--disable-python \
--disable-mozilla \ --disable-mozilla \
--disable-mono \ --disable-mono \
--without-system-curl \ --without-system-curl \
@ -310,27 +346,26 @@ export PATH="$PATH:/usr/sbin"
--disable-evolution2 --disable-evolution2
%endif %endif
./bootstrap ./bootstrap
. ./*[Ee]nv.[Ss]et.sh . ./Env.Host.sh
cd helpcontent2 cd helpcontent2
build --all $PARALLEL_BUILD build --all $PARALLEL_BUILD
%install %install
. ./*Env.Set.sh . ./Env.Host.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs test -z %lo_langs && langs="en-US" || langs=%lo_langs
mkdir -p file-lists mkdir -p file-lists
for lang in $langs ; do for lang in $langs ; do
test "$lang" = "en-US" && langdir="en" || langdir="$lang" test "$lang" = "en-US" && langdir="en" || langdir="$lang"
mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do
unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
done done
lang_underscore=`echo $lang | sed "s/-/_/g"` lang_underscore=`echo $lang | sed "s/-/_/g"`
filelist=help_${lang_underscore}_list.txt filelist=help_${lang_underscore}_list.txt
echo "%dir %_datadir/%lo_home" >file-lists/$filelist echo "%dir %_datadir/%lo_home" >file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir" >>file-lists/$filelist echo "%dir %_datadir/%lo_home/help" >>file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir/help" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type f -printf "%_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type f -printf "%_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist
# the file list is needed to create compat symlinks # the file list is needed to create compat symlinks
cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
@ -351,9 +386,9 @@ test "$1" = "0" && cp %_datadir/%lo_home/help_cs_list.txt %_datadir/%lo_home/hel
%postun -n libreoffice-help-cs %postun -n libreoffice-help-cs
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_cs_list.txt.postun || true test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_cs_list.txt.postun || true
rm -f %_datadir/%lo_home/help_cs_list.txt.postun 2>/dev/null rm -f %_datadir/%lo_home/help_cs_list.txt.postun 2>/dev/null
%endif %endif
%if %test_build_langs >= 2 %if %test_build_langs >= 2
# da # da
%posttrans -n libreoffice-help-da %posttrans -n libreoffice-help-da
@ -365,9 +400,9 @@ test "$1" = "0" && cp %_datadir/%lo_home/help_da_list.txt %_datadir/%lo_home/hel
%postun -n libreoffice-help-da %postun -n libreoffice-help-da
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_da_list.txt.postun || true test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_da_list.txt.postun || true
rm -f %_datadir/%lo_home/help_da_list.txt.postun 2>/dev/null rm -f %_datadir/%lo_home/help_da_list.txt.postun 2>/dev/null
%endif %endif
%if %test_build_langs >= 1 %if %test_build_langs >= 1
# de # de
%posttrans -n libreoffice-help-de %posttrans -n libreoffice-help-de
@ -379,9 +414,9 @@ test "$1" = "0" && cp %_datadir/%lo_home/help_de_list.txt %_datadir/%lo_home/hel
%postun -n libreoffice-help-de %postun -n libreoffice-help-de
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_de_list.txt.postun || true test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_de_list.txt.postun || true
rm -f %_datadir/%lo_home/help_de_list.txt.postun 2>/dev/null rm -f %_datadir/%lo_home/help_de_list.txt.postun 2>/dev/null
%endif %endif
%if %test_build_langs >= 2 %if %test_build_langs >= 2
# en-GB # en-GB
%posttrans -n libreoffice-help-en-GB %posttrans -n libreoffice-help-en-GB
@ -396,7 +431,6 @@ rm -f %_datadir/%lo_home/help_en_GB_list.txt.postun 2>/dev/null
%endif %endif
%if %test_build_langs >= 1 %if %test_build_langs >= 1
%files -f file-lists/help_cs_list.txt -n libreoffice-help-cs %files -f file-lists/help_cs_list.txt -n libreoffice-help-cs
%defattr(-,root,root) %defattr(-,root,root)
@ -417,6 +451,7 @@ rm -f %_datadir/%lo_home/help_en_GB_list.txt.postun 2>/dev/null
%files -f file-lists/help_en_GB_list.txt -n libreoffice-help-en-GB %files -f file-lists/help_en_GB_list.txt -n libreoffice-help-en-GB
%defattr(-,root,root) %defattr(-,root,root)
%endif %endif
%changelog %changelog

34
libreoffice-help-group2.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Wed Apr 4 13:39:46 UTC 2012 - pmladek@suse.com
- clean up lo-help-gen-spec according to lo-l10n-gen-spec
- do not supplement l10n packages; we provide support for the given locale;
the extra recommends annoys users when updating on Live-CD (bnc#551003)
- use Requires(pre) instead of PreReq on never distributions
-------------------------------------------------------------------
Wed Mar 28 15:43:47 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.5.5.2 (3.5.2-rc2)
- basis subdirectory does not longer exists on the installed system
- mozilla is not longer used for build:
* use --disable-mozilla, --without-system-mozilla, --with-system-nss,
--disable-ldap, --enable-xmlsec instead of --with-system-mozilla,
--with-system-mozilla=xulrunner
- enable python during build; it is needed to localize the sources
- use internal hacked make version 3.82, snapshot 20120301 to get fast
and reliable parallel build
- build zip-3.0 on openSUSE < 11.4; --filesync is needed during build
- libreoffice-3.5-unpack-sources.diff: allow to unpack source tarballs
- build-helpcontent-do-not-check-cups.diff: cups is not needed for helpcontent
-------------------------------------------------------------------
Wed Mar 14 14:34:11 UTC 2012 - pmladek@suse.com
- libreoffice-3.4.5.5 == SUSE 3.4.5-rc3 == final
-------------------------------------------------------------------
Mon Mar 12 18:58:39 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.4.5.5 (SUSE 3.4.5-rc3)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com

174
libreoffice-help-group2.spec
View File

@ -22,14 +22,12 @@ Name: libreoffice-help-group2
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 3.4.5.4 Version: 3.5.2.2
Release: 0 Release: 0
%define piece help %define gnu_make_version 3.82
%define lo_build_version 3.4.5.4 %define gnu_make_snapshot 20120301
%define lo_piece_version 3.4.5.4 %define zip_version 3.0
%define lo_sourcedirname libreoffice-build-%lo_piece_version %define lo_home libreoffice
%define lo_home libreoffice
%define lo_basis_dir basis3.4
# test_build_langs: 1 = de and cs # test_build_langs: 1 = de and cs
# 2 = all supported languages # 2 = all supported languages
%define test_build_langs 2 %define test_build_langs 2
@ -89,16 +87,15 @@ Summary: LibreOffice Help Development
License: LGPL-3.0 License: LGPL-3.0
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/ Url: http://www.documentfoundation.org/
Source0: libreoffice-bootstrap-%version.tar.bz2 Source0: libreoffice-core-%version.tar.bz2
Source1: libreoffice-artwork-%version.tar.bz2 Source1: libreoffice-help-%version.tar.bz2
Source2: libreoffice-help-%version.tar.bz2 Source2: libreoffice-translations-%version.tar.bz2
Source3: libreoffice-libs-core-%version.tar.bz2 # make-3.82 is needed for parallel build
Source4: libreoffice-libs-extern-sys-%version.tar.bz2 # this version extends plain make-3.82 with --warn-undefined-functions option
Source5: libreoffice-libs-extern-%version.tar.bz2 # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
Source6: libreoffice-libs-gui-%version.tar.bz2 Source30: make-%gnu_make_version-gbuild-%gnu_make_snapshot.tar.bz2
Source7: libreoffice-testing-%version.tar.bz2 # zip-3.0 or newer is required because of the --filesync feature
Source8: libreoffice-translations-%version.tar.bz2 Source31: zip-%zip_version.tar.bz2
Source9: libreoffice-ure-%version.tar.bz2
# SUSE config files # SUSE config files
Source100: SUSE.conf Source100: SUSE.conf
Source101: SUSE-10.1.conf Source101: SUSE-10.1.conf
@ -110,13 +107,10 @@ Source105: SUSE-11.4.conf
Source200: libreoffice-help-groupX.spec.in Source200: libreoffice-help-groupX.spec.in
Source201: lo-help-gen-spec Source201: lo-help-gen-spec
Source202: lo-help-groupX Source202: lo-help-groupX
# # allow to unpack source tarballs
Patch0: libreoffice-configure-typo-fontconfig.diff Patch0: libreoffice-3.5-unpack-sources.diff
# OBJEXT variable was not set correctly if AC_PROC_CC was not called early # cups is not needed for helpcontent build
# I think that it worked only by chance when there was checks for more system librarires Patch1: build-helpcontent-do-not-check-cups.diff
Patch1: libreoffice-cc-detection.diff
# it created 3.8GB build log; Build Service refused to build such package
Patch2: translations-no-warnigns-from-po2oo.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc #!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch BuildArch: noarch
@ -125,17 +119,25 @@ BuildArch: noarch
This package provides files related to the LibreOffice help This package provides files related to the LibreOffice help
development. development.
%if %test_build_langs >= 2 %if %test_build_langs >= 2
%package -n libreoffice-help-en-ZA %package -n libreoffice-help-en-ZA
Summary: South Africa English Help Localization for LibreOffice Summary: South Africa English Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:en_ZA) Provides: locale(libreoffice:en_ZA)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-en-ZA Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-en-ZA = %version Provides: OpenOffice_org-help-en-ZA = %version
Obsoletes: OpenOffice_org-help-en-ZA <= %version Obsoletes: OpenOffice_org-help-en-ZA <= %version
@ -145,16 +147,24 @@ Provides: OpenOffice_org-en-ZA:%_prefix/ooo-2.0/help/en-ZA/default.css
South Africa English help localization for LibreOffice. The other localized stuff South Africa English help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-en-ZA. is in libreoffice-l10n-en-ZA.
%package -n libreoffice-help-es %package -n libreoffice-help-es
Summary: Spanish Help Localization for LibreOffice Summary: Spanish Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:es) Provides: locale(libreoffice:es)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-es Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-es = %version Provides: OpenOffice_org-help-es = %version
Obsoletes: OpenOffice_org-help-es <= %version Obsoletes: OpenOffice_org-help-es <= %version
@ -164,16 +174,24 @@ Provides: OpenOffice_org-es:%_prefix/ooo-2.0/help/es/default.css
Spanish help localization for LibreOffice. The other localized stuff Spanish help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-es. is in libreoffice-l10n-es.
%package -n libreoffice-help-et %package -n libreoffice-help-et
Summary: Estonian Help Localization for LibreOffice Summary: Estonian Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:et) Provides: locale(libreoffice:et)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-et Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-et = %version Provides: OpenOffice_org-help-et = %version
Obsoletes: OpenOffice_org-help-et <= %version Obsoletes: OpenOffice_org-help-et <= %version
@ -183,16 +201,24 @@ Provides: OpenOffice_org-et:%_prefix/ooo-2.0/help/et/default.css
Estonian help localization for LibreOffice. The other localized stuff Estonian help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-et. is in libreoffice-l10n-et.
%package -n libreoffice-help-fr %package -n libreoffice-help-fr
Summary: French Help Localization for LibreOffice Summary: French Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:fr) Provides: locale(libreoffice:fr)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-fr Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-fr = %version Provides: OpenOffice_org-help-fr = %version
Obsoletes: OpenOffice_org-help-fr <= %version Obsoletes: OpenOffice_org-help-fr <= %version
@ -202,16 +228,24 @@ Provides: OpenOffice_org-fr:%_prefix/ooo-2.0/help/fr/default.css
French help localization for LibreOffice. The other localized stuff French help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-fr. is in libreoffice-l10n-fr.
%package -n libreoffice-help-gl %package -n libreoffice-help-gl
Summary: Galician Help Localization for LibreOffice Summary: Galician Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:gl) Provides: locale(libreoffice:gl)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-gl Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-gl = %version Provides: OpenOffice_org-help-gl = %version
Obsoletes: OpenOffice_org-help-gl <= %version Obsoletes: OpenOffice_org-help-gl <= %version
@ -225,22 +259,29 @@ is in libreoffice-l10n-gl.
%prep %prep
%if %prepare_build == 0 %if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version %setup -D -T -q -n libreoffice-core-%version
%else %else
%setup -q -n libreoffice-bootstrap-%version %setup -q -a30 -a31 -n libreoffice-core-%version
bin/unpack-sources `pwd` \ %patch0
%{S:1} %{S:2} %{S:3} %{S:4} %{S:5} \ bin/unpack-sources `pwd` %{S:1} %{S:2}
%{S:6} %{S:7} %{S:8} %{S:9}
# SUSE config files # SUSE config files
cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
# extra fixes # extra fixes
%patch0
%patch1 %patch1
%patch2
%endif %endif
%build %build
%if %prepare_build != 0 %if %prepare_build != 0
# first build make-3.82
cd make-*
CFLAGS=$RPM_OPT_FLAGS ./configure
make %{?_smp_mflags}
cd -
#
# second build zip-3.0
cd zip30
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
cd -
# #
# Parallel build settings ... # Parallel build settings ...
# parallel build of modules; it makes sense on machines with more CPUs # parallel build of modules; it makes sense on machines with more CPUs
@ -281,7 +322,8 @@ export JAVA_HOME=%{java_home}
# use RPM_OPT_FLAGS, ... # use RPM_OPT_FLAGS, ...
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
# FIXME: genccode from the system icu is in /usr/sbin # FIXME: genccode from the system icu is in /usr/sbin
export PATH="$PATH:/usr/sbin" # FIXME: we need make-3.82 for parallel build
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh \ ./autogen.sh \
--with-external-tar="$RPM_SOURCE_DIR" \ --with-external-tar="$RPM_SOURCE_DIR" \
@ -301,7 +343,6 @@ export PATH="$PATH:/usr/sbin"
--disable-fontconfig \ --disable-fontconfig \
--without-junit \ --without-junit \
--without-system-jpeg \ --without-system-jpeg \
--disable-python \
--disable-mozilla \ --disable-mozilla \
--disable-mono \ --disable-mono \
--without-system-curl \ --without-system-curl \
@ -323,27 +364,26 @@ export PATH="$PATH:/usr/sbin"
--disable-evolution2 --disable-evolution2
%endif %endif
./bootstrap ./bootstrap
. ./*[Ee]nv.[Ss]et.sh . ./Env.Host.sh
cd helpcontent2 cd helpcontent2
build --all $PARALLEL_BUILD build --all $PARALLEL_BUILD
%install %install
. ./*Env.Set.sh . ./Env.Host.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs test -z %lo_langs && langs="en-US" || langs=%lo_langs
mkdir -p file-lists mkdir -p file-lists
for lang in $langs ; do for lang in $langs ; do
test "$lang" = "en-US" && langdir="en" || langdir="$lang" test "$lang" = "en-US" && langdir="en" || langdir="$lang"
mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do
unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
done done
lang_underscore=`echo $lang | sed "s/-/_/g"` lang_underscore=`echo $lang | sed "s/-/_/g"`
filelist=help_${lang_underscore}_list.txt filelist=help_${lang_underscore}_list.txt
echo "%dir %_datadir/%lo_home" >file-lists/$filelist echo "%dir %_datadir/%lo_home" >file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir" >>file-lists/$filelist echo "%dir %_datadir/%lo_home/help" >>file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir/help" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type f -printf "%_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type f -printf "%_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist
# the file list is needed to create compat symlinks # the file list is needed to create compat symlinks
cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
@ -411,7 +451,6 @@ rm -f %_datadir/%lo_home/help_gl_list.txt.postun 2>/dev/null
%endif %endif
%if %test_build_langs >= 2 %if %test_build_langs >= 2
%files -f file-lists/help_en_ZA_list.txt -n libreoffice-help-en-ZA %files -f file-lists/help_en_ZA_list.txt -n libreoffice-help-en-ZA
%defattr(-,root,root) %defattr(-,root,root)
@ -426,6 +465,7 @@ rm -f %_datadir/%lo_home/help_gl_list.txt.postun 2>/dev/null
%files -f file-lists/help_gl_list.txt -n libreoffice-help-gl %files -f file-lists/help_gl_list.txt -n libreoffice-help-gl
%defattr(-,root,root) %defattr(-,root,root)
%endif %endif
%changelog %changelog

34
libreoffice-help-group3.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Wed Apr 4 13:39:46 UTC 2012 - pmladek@suse.com
- clean up lo-help-gen-spec according to lo-l10n-gen-spec
- do not supplement l10n packages; we provide support for the given locale;
the extra recommends annoys users when updating on Live-CD (bnc#551003)
- use Requires(pre) instead of PreReq on never distributions
-------------------------------------------------------------------
Wed Mar 28 15:43:47 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.5.5.2 (3.5.2-rc2)
- basis subdirectory does not longer exists on the installed system
- mozilla is not longer used for build:
* use --disable-mozilla, --without-system-mozilla, --with-system-nss,
--disable-ldap, --enable-xmlsec instead of --with-system-mozilla,
--with-system-mozilla=xulrunner
- enable python during build; it is needed to localize the sources
- use internal hacked make version 3.82, snapshot 20120301 to get fast
and reliable parallel build
- build zip-3.0 on openSUSE < 11.4; --filesync is needed during build
- libreoffice-3.5-unpack-sources.diff: allow to unpack source tarballs
- build-helpcontent-do-not-check-cups.diff: cups is not needed for helpcontent
-------------------------------------------------------------------
Wed Mar 14 14:34:11 UTC 2012 - pmladek@suse.com
- libreoffice-3.4.5.5 == SUSE 3.4.5-rc3 == final
-------------------------------------------------------------------
Mon Mar 12 18:58:39 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.4.5.5 (SUSE 3.4.5-rc3)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com

196
libreoffice-help-group3.spec
View File

@ -22,14 +22,12 @@ Name: libreoffice-help-group3
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 3.4.5.4 Version: 3.5.2.2
Release: 0 Release: 0
%define piece help %define gnu_make_version 3.82
%define lo_build_version 3.4.5.4 %define gnu_make_snapshot 20120301
%define lo_piece_version 3.4.5.4 %define zip_version 3.0
%define lo_sourcedirname libreoffice-build-%lo_piece_version %define lo_home libreoffice
%define lo_home libreoffice
%define lo_basis_dir basis3.4
# test_build_langs: 1 = de and cs # test_build_langs: 1 = de and cs
# 2 = all supported languages # 2 = all supported languages
%define test_build_langs 2 %define test_build_langs 2
@ -89,16 +87,15 @@ Summary: LibreOffice Help Development
License: LGPL-3.0 License: LGPL-3.0
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/ Url: http://www.documentfoundation.org/
Source0: libreoffice-bootstrap-%version.tar.bz2 Source0: libreoffice-core-%version.tar.bz2
Source1: libreoffice-artwork-%version.tar.bz2 Source1: libreoffice-help-%version.tar.bz2
Source2: libreoffice-help-%version.tar.bz2 Source2: libreoffice-translations-%version.tar.bz2
Source3: libreoffice-libs-core-%version.tar.bz2 # make-3.82 is needed for parallel build
Source4: libreoffice-libs-extern-sys-%version.tar.bz2 # this version extends plain make-3.82 with --warn-undefined-functions option
Source5: libreoffice-libs-extern-%version.tar.bz2 # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
Source6: libreoffice-libs-gui-%version.tar.bz2 Source30: make-%gnu_make_version-gbuild-%gnu_make_snapshot.tar.bz2
Source7: libreoffice-testing-%version.tar.bz2 # zip-3.0 or newer is required because of the --filesync feature
Source8: libreoffice-translations-%version.tar.bz2 Source31: zip-%zip_version.tar.bz2
Source9: libreoffice-ure-%version.tar.bz2
# SUSE config files # SUSE config files
Source100: SUSE.conf Source100: SUSE.conf
Source101: SUSE-10.1.conf Source101: SUSE-10.1.conf
@ -110,13 +107,10 @@ Source105: SUSE-11.4.conf
Source200: libreoffice-help-groupX.spec.in Source200: libreoffice-help-groupX.spec.in
Source201: lo-help-gen-spec Source201: lo-help-gen-spec
Source202: lo-help-groupX Source202: lo-help-groupX
# # allow to unpack source tarballs
Patch0: libreoffice-configure-typo-fontconfig.diff Patch0: libreoffice-3.5-unpack-sources.diff
# OBJEXT variable was not set correctly if AC_PROC_CC was not called early # cups is not needed for helpcontent build
# I think that it worked only by chance when there was checks for more system librarires Patch1: build-helpcontent-do-not-check-cups.diff
Patch1: libreoffice-cc-detection.diff
# it created 3.8GB build log; Build Service refused to build such package
Patch2: translations-no-warnigns-from-po2oo.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc #!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch BuildArch: noarch
@ -125,17 +119,25 @@ BuildArch: noarch
This package provides files related to the LibreOffice help This package provides files related to the LibreOffice help
development. development.
%if %test_build_langs >= 2 %if %test_build_langs >= 2
%package -n libreoffice-help-gu-IN %package -n libreoffice-help-gu-IN
Summary: Gujarati Help Localization for LibreOffice Summary: Gujarati Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:gu) Provides: locale(libreoffice:gu)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-gu-IN Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-gu-IN = %version Provides: OpenOffice_org-help-gu-IN = %version
Obsoletes: OpenOffice_org-help-gu-IN <= %version Obsoletes: OpenOffice_org-help-gu-IN <= %version
@ -145,16 +147,24 @@ Provides: OpenOffice_org-gu-IN:%_prefix/ooo-2.0/help/gu-IN/default.css
Gujarati help localization for LibreOffice. The other localized stuff Gujarati help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-gu-IN. is in libreoffice-l10n-gu-IN.
%package -n libreoffice-help-hi-IN %package -n libreoffice-help-hi-IN
Summary: Hindi Help Localization for LibreOffice Summary: Hindi Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:hi) Provides: locale(libreoffice:hi)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-hi-IN Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-hi-IN = %version Provides: OpenOffice_org-help-hi-IN = %version
Obsoletes: OpenOffice_org-help-hi-IN <= %version Obsoletes: OpenOffice_org-help-hi-IN <= %version
@ -164,7 +174,6 @@ Provides: OpenOffice_org-hi-IN:%_prefix/ooo-2.0/help/hi-IN/default.css
Hindi help localization for LibreOffice. The other localized stuff Hindi help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-hi-IN. is in libreoffice-l10n-hi-IN.
%endif %endif
%if %test_build_langs >= 1 %if %test_build_langs >= 1
@ -172,10 +181,20 @@ is in libreoffice-l10n-hi-IN.
Summary: Hungarian Help Localization for LibreOffice Summary: Hungarian Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:hu) Provides: locale(libreoffice:hu)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-hu Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-hu = %version Provides: OpenOffice_org-help-hu = %version
Obsoletes: OpenOffice_org-help-hu <= %version Obsoletes: OpenOffice_org-help-hu <= %version
@ -185,7 +204,6 @@ Provides: OpenOffice_org-hu:%_prefix/ooo-2.0/help/hu/default.css
Hungarian help localization for LibreOffice. The other localized stuff Hungarian help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-hu. is in libreoffice-l10n-hu.
%endif %endif
%if %test_build_langs >= 2 %if %test_build_langs >= 2
@ -193,10 +211,20 @@ is in libreoffice-l10n-hu.
Summary: Italian Help Localization for LibreOffice Summary: Italian Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:it) Provides: locale(libreoffice:it)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-it Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-it = %version Provides: OpenOffice_org-help-it = %version
Obsoletes: OpenOffice_org-help-it <= %version Obsoletes: OpenOffice_org-help-it <= %version
@ -206,7 +234,6 @@ Provides: OpenOffice_org-it:%_prefix/ooo-2.0/help/it/default.css
Italian help localization for LibreOffice. The other localized stuff Italian help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-it. is in libreoffice-l10n-it.
%endif %endif
%if %test_build_langs >= 1 %if %test_build_langs >= 1
@ -214,10 +241,20 @@ is in libreoffice-l10n-it.
Summary: Japanese Help Localization for LibreOffice Summary: Japanese Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:ja) Provides: locale(libreoffice:ja)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-ja Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-ja = %version Provides: OpenOffice_org-help-ja = %version
Obsoletes: OpenOffice_org-help-ja <= %version Obsoletes: OpenOffice_org-help-ja <= %version
@ -227,7 +264,6 @@ Provides: OpenOffice_org-ja:%_prefix/ooo-2.0/help/ja/default.css
Japanese help localization for LibreOffice. The other localized stuff Japanese help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-ja. is in libreoffice-l10n-ja.
%endif %endif
%if %test_build_langs >= 2 %if %test_build_langs >= 2
@ -235,10 +271,20 @@ is in libreoffice-l10n-ja.
Summary: Khmer Help Localization for LibreOffice Summary: Khmer Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:km) Provides: locale(libreoffice:km)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-km Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-km = %version Provides: OpenOffice_org-help-km = %version
Obsoletes: OpenOffice_org-help-km <= %version Obsoletes: OpenOffice_org-help-km <= %version
@ -252,22 +298,29 @@ is in libreoffice-l10n-km.
%prep %prep
%if %prepare_build == 0 %if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version %setup -D -T -q -n libreoffice-core-%version
%else %else
%setup -q -n libreoffice-bootstrap-%version %setup -q -a30 -a31 -n libreoffice-core-%version
bin/unpack-sources `pwd` \ %patch0
%{S:1} %{S:2} %{S:3} %{S:4} %{S:5} \ bin/unpack-sources `pwd` %{S:1} %{S:2}
%{S:6} %{S:7} %{S:8} %{S:9}
# SUSE config files # SUSE config files
cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
# extra fixes # extra fixes
%patch0
%patch1 %patch1
%patch2
%endif %endif
%build %build
%if %prepare_build != 0 %if %prepare_build != 0
# first build make-3.82
cd make-*
CFLAGS=$RPM_OPT_FLAGS ./configure
make %{?_smp_mflags}
cd -
#
# second build zip-3.0
cd zip30
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
cd -
# #
# Parallel build settings ... # Parallel build settings ...
# parallel build of modules; it makes sense on machines with more CPUs # parallel build of modules; it makes sense on machines with more CPUs
@ -308,7 +361,8 @@ export JAVA_HOME=%{java_home}
# use RPM_OPT_FLAGS, ... # use RPM_OPT_FLAGS, ...
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
# FIXME: genccode from the system icu is in /usr/sbin # FIXME: genccode from the system icu is in /usr/sbin
export PATH="$PATH:/usr/sbin" # FIXME: we need make-3.82 for parallel build
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh \ ./autogen.sh \
--with-external-tar="$RPM_SOURCE_DIR" \ --with-external-tar="$RPM_SOURCE_DIR" \
@ -328,7 +382,6 @@ export PATH="$PATH:/usr/sbin"
--disable-fontconfig \ --disable-fontconfig \
--without-junit \ --without-junit \
--without-system-jpeg \ --without-system-jpeg \
--disable-python \
--disable-mozilla \ --disable-mozilla \
--disable-mono \ --disable-mono \
--without-system-curl \ --without-system-curl \
@ -350,27 +403,26 @@ export PATH="$PATH:/usr/sbin"
--disable-evolution2 --disable-evolution2
%endif %endif
./bootstrap ./bootstrap
. ./*[Ee]nv.[Ss]et.sh . ./Env.Host.sh
cd helpcontent2 cd helpcontent2
build --all $PARALLEL_BUILD build --all $PARALLEL_BUILD
%install %install
. ./*Env.Set.sh . ./Env.Host.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs test -z %lo_langs && langs="en-US" || langs=%lo_langs
mkdir -p file-lists mkdir -p file-lists
for lang in $langs ; do for lang in $langs ; do
test "$lang" = "en-US" && langdir="en" || langdir="$lang" test "$lang" = "en-US" && langdir="en" || langdir="$lang"
mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do
unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
done done
lang_underscore=`echo $lang | sed "s/-/_/g"` lang_underscore=`echo $lang | sed "s/-/_/g"`
filelist=help_${lang_underscore}_list.txt filelist=help_${lang_underscore}_list.txt
echo "%dir %_datadir/%lo_home" >file-lists/$filelist echo "%dir %_datadir/%lo_home" >file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir" >>file-lists/$filelist echo "%dir %_datadir/%lo_home/help" >>file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir/help" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type f -printf "%_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type f -printf "%_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist
# the file list is needed to create compat symlinks # the file list is needed to create compat symlinks
cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
@ -402,9 +454,9 @@ test "$1" = "0" && cp %_datadir/%lo_home/help_hi_list.txt %_datadir/%lo_home/hel
%postun -n libreoffice-help-hi-IN %postun -n libreoffice-help-hi-IN
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_hi_list.txt.postun || true test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_hi_list.txt.postun || true
rm -f %_datadir/%lo_home/help_hi_list.txt.postun 2>/dev/null rm -f %_datadir/%lo_home/help_hi_list.txt.postun 2>/dev/null
%endif %endif
%if %test_build_langs >= 1 %if %test_build_langs >= 1
# hu # hu
%posttrans -n libreoffice-help-hu %posttrans -n libreoffice-help-hu
@ -416,9 +468,9 @@ test "$1" = "0" && cp %_datadir/%lo_home/help_hu_list.txt %_datadir/%lo_home/hel
%postun -n libreoffice-help-hu %postun -n libreoffice-help-hu
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_hu_list.txt.postun || true test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_hu_list.txt.postun || true
rm -f %_datadir/%lo_home/help_hu_list.txt.postun 2>/dev/null rm -f %_datadir/%lo_home/help_hu_list.txt.postun 2>/dev/null
%endif %endif
%if %test_build_langs >= 2 %if %test_build_langs >= 2
# it # it
%posttrans -n libreoffice-help-it %posttrans -n libreoffice-help-it
@ -430,9 +482,9 @@ test "$1" = "0" && cp %_datadir/%lo_home/help_it_list.txt %_datadir/%lo_home/hel
%postun -n libreoffice-help-it %postun -n libreoffice-help-it
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_it_list.txt.postun || true test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_it_list.txt.postun || true
rm -f %_datadir/%lo_home/help_it_list.txt.postun 2>/dev/null rm -f %_datadir/%lo_home/help_it_list.txt.postun 2>/dev/null
%endif %endif
%if %test_build_langs >= 1 %if %test_build_langs >= 1
# ja # ja
%posttrans -n libreoffice-help-ja %posttrans -n libreoffice-help-ja
@ -444,9 +496,9 @@ test "$1" = "0" && cp %_datadir/%lo_home/help_ja_list.txt %_datadir/%lo_home/hel
%postun -n libreoffice-help-ja %postun -n libreoffice-help-ja
test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_ja_list.txt.postun || true test "$1" = "0" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_ja_list.txt.postun || true
rm -f %_datadir/%lo_home/help_ja_list.txt.postun 2>/dev/null rm -f %_datadir/%lo_home/help_ja_list.txt.postun 2>/dev/null
%endif %endif
%if %test_build_langs >= 2 %if %test_build_langs >= 2
# km # km
%posttrans -n libreoffice-help-km %posttrans -n libreoffice-help-km
@ -461,7 +513,6 @@ rm -f %_datadir/%lo_home/help_km_list.txt.postun 2>/dev/null
%endif %endif
%if %test_build_langs >= 2 %if %test_build_langs >= 2
%files -f file-lists/help_gu_list.txt -n libreoffice-help-gu-IN %files -f file-lists/help_gu_list.txt -n libreoffice-help-gu-IN
%defattr(-,root,root) %defattr(-,root,root)
@ -491,6 +542,7 @@ rm -f %_datadir/%lo_home/help_km_list.txt.postun 2>/dev/null
%files -f file-lists/help_km_list.txt -n libreoffice-help-km %files -f file-lists/help_km_list.txt -n libreoffice-help-km
%defattr(-,root,root) %defattr(-,root,root)
%endif %endif
%changelog %changelog

34
libreoffice-help-group4.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Wed Apr 4 13:39:46 UTC 2012 - pmladek@suse.com
- clean up lo-help-gen-spec according to lo-l10n-gen-spec
- do not supplement l10n packages; we provide support for the given locale;
the extra recommends annoys users when updating on Live-CD (bnc#551003)
- use Requires(pre) instead of PreReq on never distributions
-------------------------------------------------------------------
Wed Mar 28 15:43:47 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.5.5.2 (3.5.2-rc2)
- basis subdirectory does not longer exists on the installed system
- mozilla is not longer used for build:
* use --disable-mozilla, --without-system-mozilla, --with-system-nss,
--disable-ldap, --enable-xmlsec instead of --with-system-mozilla,
--with-system-mozilla=xulrunner
- enable python during build; it is needed to localize the sources
- use internal hacked make version 3.82, snapshot 20120301 to get fast
and reliable parallel build
- build zip-3.0 on openSUSE < 11.4; --filesync is needed during build
- libreoffice-3.5-unpack-sources.diff: allow to unpack source tarballs
- build-helpcontent-do-not-check-cups.diff: cups is not needed for helpcontent
-------------------------------------------------------------------
Wed Mar 14 14:34:11 UTC 2012 - pmladek@suse.com
- libreoffice-3.4.5.5 == SUSE 3.4.5-rc3 == final
-------------------------------------------------------------------
Mon Mar 12 18:58:39 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.4.5.5 (SUSE 3.4.5-rc3)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com

156
libreoffice-help-group4.spec
View File

@ -22,14 +22,12 @@ Name: libreoffice-help-group4
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 3.4.5.4 Version: 3.5.2.2
Release: 0 Release: 0
%define piece help %define gnu_make_version 3.82
%define lo_build_version 3.4.5.4 %define gnu_make_snapshot 20120301
%define lo_piece_version 3.4.5.4 %define zip_version 3.0
%define lo_sourcedirname libreoffice-build-%lo_piece_version %define lo_home libreoffice
%define lo_home libreoffice
%define lo_basis_dir basis3.4
# test_build_langs: 1 = de and cs # test_build_langs: 1 = de and cs
# 2 = all supported languages # 2 = all supported languages
%define test_build_langs 2 %define test_build_langs 2
@ -89,16 +87,15 @@ Summary: LibreOffice Help Development
License: LGPL-3.0 License: LGPL-3.0
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/ Url: http://www.documentfoundation.org/
Source0: libreoffice-bootstrap-%version.tar.bz2 Source0: libreoffice-core-%version.tar.bz2
Source1: libreoffice-artwork-%version.tar.bz2 Source1: libreoffice-help-%version.tar.bz2
Source2: libreoffice-help-%version.tar.bz2 Source2: libreoffice-translations-%version.tar.bz2
Source3: libreoffice-libs-core-%version.tar.bz2 # make-3.82 is needed for parallel build
Source4: libreoffice-libs-extern-sys-%version.tar.bz2 # this version extends plain make-3.82 with --warn-undefined-functions option
Source5: libreoffice-libs-extern-%version.tar.bz2 # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
Source6: libreoffice-libs-gui-%version.tar.bz2 Source30: make-%gnu_make_version-gbuild-%gnu_make_snapshot.tar.bz2
Source7: libreoffice-testing-%version.tar.bz2 # zip-3.0 or newer is required because of the --filesync feature
Source8: libreoffice-translations-%version.tar.bz2 Source31: zip-%zip_version.tar.bz2
Source9: libreoffice-ure-%version.tar.bz2
# SUSE config files # SUSE config files
Source100: SUSE.conf Source100: SUSE.conf
Source101: SUSE-10.1.conf Source101: SUSE-10.1.conf
@ -110,13 +107,10 @@ Source105: SUSE-11.4.conf
Source200: libreoffice-help-groupX.spec.in Source200: libreoffice-help-groupX.spec.in
Source201: lo-help-gen-spec Source201: lo-help-gen-spec
Source202: lo-help-groupX Source202: lo-help-groupX
# # allow to unpack source tarballs
Patch0: libreoffice-configure-typo-fontconfig.diff Patch0: libreoffice-3.5-unpack-sources.diff
# OBJEXT variable was not set correctly if AC_PROC_CC was not called early # cups is not needed for helpcontent build
# I think that it worked only by chance when there was checks for more system librarires Patch1: build-helpcontent-do-not-check-cups.diff
Patch1: libreoffice-cc-detection.diff
# it created 3.8GB build log; Build Service refused to build such package
Patch2: translations-no-warnigns-from-po2oo.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc #!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch BuildArch: noarch
@ -125,17 +119,25 @@ BuildArch: noarch
This package provides files related to the LibreOffice help This package provides files related to the LibreOffice help
development. development.
%if %test_build_langs >= 2 %if %test_build_langs >= 2
%package -n libreoffice-help-ko %package -n libreoffice-help-ko
Summary: Korean Help Localization for LibreOffice Summary: Korean Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:ko) Provides: locale(libreoffice:ko)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-ko Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-ko = %version Provides: OpenOffice_org-help-ko = %version
Obsoletes: OpenOffice_org-help-ko <= %version Obsoletes: OpenOffice_org-help-ko <= %version
@ -145,16 +147,24 @@ Provides: OpenOffice_org-ko:%_prefix/ooo-2.0/help/ko/default.css
Korean help localization for LibreOffice. The other localized stuff Korean help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-ko. is in libreoffice-l10n-ko.
%package -n libreoffice-help-nl %package -n libreoffice-help-nl
Summary: Dutch Help Localization for LibreOffice Summary: Dutch Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:nl) Provides: locale(libreoffice:nl)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-nl Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-nl = %version Provides: OpenOffice_org-help-nl = %version
Obsoletes: OpenOffice_org-help-nl <= %version Obsoletes: OpenOffice_org-help-nl <= %version
@ -164,16 +174,24 @@ Provides: OpenOffice_org-nl:%_prefix/ooo-2.0/help/nl/default.css
Dutch help localization for LibreOffice. The other localized stuff Dutch help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-nl. is in libreoffice-l10n-nl.
%package -n libreoffice-help-pl %package -n libreoffice-help-pl
Summary: Polish Help Localization for LibreOffice Summary: Polish Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:pl) Provides: locale(libreoffice:pl)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-pl Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-pl = %version Provides: OpenOffice_org-help-pl = %version
Obsoletes: OpenOffice_org-help-pl <= %version Obsoletes: OpenOffice_org-help-pl <= %version
@ -183,16 +201,24 @@ Provides: OpenOffice_org-pl:%_prefix/ooo-2.0/help/pl/default.css
Polish help localization for LibreOffice. The other localized stuff Polish help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-pl. is in libreoffice-l10n-pl.
%package -n libreoffice-help-pt %package -n libreoffice-help-pt
Summary: Portuguese Help Localization for LibreOffice Summary: Portuguese Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:pt) Provides: locale(libreoffice:pt)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-pt Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-pt = %version Provides: OpenOffice_org-help-pt = %version
Obsoletes: OpenOffice_org-help-pt <= %version Obsoletes: OpenOffice_org-help-pt <= %version
@ -206,22 +232,29 @@ is in libreoffice-l10n-pt.
%prep %prep
%if %prepare_build == 0 %if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version %setup -D -T -q -n libreoffice-core-%version
%else %else
%setup -q -n libreoffice-bootstrap-%version %setup -q -a30 -a31 -n libreoffice-core-%version
bin/unpack-sources `pwd` \ %patch0
%{S:1} %{S:2} %{S:3} %{S:4} %{S:5} \ bin/unpack-sources `pwd` %{S:1} %{S:2}
%{S:6} %{S:7} %{S:8} %{S:9}
# SUSE config files # SUSE config files
cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
# extra fixes # extra fixes
%patch0
%patch1 %patch1
%patch2
%endif %endif
%build %build
%if %prepare_build != 0 %if %prepare_build != 0
# first build make-3.82
cd make-*
CFLAGS=$RPM_OPT_FLAGS ./configure
make %{?_smp_mflags}
cd -
#
# second build zip-3.0
cd zip30
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
cd -
# #
# Parallel build settings ... # Parallel build settings ...
# parallel build of modules; it makes sense on machines with more CPUs # parallel build of modules; it makes sense on machines with more CPUs
@ -262,7 +295,8 @@ export JAVA_HOME=%{java_home}
# use RPM_OPT_FLAGS, ... # use RPM_OPT_FLAGS, ...
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
# FIXME: genccode from the system icu is in /usr/sbin # FIXME: genccode from the system icu is in /usr/sbin
export PATH="$PATH:/usr/sbin" # FIXME: we need make-3.82 for parallel build
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh \ ./autogen.sh \
--with-external-tar="$RPM_SOURCE_DIR" \ --with-external-tar="$RPM_SOURCE_DIR" \
@ -282,7 +316,6 @@ export PATH="$PATH:/usr/sbin"
--disable-fontconfig \ --disable-fontconfig \
--without-junit \ --without-junit \
--without-system-jpeg \ --without-system-jpeg \
--disable-python \
--disable-mozilla \ --disable-mozilla \
--disable-mono \ --disable-mono \
--without-system-curl \ --without-system-curl \
@ -304,27 +337,26 @@ export PATH="$PATH:/usr/sbin"
--disable-evolution2 --disable-evolution2
%endif %endif
./bootstrap ./bootstrap
. ./*[Ee]nv.[Ss]et.sh . ./Env.Host.sh
cd helpcontent2 cd helpcontent2
build --all $PARALLEL_BUILD build --all $PARALLEL_BUILD
%install %install
. ./*Env.Set.sh . ./Env.Host.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs test -z %lo_langs && langs="en-US" || langs=%lo_langs
mkdir -p file-lists mkdir -p file-lists
for lang in $langs ; do for lang in $langs ; do
test "$lang" = "en-US" && langdir="en" || langdir="$lang" test "$lang" = "en-US" && langdir="en" || langdir="$lang"
mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do
unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
done done
lang_underscore=`echo $lang | sed "s/-/_/g"` lang_underscore=`echo $lang | sed "s/-/_/g"`
filelist=help_${lang_underscore}_list.txt filelist=help_${lang_underscore}_list.txt
echo "%dir %_datadir/%lo_home" >file-lists/$filelist echo "%dir %_datadir/%lo_home" >file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir" >>file-lists/$filelist echo "%dir %_datadir/%lo_home/help" >>file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir/help" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type f -printf "%_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type f -printf "%_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist
# the file list is needed to create compat symlinks # the file list is needed to create compat symlinks
cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
@ -381,7 +413,6 @@ rm -f %_datadir/%lo_home/help_pt_list.txt.postun 2>/dev/null
%endif %endif
%if %test_build_langs >= 2 %if %test_build_langs >= 2
%files -f file-lists/help_ko_list.txt -n libreoffice-help-ko %files -f file-lists/help_ko_list.txt -n libreoffice-help-ko
%defattr(-,root,root) %defattr(-,root,root)
@ -393,6 +424,7 @@ rm -f %_datadir/%lo_home/help_pt_list.txt.postun 2>/dev/null
%files -f file-lists/help_pt_list.txt -n libreoffice-help-pt %files -f file-lists/help_pt_list.txt -n libreoffice-help-pt
%defattr(-,root,root) %defattr(-,root,root)
%endif %endif
%changelog %changelog

34
libreoffice-help-group5.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Wed Apr 4 13:39:46 UTC 2012 - pmladek@suse.com
- clean up lo-help-gen-spec according to lo-l10n-gen-spec
- do not supplement l10n packages; we provide support for the given locale;
the extra recommends annoys users when updating on Live-CD (bnc#551003)
- use Requires(pre) instead of PreReq on never distributions
-------------------------------------------------------------------
Wed Mar 28 15:43:47 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.5.5.2 (3.5.2-rc2)
- basis subdirectory does not longer exists on the installed system
- mozilla is not longer used for build:
* use --disable-mozilla, --without-system-mozilla, --with-system-nss,
--disable-ldap, --enable-xmlsec instead of --with-system-mozilla,
--with-system-mozilla=xulrunner
- enable python during build; it is needed to localize the sources
- use internal hacked make version 3.82, snapshot 20120301 to get fast
and reliable parallel build
- build zip-3.0 on openSUSE < 11.4; --filesync is needed during build
- libreoffice-3.5-unpack-sources.diff: allow to unpack source tarballs
- build-helpcontent-do-not-check-cups.diff: cups is not needed for helpcontent
-------------------------------------------------------------------
Wed Mar 14 14:34:11 UTC 2012 - pmladek@suse.com
- libreoffice-3.4.5.5 == SUSE 3.4.5-rc3 == final
-------------------------------------------------------------------
Mon Mar 12 18:58:39 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.4.5.5 (SUSE 3.4.5-rc3)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com

192
libreoffice-help-group5.spec
View File

@ -22,14 +22,12 @@ Name: libreoffice-help-group5
## Generated by: ## Generated by:
## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX ## perl lo-help-gen-spec libreoffice-help-groupX.spec.in lo-help-groupX
################################################################### ###################################################################
Version: 3.4.5.4 Version: 3.5.2.2
Release: 0 Release: 0
%define piece help %define gnu_make_version 3.82
%define lo_build_version 3.4.5.4 %define gnu_make_snapshot 20120301
%define lo_piece_version 3.4.5.4 %define zip_version 3.0
%define lo_sourcedirname libreoffice-build-%lo_piece_version %define lo_home libreoffice
%define lo_home libreoffice
%define lo_basis_dir basis3.4
# test_build_langs: 1 = de and cs # test_build_langs: 1 = de and cs
# 2 = all supported languages # 2 = all supported languages
%define test_build_langs 2 %define test_build_langs 2
@ -89,16 +87,15 @@ Summary: LibreOffice Help Development
License: LGPL-3.0 License: LGPL-3.0
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/ Url: http://www.documentfoundation.org/
Source0: libreoffice-bootstrap-%version.tar.bz2 Source0: libreoffice-core-%version.tar.bz2
Source1: libreoffice-artwork-%version.tar.bz2 Source1: libreoffice-help-%version.tar.bz2
Source2: libreoffice-help-%version.tar.bz2 Source2: libreoffice-translations-%version.tar.bz2
Source3: libreoffice-libs-core-%version.tar.bz2 # make-3.82 is needed for parallel build
Source4: libreoffice-libs-extern-sys-%version.tar.bz2 # this version extends plain make-3.82 with --warn-undefined-functions option
Source5: libreoffice-libs-extern-%version.tar.bz2 # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
Source6: libreoffice-libs-gui-%version.tar.bz2 Source30: make-%gnu_make_version-gbuild-%gnu_make_snapshot.tar.bz2
Source7: libreoffice-testing-%version.tar.bz2 # zip-3.0 or newer is required because of the --filesync feature
Source8: libreoffice-translations-%version.tar.bz2 Source31: zip-%zip_version.tar.bz2
Source9: libreoffice-ure-%version.tar.bz2
# SUSE config files # SUSE config files
Source100: SUSE.conf Source100: SUSE.conf
Source101: SUSE-10.1.conf Source101: SUSE-10.1.conf
@ -110,13 +107,10 @@ Source105: SUSE-11.4.conf
Source200: libreoffice-help-groupX.spec.in Source200: libreoffice-help-groupX.spec.in
Source201: lo-help-gen-spec Source201: lo-help-gen-spec
Source202: lo-help-groupX Source202: lo-help-groupX
# # allow to unpack source tarballs
Patch0: libreoffice-configure-typo-fontconfig.diff Patch0: libreoffice-3.5-unpack-sources.diff
# OBJEXT variable was not set correctly if AC_PROC_CC was not called early # cups is not needed for helpcontent build
# I think that it worked only by chance when there was checks for more system librarires Patch1: build-helpcontent-do-not-check-cups.diff
Patch1: libreoffice-cc-detection.diff
# it created 3.8GB build log; Build Service refused to build such package
Patch2: translations-no-warnigns-from-po2oo.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc #!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch BuildArch: noarch
@ -125,17 +119,25 @@ BuildArch: noarch
This package provides files related to the LibreOffice help This package provides files related to the LibreOffice help
development. development.
%if %test_build_langs >= 2 %if %test_build_langs >= 2
%package -n libreoffice-help-pt-BR %package -n libreoffice-help-pt-BR
Summary: Brazilian Portuguese Help Localization for LibreOffice Summary: Brazilian Portuguese Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:pt_BR) Provides: locale(libreoffice:pt_BR)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-pt-BR Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-pt-BR = %version Provides: OpenOffice_org-help-pt-BR = %version
Obsoletes: OpenOffice_org-help-pt-BR <= %version Obsoletes: OpenOffice_org-help-pt-BR <= %version
@ -145,16 +147,24 @@ Provides: OpenOffice_org-pt-BR:%_prefix/ooo-2.0/help/pt-BR/default.css
Brazilian Portuguese help localization for LibreOffice. The other localized stuff Brazilian Portuguese help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-pt-BR. is in libreoffice-l10n-pt-BR.
%package -n libreoffice-help-ru %package -n libreoffice-help-ru
Summary: Russian Help Localization for LibreOffice Summary: Russian Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:ru) Provides: locale(libreoffice:ru)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-ru Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-ru = %version Provides: OpenOffice_org-help-ru = %version
Obsoletes: OpenOffice_org-help-ru <= %version Obsoletes: OpenOffice_org-help-ru <= %version
@ -164,16 +174,24 @@ Provides: OpenOffice_org-ru:%_prefix/ooo-2.0/help/ru/default.css
Russian help localization for LibreOffice. The other localized stuff Russian help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-ru. is in libreoffice-l10n-ru.
%package -n libreoffice-help-sl %package -n libreoffice-help-sl
Summary: Slovene Help Localization for LibreOffice Summary: Slovene Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:sl) Provides: locale(libreoffice:sl)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-sl Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-sl = %version Provides: OpenOffice_org-help-sl = %version
Obsoletes: OpenOffice_org-help-sl <= %version Obsoletes: OpenOffice_org-help-sl <= %version
@ -183,16 +201,24 @@ Provides: OpenOffice_org-sl:%_prefix/ooo-2.0/help/sl/default.css
Slovene help localization for LibreOffice. The other localized stuff Slovene help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-sl. is in libreoffice-l10n-sl.
%package -n libreoffice-help-sv %package -n libreoffice-help-sv
Summary: Swedish Help Localization for LibreOffice Summary: Swedish Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:sv) Provides: locale(libreoffice:sv)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-sv Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-sv = %version Provides: OpenOffice_org-help-sv = %version
Obsoletes: OpenOffice_org-help-sv <= %version Obsoletes: OpenOffice_org-help-sv <= %version
@ -202,16 +228,24 @@ Provides: OpenOffice_org-sv:%_prefix/ooo-2.0/help/sv/default.css
Swedish help localization for LibreOffice. The other localized stuff Swedish help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-sv. is in libreoffice-l10n-sv.
%package -n libreoffice-help-zh-CN %package -n libreoffice-help-zh-CN
Summary: Chinese Simplified Help Localization for LibreOffice Summary: Chinese Simplified Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:zh_CN) Provides: locale(libreoffice:zh_CN)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-zh-CN Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-zh-CN = %version Provides: OpenOffice_org-help-zh-CN = %version
Obsoletes: OpenOffice_org-help-zh-CN <= %version Obsoletes: OpenOffice_org-help-zh-CN <= %version
@ -221,16 +255,24 @@ Provides: OpenOffice_org-zh-CN:%_prefix/ooo-2.0/help/zh-CN/default.css
Chinese Simplified help localization for LibreOffice. The other localized stuff Chinese Simplified help localization for LibreOffice. The other localized stuff
is in libreoffice-l10n-zh-CN. is in libreoffice-l10n-zh-CN.
%package -n libreoffice-help-zh-TW %package -n libreoffice-help-zh-TW
Summary: Chinese Traditional Help Localization for LibreOffice Summary: Chinese Traditional Help Localization for LibreOffice
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Provides: locale(libreoffice:zh_TW) Provides: locale(libreoffice:zh_TW)
PreReq: libreoffice = %version %if 0%{?suse_version} > 01120
%if 0%{?suse_version} Requires(post): coreutils
Supplements: libreoffice-l10n-zh-TW Requires(post): grep
Requires(post): libreoffice >= 3.5
Requires(postun): coreutils
Requires(postun): grep
Requires(postun): libreoffice >= 3.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01120
PreReq: coreutils
PreReq: grep
PreReq: libreoffice >= 3.5
%endif
Requires: libreoffice = %{version}
# compat stuff # compat stuff
Provides: OpenOffice_org-help-zh-TW = %version Provides: OpenOffice_org-help-zh-TW = %version
Obsoletes: OpenOffice_org-help-zh-TW <= %version Obsoletes: OpenOffice_org-help-zh-TW <= %version
@ -244,22 +286,29 @@ is in libreoffice-l10n-zh-TW.
%prep %prep
%if %prepare_build == 0 %if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version %setup -D -T -q -n libreoffice-core-%version
%else %else
%setup -q -n libreoffice-bootstrap-%version %setup -q -a30 -a31 -n libreoffice-core-%version
bin/unpack-sources `pwd` \ %patch0
%{S:1} %{S:2} %{S:3} %{S:4} %{S:5} \ bin/unpack-sources `pwd` %{S:1} %{S:2}
%{S:6} %{S:7} %{S:8} %{S:9}
# SUSE config files # SUSE config files
cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
# extra fixes # extra fixes
%patch0
%patch1 %patch1
%patch2
%endif %endif
%build %build
%if %prepare_build != 0 %if %prepare_build != 0
# first build make-3.82
cd make-*
CFLAGS=$RPM_OPT_FLAGS ./configure
make %{?_smp_mflags}
cd -
#
# second build zip-3.0
cd zip30
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
cd -
# #
# Parallel build settings ... # Parallel build settings ...
# parallel build of modules; it makes sense on machines with more CPUs # parallel build of modules; it makes sense on machines with more CPUs
@ -300,7 +349,8 @@ export JAVA_HOME=%{java_home}
# use RPM_OPT_FLAGS, ... # use RPM_OPT_FLAGS, ...
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
# FIXME: genccode from the system icu is in /usr/sbin # FIXME: genccode from the system icu is in /usr/sbin
export PATH="$PATH:/usr/sbin" # FIXME: we need make-3.82 for parallel build
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh \ ./autogen.sh \
--with-external-tar="$RPM_SOURCE_DIR" \ --with-external-tar="$RPM_SOURCE_DIR" \
@ -320,7 +370,6 @@ export PATH="$PATH:/usr/sbin"
--disable-fontconfig \ --disable-fontconfig \
--without-junit \ --without-junit \
--without-system-jpeg \ --without-system-jpeg \
--disable-python \
--disable-mozilla \ --disable-mozilla \
--disable-mono \ --disable-mono \
--without-system-curl \ --without-system-curl \
@ -342,27 +391,26 @@ export PATH="$PATH:/usr/sbin"
--disable-evolution2 --disable-evolution2
%endif %endif
./bootstrap ./bootstrap
. ./*[Ee]nv.[Ss]et.sh . ./Env.Host.sh
cd helpcontent2 cd helpcontent2
build --all $PARALLEL_BUILD build --all $PARALLEL_BUILD
%install %install
. ./*Env.Set.sh . ./Env.Host.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs test -z %lo_langs && langs="en-US" || langs=%lo_langs
mkdir -p file-lists mkdir -p file-lists
for lang in $langs ; do for lang in $langs ; do
test "$lang" = "en-US" && langdir="en" || langdir="$lang" test "$lang" = "en-US" && langdir="en" || langdir="$lang"
mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do
unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
done done
lang_underscore=`echo $lang | sed "s/-/_/g"` lang_underscore=`echo $lang | sed "s/-/_/g"`
filelist=help_${lang_underscore}_list.txt filelist=help_${lang_underscore}_list.txt
echo "%dir %_datadir/%lo_home" >file-lists/$filelist echo "%dir %_datadir/%lo_home" >file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir" >>file-lists/$filelist echo "%dir %_datadir/%lo_home/help" >>file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir/help" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type f -printf "%_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type f -printf "%_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist
# the file list is needed to create compat symlinks # the file list is needed to create compat symlinks
cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
@ -441,7 +489,6 @@ rm -f %_datadir/%lo_home/help_zh_TW_list.txt.postun 2>/dev/null
%endif %endif
%if %test_build_langs >= 2 %if %test_build_langs >= 2
%files -f file-lists/help_pt_BR_list.txt -n libreoffice-help-pt-BR %files -f file-lists/help_pt_BR_list.txt -n libreoffice-help-pt-BR
%defattr(-,root,root) %defattr(-,root,root)
@ -459,6 +506,7 @@ rm -f %_datadir/%lo_home/help_zh_TW_list.txt.postun 2>/dev/null
%files -f file-lists/help_zh_TW_list.txt -n libreoffice-help-zh-TW %files -f file-lists/help_zh_TW_list.txt -n libreoffice-help-zh-TW
%defattr(-,root,root) %defattr(-,root,root)
%endif %endif
%changelog %changelog

126
libreoffice-help-groupX.spec.in
View File

@ -15,19 +15,15 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: libreoffice-help-group@GROUP_NUMBER@ Name: libreoffice-help-group@GROUP_NUMBER@
@DO_NOT_EDIT_COMMENT@ @DO_NOT_EDIT_COMMENT@
Version: 3.4.5.4 Version: 3.5.2.2
Release: 1 Release: 0
%define piece help %define gnu_make_version 3.82
%define lo_build_version 3.4.5.4 %define gnu_make_snapshot 20120301
%define lo_piece_version 3.4.5.4 %define zip_version 3.0
%define lo_sourcedirname libreoffice-build-%lo_piece_version %define lo_home libreoffice
%define lo_home libreoffice
%define lo_basis_dir basis3.4
# test_build_langs: 1 = de and cs # test_build_langs: 1 = de and cs
# 2 = all supported languages # 2 = all supported languages
%define test_build_langs 2 %define test_build_langs 2
@ -50,29 +46,52 @@ Release: 1
%endif %endif
#!BuildIgnore: libreoffice #!BuildIgnore: libreoffice
# both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22 # both zip and perl-Archive-Zip are needed; tested with ooo320-m3, 2009-10-22
BuildRequires: ant ant-apache-regexp automake bison boost-devel db-devel flac-devel flex freetype2-devel gcc-c++ gperf icu java-devel libcppunit-devel libexpat-devel libicu-devel libxml2-devel libxslt-devel openssl-devel perl-Archive-Zip perl-Compress-Zlib pkg-config python-devel unzip xorg-x11-devel zip BuildRequires: ant
BuildRequires: ant-apache-regexp
BuildRequires: automake
BuildRequires: bison
BuildRequires: boost-devel
BuildRequires: db-devel
BuildRequires: flac-devel
BuildRequires: flex
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: gperf
BuildRequires: icu
BuildRequires: java-devel
BuildRequires: libcppunit-devel
BuildRequires: libexpat-devel
BuildRequires: libicu-devel
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: openssl-devel
BuildRequires: perl-Archive-Zip
BuildRequires: perl-Compress-Zlib
BuildRequires: pkg-config
BuildRequires: python-devel
BuildRequires: unzip
BuildRequires: xorg-x11-devel
BuildRequires: zip
%if 0%{?suse_version} == 01010 %if 0%{?suse_version} == 01010
# is not required by Java SDKs by mistake on SLED10 # is not required by Java SDKs by mistake on SLED10
BuildRequires: update-alternatives BuildRequires: update-alternatives
%endif %endif
License: LGPL-3.0
Group: Productivity/Office/Suite
AutoReqProv: on
# compat stuff # compat stuff
Provides: OpenOffice_org-help-group@GROUP_NUMBER@ = %version Provides: OpenOffice_org-help-group@GROUP_NUMBER@ = %version
Obsoletes: OpenOffice_org-help-group@GROUP_NUMBER@ <= %version Obsoletes: OpenOffice_org-help-group@GROUP_NUMBER@ <= %version
Summary: LibreOffice Help Development Summary: LibreOffice Help Development
License: LGPL-3.0
Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/ Url: http://www.documentfoundation.org/
Source0: libreoffice-bootstrap-%version.tar.bz2 Source0: libreoffice-core-%version.tar.bz2
Source1: libreoffice-artwork-%version.tar.bz2 Source1: libreoffice-help-%version.tar.bz2
Source2: libreoffice-help-%version.tar.bz2 Source2: libreoffice-translations-%version.tar.bz2
Source3: libreoffice-libs-core-%version.tar.bz2 # make-3.82 is needed for parallel build
Source4: libreoffice-libs-extern-sys-%version.tar.bz2 # this version extends plain make-3.82 with --warn-undefined-functions option
Source5: libreoffice-libs-extern-%version.tar.bz2 # URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
Source6: libreoffice-libs-gui-%version.tar.bz2 Source30: make-%gnu_make_version-gbuild-%gnu_make_snapshot.tar.bz2
Source7: libreoffice-testing-%version.tar.bz2 # zip-3.0 or newer is required because of the --filesync feature
Source8: libreoffice-translations-%version.tar.bz2 Source31: zip-%zip_version.tar.bz2
Source9: libreoffice-ure-%version.tar.bz2
# SUSE config files # SUSE config files
Source100: SUSE.conf Source100: SUSE.conf
Source101: SUSE-10.1.conf Source101: SUSE-10.1.conf
@ -84,42 +103,44 @@ Source105: SUSE-11.4.conf
Source200: libreoffice-help-groupX.spec.in Source200: libreoffice-help-groupX.spec.in
Source201: lo-help-gen-spec Source201: lo-help-gen-spec
Source202: lo-help-groupX Source202: lo-help-groupX
# # allow to unpack source tarballs
Patch0: libreoffice-configure-typo-fontconfig.diff Patch0: libreoffice-3.5-unpack-sources.diff
# OBJEXT variable was not set correctly if AC_PROC_CC was not called early # cups is not needed for helpcontent build
# I think that it worked only by chance when there was checks for more system librarires Patch1: build-helpcontent-do-not-check-cups.diff
Patch1: libreoffice-cc-detection.diff
# it created 3.8GB build log; Build Service refused to build such package
Patch2: translations-no-warnigns-from-po2oo.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
#!ExclusiveArch: %ix86 x86_64 ppc #!ExclusiveArch: %ix86 x86_64 ppc
BuildArch: noarch BuildArch: noarch
%description %description
This package provides files related to the LibreOffice help This package provides files related to the LibreOffice help
development. development.
@SUBPACKAGES_METAINFO@ @SUBPACKAGES_METAINFO@
%prep %prep
%if %prepare_build == 0 %if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version %setup -D -T -q -n libreoffice-core-%version
%else %else
%setup -q -n libreoffice-bootstrap-%version %setup -q -a30 -a31 -n libreoffice-core-%version
bin/unpack-sources `pwd` \ %patch0
%{S:1} %{S:2} %{S:3} %{S:4} %{S:5} \ bin/unpack-sources `pwd` %{S:1} %{S:2}
%{S:6} %{S:7} %{S:8} %{S:9}
# SUSE config files # SUSE config files
cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs cp %{S:100} %{S:101} %{S:102} %{S:103} %{S:104} %{S:105} distro-configs
# extra fixes # extra fixes
%patch0
%patch1 %patch1
%patch2
%endif %endif
%build %build
%if %prepare_build != 0 %if %prepare_build != 0
# first build make-3.82
cd make-*
CFLAGS=$RPM_OPT_FLAGS ./configure
make %{?_smp_mflags}
cd -
#
# second build zip-3.0
cd zip30
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
cd -
# #
# Parallel build settings ... # Parallel build settings ...
# parallel build of modules; it makes sense on machines with more CPUs # parallel build of modules; it makes sense on machines with more CPUs
@ -160,7 +181,8 @@ export JAVA_HOME=%{java_home}
# use RPM_OPT_FLAGS, ... # use RPM_OPT_FLAGS, ...
export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing" export ARCH_FLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/\-O[0-9s]//g' -e 's/\-fexceptions//g'` -fno-strict-aliasing"
# FIXME: genccode from the system icu is in /usr/sbin # FIXME: genccode from the system icu is in /usr/sbin
export PATH="$PATH:/usr/sbin" # FIXME: we need make-3.82 for parallel build
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh \ ./autogen.sh \
--with-external-tar="$RPM_SOURCE_DIR" \ --with-external-tar="$RPM_SOURCE_DIR" \
@ -180,7 +202,6 @@ export PATH="$PATH:/usr/sbin"
--disable-fontconfig \ --disable-fontconfig \
--without-junit \ --without-junit \
--without-system-jpeg \ --without-system-jpeg \
--disable-python \
--disable-mozilla \ --disable-mozilla \
--disable-mono \ --disable-mono \
--without-system-curl \ --without-system-curl \
@ -202,39 +223,34 @@ export PATH="$PATH:/usr/sbin"
--disable-evolution2 --disable-evolution2
%endif %endif
./bootstrap ./bootstrap
. ./*[Ee]nv.[Ss]et.sh . ./Env.Host.sh
cd helpcontent2 cd helpcontent2
build --all $PARALLEL_BUILD build --all $PARALLEL_BUILD
%install %install
. ./*Env.Set.sh . ./Env.Host.sh
test -z %lo_langs && langs="en-US" || langs=%lo_langs test -z %lo_langs && langs="en-US" || langs=%lo_langs
mkdir -p file-lists mkdir -p file-lists
for lang in $langs ; do for lang in $langs ; do
test "$lang" = "en-US" && langdir="en" || langdir="$lang" test "$lang" = "en-US" && langdir="en" || langdir="$lang"
mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do for pack in helpcontent2/$INPATH/bin/s*$lang.zip ; do
unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir unzip $pack -d $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir
done done
lang_underscore=`echo $lang | sed "s/-/_/g"` lang_underscore=`echo $lang | sed "s/-/_/g"`
filelist=help_${lang_underscore}_list.txt filelist=help_${lang_underscore}_list.txt
echo "%dir %_datadir/%lo_home" >file-lists/$filelist echo "%dir %_datadir/%lo_home" >file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir" >>file-lists/$filelist echo "%dir %_datadir/%lo_home/help" >>file-lists/$filelist
echo "%dir %_datadir/%lo_home/%lo_basis_dir/help" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type d -printf "%%%%dir %_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist find $RPM_BUILD_ROOT/%_datadir/%lo_home/help/$langdir -type f -printf "%_datadir/%lo_home/help/$langdir/%%P\n" >>file-lists/$filelist
find $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help/$langdir -type f -printf "%_datadir/%lo_home/%lo_basis_dir/help/$langdir/%%P\n" >>file-lists/$filelist
# the file list is needed to create compat symlinks # the file list is needed to create compat symlinks
cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home cp file-lists/$filelist $RPM_BUILD_ROOT/%_datadir/%lo_home
echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist echo "%_datadir/%lo_home/$filelist" >>file-lists/$filelist
done done
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@SUBPACKAGES_SCRIPTS@ @SUBPACKAGES_SCRIPTS@
@SUBPACKAGES_FILELIST@ @SUBPACKAGES_FILELIST@
%changelog %changelog

3
libreoffice-impress-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e22d5a6ec37f8ee26f498e2f3b1211ab5a1d8a332d520d7635ad2cae66a633c0
size 2654960

3
libreoffice-libs-core-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7341def5ef4d8361180083889258a859d3e58f34f67c3f987b3b09f0d537f11a
size 15599920

3
libreoffice-libs-extern-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:092ce3e851d9341c3f08f3bd8c67ef415a0da02865bc98739361ddd2d498c0fe
size 643107

3
libreoffice-libs-extern-sys-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:24988af940be0476ebe9e09a3deeed679b2ee253d064506da6d1dc9d8e094ca4
size 44696189

3
libreoffice-libs-gui-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9be8b974a995b0439ec068825d25919c966293ac247a241411aa51eb1a054ee1
size 10871543

28
libreoffice-poppler-0.17.0-reject-fix.diff
View File

@ -1,6 +1,6 @@
--- configure.in --- configure.in.old 2012-03-01 14:58:45.000000000 +0100
+++ configure.in +++ configure.in 2012-03-01 16:20:38.000000000 +0100
@@ -6598,16 +6598,6 @@ @@ -7259,16 +7259,6 @@ if test "x$enable_ext_pdfimport" != "xno
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_POPPLER=YES SYSTEM_POPPLER=YES
PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 ) PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
@ -17,9 +17,9 @@
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
SYSTEM_POPPLER=NO SYSTEM_POPPLER=NO
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.old 2012-02-24 16:34:51.000000000 +0100
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2012-03-01 16:20:38.000000000 +0100
@@ -150,11 +150,7 @@ @@ -150,11 +150,7 @@ void writeBinaryBuffer( const OutputBuff
void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed ) void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
{ {
// dump JPEG file as-is // dump JPEG file as-is
@ -31,7 +31,7 @@
str->reset(); str->reset();
int c; int c;
@@ -493,11 +489,7 @@ @@ -493,11 +489,7 @@ void PDFOutDev::endPage()
printf("endPage\n"); printf("endPage\n");
} }
@ -43,9 +43,9 @@
{ {
assert(link); assert(link);
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx --- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.old 2012-02-24 16:34:51.000000000 +0100
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2012-03-01 16:20:38.000000000 +0100
@@ -65,14 +65,7 @@ @@ -65,14 +65,7 @@ class GfxPath;
class GfxFont; class GfxFont;
class PDFDoc; class PDFDoc;
#ifndef SYSTEM_POPPLER #ifndef SYSTEM_POPPLER
@ -60,16 +60,16 @@
#endif #endif
namespace pdfi namespace pdfi
@@ -201,12 +194,8 @@ @@ -201,12 +194,8 @@ namespace pdfi
// virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy); // virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
// virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy); // virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
- #if POPPLER_CHECK_VERSION(0, 17, 0) - #if POPPLER_CHECK_VERSION(0, 17, 0)
- virtual void processLink(AnnotLink *link, Catalog *catalog); - virtual void processLink(AnnotLink *link, Catalog *catalog);
- #else - #else
//----- link borders //----- link borders
virtual void processLink(Link *link, Catalog *catalog); virtual void processLink(Link *link, Catalog *catalog);
- #endif - #endif
//----- save/restore graphics state //----- save/restore graphics state
virtual void saveState(GfxState *state); virtual void saveState(GfxState *state);

3
libreoffice-postprocess-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a53efd2418bc86ca6a064941aa9d789db4d8c23fdde41702eab30bc427a75bb4
size 51752

8
libreoffice-postprocess-optional-helpcontent.diff
View File

@ -1,8 +0,0 @@
--- postprocess/prj/build.lst.old 2011-05-20 18:06:23.000000000 +0200
+++ postprocess/prj/build.lst 2011-07-08 13:00:11.000000000 +0200
@@ -1,4 +1,4 @@
-po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep CT2N:ct2n cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt NULL
+po postprocess :: accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep CT2N:ct2n cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker HELPCONTENT2:helpcontent2 hwpfilter io lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\checkdeliver nmake - all po_checkdlv NULL

3
libreoffice-sdk-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:564504c2d4f92c122e7fc7050ec3220b199f32a9778e5f3b7f4b33238e7cdf43
size 1722647

3
libreoffice-testing-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a5001274f433d05c8e011a4a8e696246a1b01ea403e77237844cea5a265a0fdf
size 50847830

3
libreoffice-translations-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f8642c3810af15fa578d82145fdca5c0c8676e85ad50e07b1c3b6202a8c53225
size 137849561

3
libreoffice-translations-3.5.2.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3c1136c4170c189b83c5f26d5c933f7d11cdd3b51ed0ee9e6745761a978ceba5
size 139013566

3
libreoffice-ure-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3007a927ab97ca781c45038acac63efb77b57f4069fb3d590e738fcf76c3c0e0
size 6237557

3
libreoffice-writer-3.4.5.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79b97d83fafaeefc2fabda34679dfc1c2c07c3e272ca6bb82229adccda24d54d
size 7309016

142
libreoffice.changes
View File

@ -1,3 +1,145 @@
-------------------------------------------------------------------
Wed Apr 4 12:44:47 UTC 2012 - pmladek@suse.com
- solenv-java-source-version.diff: generate selected bytecode
version also in gbuild
- enable again the brp check for byte code version
-------------------------------------------------------------------
Wed Mar 28 15:43:47 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.5.5.2 (3.5.2-rc2)
* general
* support Java 7 (1.7)
* produce ODF 1.2 conforming documents by default
* more secure encryption algorithm (AES-256) for password protection
* core GUI changes
* better color picker
* transparent object handles
* better handle unused toolbar menus
* move context-sensitive toolbars to the bottom
* several GTK+ right-to-left interface glitches
* menus list their entries in a natural sort order
* "Link" checkbox in "Insert Movie and Sound" dialog
* filter bundled, shared, and user extensions in the manager dialog
* writer
* RTF import rewrite
* new numbering types
* grammar checking improvements
* better page breaks indicators
* TOC use hyperlinks by default
* various DOCX import improvements
* support comments DOCX export/import
* label printing positioning (fdo#36874)
* display bitmap image resolution in PPI
* numbering in DOC, DOCX, and RTF import
* better UI for Header and Footers handling
* Basic Fonts (Western) option page removed
* handling of tab stop behind the end margin
* new typographic features by improved Graphite port
* display non-printable characters on the end of line
* modeless word count dialog; being updated when typing
* corrected autotext "Formula numbering" for most locales
* calc
* more new line ends
* supports 10000 sheets
* new multiline input bar
* additional data point markers
* updated line chart's smoothing
* re-designed all range name dialogs
* re-designed Autofilter popup window
* improved performance of ODS/XLS/XLSX import
* improved performance of many sheet operations
* better handling DDE and external links failures
* unlimited number of rules for conditional formatting
* configurable initial number of sheets in new documents
* "Protect Sheet" also from the context menu of the sheet tab
* allow pasting a single cell range to multiple destination ranges
* new Calc Functions: BITAND, BITOR, BITXOR BITRSHIFT, BITLSHIFT, SEC,
CSC, SECH, and CSCH
* impress / draw
* elliptical arcs in path
* better hidden slides PDF export
* better Smart Art in PPTX import
* MS Visio documents import/export
* better handling of custom animation list
* start Impress without the wizard by default
* better custom shapes and their presets in PPTX import
* support embedding palettes and other property list types
* math
* new "does not exist" symbol
* new symbols for Games theory
* support math formulas in DOCX import/export
* base
* lots fixes
* integrated PostgreSQL native driver
* Basic IDE
* new menu item View->Goto Line
* new menu item View->Line Numbers
* dialog controls have a spinbutton
* presenter console extension
* "Exchange Screen Images" button to work around problems with
detecting projector and laptop screen
* Python scripting
* allow to initialize UNO structures by name instead of by position
* localization
* update translations
* better date handling
- remove obsolete testtool subpackage; not longer supported and maintained
- basis subdirectory does not longer exists on the installed system
- mozilla is not longer needed for build:
* use --disable-mozilla, --without-system-mozilla, --with-system-nss,
--disable-ldap, --enable-xmlsec instead of --with-system-mozilla,
--with-system-mozilla=xulrunner
- numbretext and GoogleDocs extensions are integrated upstream:
* use --enable-ext-google-docs and --enable-ext-numbertext
- use --without-help to build help separately instead of the patches
- use internal hacked make version 3.82, snapshot 20120301 to get fast
and reliable parallel build
- build zip-3.0 on openSUSE < 11.4; --filesync is needed during build
- temporary disable check for bytecode version until we produce right
bytecode again
- temporary disable mono support
- update numbertext to version 0.9.4
- update libexttextcat to version 3.2.0
- update mysql-connector-c++ to version 1.1.0
- update libwpg to version 0.2.1
- update libwpd to version 0.9.4
- update libwps to version 0.2.4
- remove obsolete translate-toolkit
- add libcmis, version 0.1.0
- add libvisio, version 0.0.15
- add librsvg, version 2.32.1
- add postgresql, version 9.1.1 for SLED11; the system one is perfectly fine
for newer systems
- libreoffice-3.5-unpack-sources.diff: allow to unpack source tarballs
- javasetting-mark-config.diff: mark share/config/javasettingsunopkginstall.xml
as %config; it is updated by unopkg in %post
- scripting-prefer-internal-rhino.diff: put internal rhino into XBootClasspath
to fix build with OpenJDK
- distro-install-file-lists-3.5.diff: update file list generation for 3.5
- library-link-order-to-build-with-as-needed.diff: fix build with link as needed
- mediawiki-no-broken-help.diff: disable non-working help also in the mediawiki
extensions
- zip-3.0-*.patch: fixes from zip source package
-------------------------------------------------------------------
Wed Mar 14 14:34:11 UTC 2012 - pmladek@suse.com
- libreoffice-3.4.5.5 == SUSE 3.4.5-rc3 == final
-------------------------------------------------------------------
Mon Mar 12 18:58:39 UTC 2012 - pmladek@suse.com
- updated to libreoffice-3.4.5.5 (SUSE 3.4.5-rc3):
* extras
* add SUSE color palette (fate#312645)
* filters
* crash when loading embedded elements (bnc#693238)
* crash when importing an empty paragraph (rh#667082)
* writer
* do not use an invalidated iterator (fdo#46337)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com Tue Mar 6 15:55:09 UTC 2012 - pmladek@suse.com

311
libreoffice.spec
View File

@ -222,16 +222,18 @@ BuildRequires: xml-commons-apis
# LO paths # LO paths
%define lo_prefix %_libdir %define lo_prefix %_libdir
%define lo_home libreoffice %define lo_home libreoffice
%define lo_basis_dir basis3.4 %define gnu_make_version 3.82
%define gnu_make_snapshot 20120301
%define zip_version 3.0
# extensions # extensions
%define ct2n_version 1.3.2 %define ct2n_version 1.3.2
%define gdocs_version 3.0.0 %define gdocs_version 3.0.0
%define numbertext_version 0.8.2 %define numbertext_version 0.9.4
%if 0%{?meego_version} %if 0%{?meego_version}
# the manifest file must be in the right place; registration does not work with some repacked jars # the manifest file must be in the right place; registration does not work with some repacked jars
%define __jar_repack %{nil} %define __jar_repack %{nil}
%endif %endif
Version: 3.4.5.4 Version: 3.5.2.2
Release: 0 Release: 0
Requires: libreoffice-branding < 4 Requires: libreoffice-branding < 4
Requires: libreoffice-branding > 3.2.99.3 Requires: libreoffice-branding > 3.2.99.3
@ -387,6 +389,11 @@ Provides: OpenOffice_org-testing = %version
Obsoletes: OpenOffice_org-testing < %version Obsoletes: OpenOffice_org-testing < %version
Provides: libreoffice-testing = %version Provides: libreoffice-testing = %version
Obsoletes: libreoffice-testing < %version Obsoletes: libreoffice-testing < %version
# testool does not longer exists
Provides: OpenOffice_org-testtool = %version
Obsoletes: OpenOffice_org-testtool < %version
Provides: libreoffice-testtool = %version
Obsoletes: libreoffice-testtool < %version
# ure # ure
Provides: OpenOffice_org-ure = %version Provides: OpenOffice_org-ure = %version
Obsoletes: OpenOffice_org-ure < %version Obsoletes: OpenOffice_org-ure < %version
@ -476,28 +483,18 @@ Summary: A Free Office Suite (Framework)
License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT
Group: Productivity/Office/Suite Group: Productivity/Office/Suite
Url: http://www.documentfoundation.org/ Url: http://www.documentfoundation.org/
Source0: libreoffice-bootstrap-%version.tar.bz2 Source0: libreoffice-core-%version.tar.bz2
Source1: libreoffice-artwork-%version.tar.bz2 Source1: libreoffice-binfilter-%version.tar.bz2
Source2: libreoffice-base-%version.tar.bz2 Source2: libreoffice-help-%version.tar.bz2
Source3: libreoffice-calc-%version.tar.bz2 Source3: libreoffice-translations-%version.tar.bz2
Source4: libreoffice-components-%version.tar.bz2
Source5: libreoffice-extensions-%version.tar.bz2
Source6: libreoffice-extras-%version.tar.bz2
Source7: libreoffice-filters-%version.tar.bz2
Source8: libreoffice-help-%version.tar.bz2
Source9: libreoffice-impress-%version.tar.bz2
Source10: libreoffice-libs-core-%version.tar.bz2
Source11: libreoffice-libs-extern-sys-%version.tar.bz2
Source12: libreoffice-libs-extern-%version.tar.bz2
Source13: libreoffice-libs-gui-%version.tar.bz2
Source14: libreoffice-postprocess-%version.tar.bz2
Source15: libreoffice-sdk-%version.tar.bz2
Source16: libreoffice-testing-%version.tar.bz2
Source17: libreoffice-translations-%version.tar.bz2
Source18: libreoffice-ure-%version.tar.bz2
Source19: libreoffice-writer-%version.tar.bz2
# 256x256 desktop icons (bnc#722644) # 256x256 desktop icons (bnc#722644)
Source20: libreoffice-desktop-icons-256x256.tar.bz2 Source20: libreoffice-desktop-icons-256x256.tar.bz2
# make-3.82 is needed for parallel build
# this version extends plain make-3.82 with --warn-undefined-functions option
# URL: http://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/make-3.82-gbuild, snapshot 2011-08-17
Source30: make-%gnu_make_version-gbuild-%gnu_make_snapshot.tar.bz2
# zip-3.0 or newer is required because of the --filesync feature
Source31: zip-%zip_version.tar.bz2
# SUSE config files # SUSE config files
Source100: SUSE.conf Source100: SUSE.conf
Source101: SUSE-10.1.conf Source101: SUSE-10.1.conf
@ -514,6 +511,8 @@ Source200: %name-rpmlintrc
Source201: sofficerc-upstream Source201: sofficerc-upstream
# This background is used by another Novell product, added 2006-02-08 # This background is used by another Novell product, added 2006-02-08
Source202: Draft.jpg Source202: Draft.jpg
# temporary disabled mono package
Source203: README-mono.txt
# helper scripts # helper scripts
# create compat symlinks from /usr/share to /usr/lib(64); used by noarch packages # create compat symlinks from /usr/share to /usr/lib(64); used by noarch packages
Source300: link-to-ooo-home Source300: link-to-ooo-home
@ -521,7 +520,7 @@ Source300: link-to-ooo-home
Source400: README-scsolver.txt Source400: README-scsolver.txt
# prebuilt extensions # prebuilt extensions
Source401: cea0f63d5985ba4fcbd882031df44346-gdocs_%{gdocs_version}_modified.oxt Source401: cea0f63d5985ba4fcbd882031df44346-gdocs_%{gdocs_version}_modified.oxt
Source402: numbertext-%{numbertext_version}.oxt Source402: b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
# used extensions sources # used extensions sources
Source450: 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt Source450: 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
Source451: 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.zip Source451: 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.zip
@ -560,7 +559,7 @@ Source1001: ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
Source1002: af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz Source1002: af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
Source1003: a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip Source1003: a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
Source1004: ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip Source1004: ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
Source1005: b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 Source1005: 061a9f17323117c9358ed60f33ecff78-postgresql-9.1.1.tar.bz2
Source1006: ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz Source1006: ca66e26082cab8bb817185a116db809b-redland-1.0.8.tar.gz
Source1007: db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip Source1007: db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
Source1008: d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip Source1008: d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
@ -573,7 +572,7 @@ Source1014: f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
Source1015: 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz Source1015: 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz
Source1016: 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz Source1016: 067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz
Source1017: 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz Source1017: 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
Source1018: 128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz Source1018: e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
Source1019: 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip Source1019: 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
Source1020: 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz Source1020: 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
Source1021: 185d60944ea767075d27247c3162b3bc-unowinreg.dll Source1021: 185d60944ea767075d27247c3162b3bc-unowinreg.dll
@ -588,18 +587,22 @@ Source1029: 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
Source1030: 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip Source1030: 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
Source1031: 48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz Source1031: 48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz
Source1032: 48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz Source1032: 48d8169acc35f97e05d8dcdfd45be7f2-lucene-2.3.2.tar.gz
Source1033: 5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2 Source1033: 9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
Source1034: 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 Source1034: 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
Source1035: 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source1035: 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
Source1036: 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip Source1036: 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
Source1037: 8d265a592619166f29c4672ea54812b7-libwpd-0.9.2.tar.bz2 Source1037: c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2
Source1038: 83d4029aebf290c0a9a8fee9c99638d3-libwps-0.2.1.tar.bz2 Source1038: 34dd7951abbda99b7a75a09993a37965-libwps-0.2.4.tar.bz2
Source1039: 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip Source1039: 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
Source1040: 831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip Source1040: 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
Source1041: 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
Source1042: d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2
Source1043: d7a242ca43e33e1b63d3073f9d46a6a8-librsvg-2.32.1.tar.gz
# #
# allow to build without helpcontent2 # allow to unpack source tarballs
Patch0: libreoffice-bootstrap-optional-helpcontent.diff Patch0: libreoffice-3.5-unpack-sources.diff
Patch1: libreoffice-postprocess-optional-helpcontent.diff # mark share/config/javasettingsunopkginstall.xml as %config; it is updated by unopkg in %post
Patch1: javasetting-mark-config.diff
# search application icons in /usr/share # search application icons in /usr/share
# FIXME: search both lib and lib64 and push into git # FIXME: search both lib and lib64 and push into git
Patch2: split-icons-search-usr-share.diff Patch2: split-icons-search-usr-share.diff
@ -611,11 +614,12 @@ Patch4: solenv-carefull-patching-hack.diff
# change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse
# to avoid BerkleyDB incompatibility with the plain build # to avoid BerkleyDB incompatibility with the plain build
Patch5: scp2-user-config-suse.diff Patch5: scp2-user-config-suse.diff
# it created 3.8GB build log; Build Service refused to build such package # fix library link order to work with link as needed
Patch6: translations-no-warnigns-from-po2oo.diff Patch6: library-link-order-to-build-with-as-needed.diff
# build gengal again # put internal rhino into XBootClasspath to fix build with OpenJDK
Patch7: gengal-svx.diff Patch7: scripting-prefer-internal-rhino.diff
Patch8: gengal-scp2.diff # update file list generation for 3.5
Patch8: distro-install-file-lists-3.5.diff
# search <lo-home>/share/template/common for language independent templates # search <lo-home>/share/template/common for language independent templates
# will not push it upstream because it will be replaced by upcomming kendy's work # will not push it upstream because it will be replaced by upcomming kendy's work
Patch9: office-cfg-linux-common-template-dir.diff Patch9: office-cfg-linux-common-template-dir.diff
@ -624,53 +628,30 @@ Patch10: system-python-ure-bootstrap.diff
# do not use the broken help; unopkg complained about it when registering extensions # do not use the broken help; unopkg complained about it when registering extensions
# FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files # FIXME: the right fix is to compile the help and produce the .db_, .ht_, and other files
Patch11: nlpsolver-no-broken-help.diff Patch11: nlpsolver-no-broken-help.diff
# make sure that the extra jar files are bundled with the script provider extensions Patch12: mediawiki-no-broken-help.diff
Patch12: scripting-provider-build-dep.diff
# revert problematic build fix for poppler 0.17.0 on older distributions # revert problematic build fix for poppler 0.17.0 on older distributions
Patch13: libreoffice-poppler-0.17.0-reject-fix.diff Patch13: libreoffice-poppler-0.17.0-reject-fix.diff
# generate selected bytecode version also in gbuild
Patch14: solenv-java-source-version.diff
# fix build dependency problem in svx # fix build dependency problem in svx
Patch15: svx-globlmn-hrc-build-dep.diff Patch15: svx-globlmn-hrc-build-dep.diff
# tooltips are all black in KDE4 (bnc#723074, fdo#40461)
Patch19: kde4-tooltips-style.diff
# do not display math in desktop menu (fdo#41681)
Patch20: do-not-display-math-in-desktop-menu.diff
# display LO application in the right desktop submenu (bnc#718694) # display LO application in the right desktop submenu (bnc#718694)
Patch21: desktop-submenu.diff Patch21: desktop-submenu.diff
# define bash completion for 'loffice' wrapper (bnc#719656)
Patch22: bash-completion-for-loffice.diff
# add pyuno to python path # add pyuno to python path
Patch26: pyuno-path.diff Patch26: pyuno-path.diff
# fix build with glib-2.31; glib/gthread.h can't be included directly
Patch27: buildfix-ucb-glib-2.31.diff
#
# PostgreSQL SDBC driver
Patch801: 801-sdbc-postgresql.diff
Patch802: 802-sdbc-postgresql-build-lst.diff
Patch803: 803-connectivity-workben-postgresql.diff
Patch804: 804-gcc-4.3-postgresql.diff
Patch805: 805-sdbc-postgresql-config_office.diff
Patch806: 806-sdbc-postgresql-oxt.diff
Patch807: 807-sdbc-postgresql-obsolete-hash-map.diff
Patch808: 808-sdbc-postgresql-deliver.diff
Patch809: 809-sdbc-postgresql-gcc-4.6.diff
# fix component mapping to get the symbol component_writeInfo; related to http://www.openoffice.org/issues/show_bug.cgi?id=115423
Patch810: 810-sdbc-postgresql-lo-3.4-registration.diff
# Firefox changed the development model, so there is not longer a stable API
# only mozilla-nss and mozilla-nspr packages are supported but not the XUL stuff
# these patches disable the mozilla plugin that needed the XUL stuff
# it was not enabled by default; it newer worked well
Patch831: 831-mozilla-no-xul-config.diff
Patch832: 832-mozilla-no-xul-cui.diff
Patch833: 833-mozilla-no-xul-extensions.diff
Patch834: 834-mozilla-no-xul-scp2.diff
# #
# default to MS Office 97/2000/XP file formats on MeeGo; asked by HP # default to MS Office 97/2000/XP file formats on MeeGo; asked by HP
Patch900: officecfg-defaul-export-ms-file-formats.diff Patch900: officecfg-defaul-export-ms-file-formats.diff
# fix build with gcc-4.6 on openSUSE-12.0; hack my Caolan McNamara, see http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/10987
Patch910: vbahelper-sc-gcc-4.6-link-fix.diff
# crazy hack to avoid /usr/lib64 in RPATH and pass brp-rpath check (bnc#717262) # crazy hack to avoid /usr/lib64 in RPATH and pass brp-rpath check (bnc#717262)
Patch920: redland-rpath-hack.diff Patch920: redland-rpath-hack.diff
# #
# Patches against zip-3.0
Patch2000: zip-3.0-iso8859_2.patch
Patch2001: zip-3.0-add_options_to_help.patch
Patch2002: zip-3.0-nonexec-stack.patch
Patch2003: zip-3.0-optflags.patch
Patch2004: zip-3.0-tempfile.patch
Patch2005: zip-notimestamp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc ExclusiveArch: %ix86 x86_64 ppc
@ -955,20 +936,6 @@ http://udk.openoffice.org/python/python-bridge.html
%package testtool
Summary: LibreOffice Test Tool
License: LGPL-3.0
Group: Productivity/Office/Suite
Requires: %name = %version
# compat stuff
Provides: OpenOffice_org-testtool = %version
Obsoletes: OpenOffice_org-testtool < %version
%description testtool
A Tool needed for automatic testing of LibreOffice office suite.
%package gnome %package gnome
Summary: GNOME Extensions for LibreOffice Summary: GNOME Extensions for LibreOffice
License: LGPL-3.0 License: LGPL-3.0
@ -1357,14 +1324,11 @@ the LibreOffice localizations separately.
%prep %prep
%if %prepare_build == 0 %if %prepare_build == 0
%setup -D -T -q -n libreoffice-bootstrap-%version %setup -D -T -q -n libreoffice-core-%version
%else %else
%setup -q -n libreoffice-bootstrap-%version %setup -q -a30 -n libreoffice-core-%version
bin/unpack-sources `pwd` \ %patch0
%{S:1} %{S:2} %{S:3} %{S:4} %{S:5} \ bin/unpack-sources `pwd` %{S:1} %{S:2} %{S:3}
%{S:6} %{S:7} %{S:8} %{S:9} %{S:10} \
%{S:11} %{S:12} %{S:13} %{S:14} %{S:15} \
%{S:16} %{S:17} %{S:18} %{S:19}
# 256x256 icons # 256x256 icons
tar -xjf %{S:20} tar -xjf %{S:20}
# SUSE config files # SUSE config files
@ -1372,13 +1336,12 @@ cp $RPM_SOURCE_DIR/SUSE*.conf distro-configs
# READMEs # READMEs
cp $RPM_SOURCE_DIR/README* . cp $RPM_SOURCE_DIR/README* .
# extra fixes # extra fixes
%patch0
%patch1 %patch1
%patch2 %patch2
%patch3 %patch3
%patch4 %patch4
%patch5 %patch5
%patch6 %patch6 -p1
%patch7 %patch7
%patch8 %patch8
%patch9 %patch9
@ -1389,49 +1352,49 @@ cp $RPM_SOURCE_DIR/README* .
# cpp/poppler-version.h is not included in older poppler packages # cpp/poppler-version.h is not included in older poppler packages
%patch13 %patch13
%endif %endif
%patch14
%patch15 %patch15
%patch19 -p1
%patch20
%patch21 %patch21
%patch22
%patch26 %patch26
%patch27
# PostgreSQL SDBC driver
%patch801
%patch802
%patch803
%patch804
%patch805
%patch806
%patch807
%patch808
%patch809
%patch810
# No XUL
%patch831
%patch832
%patch833
%patch834
# #
%if 0%{?meego_version} %if 0%{?meego_version}
# default to MS Office 97/2000/XP file formats on MeeGo; asked by HP # default to MS Office 97/2000/XP file formats on MeeGo; asked by HP
%patch900 %patch900
%endif %endif
# #
%if %suse_version > 1130
# fix build with gcc-4.6 on openSUSE-12.0; hack my Caolan McNamara, see http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/10987
%patch910
%endif
#
%if %suse_version > 1140 %if %suse_version > 1140
# crazy hack to avoid /usr/lib64 in RPATH and pass brp-rpath check (bnc#717262) # crazy hack to avoid /usr/lib64 in RPATH and pass brp-rpath check (bnc#717262)
%patch920 %patch920
%endif %endif
# #
# patch zip-3.0
%if %suse_version < 1140
tar -xjf %{S:31}
cd zip30
%patch2000
%patch2001
%patch2002
%patch2003
%patch2004
%patch2005
cd -
%endif
%endif %endif
%build %build
%if %prepare_build != 0 %if %prepare_build != 0
# first build make-3.82
cd make-*
CFLAGS=$RPM_OPT_FLAGS ./configure
make %{?_smp_mflags}
cd -
#
# second build zip-3.0 on older distributions
%if %suse_version < 1140
cd zip30
make %{?jobs:-j%jobs} -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
cd -
%endif
# #
# Parallel build settings ... # Parallel build settings ...
PARALLEL_BUILD= PARALLEL_BUILD=
@ -1481,7 +1444,12 @@ CFLAGS="$ARCH_FLAGS"
CXXFLAGS="$ARCH_FLAGS" CXXFLAGS="$ARCH_FLAGS"
export ARCH_FLAGS CFLAGS CXXFLAGS export ARCH_FLAGS CFLAGS CXXFLAGS
# FIXME: genccode from the system icu is in /usr/sbin # FIXME: genccode from the system icu is in /usr/sbin
export PATH="$PATH:/usr/sbin" # FIXME: we need make-3.82 for parallel build
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/make-%gnu_make_version-gbuild:$PATH:/usr/sbin"
# use the extra built zip-3.0 on older distributions
%if %suse_version < 1140
export PATH="$RPM_BUILD_DIR/libreoffice-core-%version/zip30:$PATH:/usr/sbin"
%endif
%if %prepare_build != 0 %if %prepare_build != 0
./autogen.sh $PARALLEL_BUILD \ ./autogen.sh $PARALLEL_BUILD \
--with-external-tar="$RPM_SOURCE_DIR" \ --with-external-tar="$RPM_SOURCE_DIR" \
@ -1494,6 +1462,7 @@ export PATH="$PATH:/usr/sbin"
--with-distro="$with_distro" \ --with-distro="$with_distro" \
--without-git \ --without-git \
--without-download \ --without-download \
--disable-fetch-external \
--with-lang=%lo_langs \ --with-lang=%lo_langs \
--with-poor-help-localizations=%lo_poor_help_localizations \ --with-poor-help-localizations=%lo_poor_help_localizations \
--with-mono-gac-root=%{_prefix}/lib \ --with-mono-gac-root=%{_prefix}/lib \
@ -1507,9 +1476,6 @@ export PATH="$PATH:/usr/sbin"
%if %lo_build_sdk == yes %if %lo_build_sdk == yes
--enable-odk \ --enable-odk \
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} <= 01030
--with-additional-sections="PostgreSQL" \
%endif
%if 0%{?meego_version} %if 0%{?meego_version}
--without-system-cairo \ --without-system-cairo \
--with-system-icu \ --with-system-icu \
@ -1525,7 +1491,6 @@ export PATH="$PATH:/usr/sbin"
%if %suse_version <= 1110 %if %suse_version <= 1110
--without-junit \ --without-junit \
%endif %endif
--with-system-mozilla=mozilla \
--disable-access \ --disable-access \
--disable-post-install-scripts \ --disable-post-install-scripts \
--disable-strip \ --disable-strip \
@ -1537,6 +1502,17 @@ export PATH="$PATH:/usr/sbin"
--enable-build-noarch \ --enable-build-noarch \
--enable-ext-ct2n \ --enable-ext-ct2n \
--enable-ext-nlpsolver \ --enable-ext-nlpsolver \
--enable-ext-google-docs \
--enable-ext-numbertext \
--without-help \
--disable-mozilla \
--without-system-mozilla \
--disable-ldap \
--enable-xmlsec \
--with-system-nss \
%if 0%{?suse_version} > 01110
--with-system-postgresql \
%endif
%if 0%{?suse_version} %if 0%{?suse_version}
--with-system-mysql \ --with-system-mysql \
--enable-ext-mysql-connector \ --enable-ext-mysql-connector \
@ -1555,11 +1531,16 @@ export PATH="$PATH:/usr/sbin"
--enable-split-app-modules \ --enable-split-app-modules \
--enable-split-opt-features --enable-split-opt-features
%endif %endif
# hack to add icons for helpcontent that is build separately # prebuilt stuff
( (
. ./*Env.Set.sh . ./Env.Host.sh
# hack to add icons for helpcontent that is build separately
mkdir -p $SOLARVER/$INPATH/res/img mkdir -p $SOLARVER/$INPATH/res/img
perl helpcontent2/helpers/create_ilst.pl -dir=default_images/res/helpimg >$SOLARVER/$INPATH/res/img/helpimg.ilst perl helpcontent2/helpers/create_ilst.pl -dir=default_images/res/helpimg >$SOLARVER/$INPATH/res/img/helpimg.ilst
# copy prebuilt extensions into solver
mkdir -p $SOLARVER/$INPATH/bin
install -m 644 $RPM_SOURCE_DIR/*-gdocs_%{gdocs_version}_modified.oxt $SOLARVER/$INPATH/bin/gdocs.oxt
install -m 644 $RPM_SOURCE_DIR/*-numbertext_%{numbertext_version}.oxt $SOLARVER/$INPATH/bin/numbertext.oxt
) )
# hack to correctly bootstrap python stuff with system python, (deb#501028, i#90701) # hack to correctly bootstrap python stuff with system python, (deb#501028, i#90701)
sed -i -e "s|@INSTALLDIR@|%lo_prefix/%lo_home|" pyuno/source/module/uno.py sed -i -e "s|@INSTALLDIR@|%lo_prefix/%lo_home|" pyuno/source/module/uno.py
@ -1612,13 +1593,9 @@ done
################ ################
# compat stuff for noarch packages # compat stuff for noarch packages
mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/program mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/program
mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir
ln -sf %lo_basis_dir $RPM_BUILD_ROOT/%_datadir/%lo_home/basis-link
install -m 755 $RPM_SOURCE_DIR/link-to-ooo-home $RPM_BUILD_ROOT%_datadir/%lo_home/ install -m 755 $RPM_SOURCE_DIR/link-to-ooo-home $RPM_BUILD_ROOT%_datadir/%lo_home/
echo "%dir %_datadir/%lo_home" >>file-lists/common_list.txt echo "%dir %_datadir/%lo_home" >>file-lists/common_list.txt
echo "%dir %_datadir/%lo_home/program" >>file-lists/common_list.txt echo "%dir %_datadir/%lo_home/program" >>file-lists/common_list.txt
echo "%dir %_datadir/%lo_home/%lo_basis_dir" >>file-lists/common_list.txt
echo "%_datadir/%lo_home/basis-link" >>file-lists/common_list.txt
echo "%_datadir/%lo_home/link-to-ooo-home" >>file-lists/common_list.txt echo "%_datadir/%lo_home/link-to-ooo-home" >>file-lists/common_list.txt
################ ################
# compat symlink to correctly uninstall OOo # compat symlink to correctly uninstall OOo
@ -1651,15 +1628,15 @@ test -z "$icon_found" && echo "ERROR: Can't find compat icon for ooo-gulls.png"
################ ################
# common helpcontent files # common helpcontent files
# create symlinks to /usr/share for noarch help packages # create symlinks to /usr/share for noarch help packages
mkdir -p $RPM_BUILD_ROOT/%lo_prefix/%lo_home/%lo_basis_dir/help mkdir -p $RPM_BUILD_ROOT/%lo_prefix/%lo_home/help
mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help mkdir -p $RPM_BUILD_ROOT/%_datadir/%lo_home/help
echo "%dir %lo_prefix/%lo_home/%lo_basis_dir/help" >>file-lists/common_list.txt echo "%dir %lo_prefix/%lo_home/help" >>file-lists/common_list.txt
echo "%dir %_datadir/%lo_home/%lo_basis_dir/help" >>file-lists/common_list.txt echo "%dir %_datadir/%lo_home/help" >>file-lists/common_list.txt
for file in idxcaption.xsl idxcontent.xsl main_transform.xsl ; do for file in idxcaption.xsl idxcontent.xsl main_transform.xsl ; do
install -m 644 solver/*/unxlng*.pro/bin/$file $RPM_BUILD_ROOT/%lo_prefix/%lo_home/%lo_basis_dir/help install -m 644 solver/unxlng*.pro/bin/$file $RPM_BUILD_ROOT/%lo_prefix/%lo_home/help
ln -sf %lo_prefix/%lo_home/%lo_basis_dir/help/$file $RPM_BUILD_ROOT/%_datadir/%lo_home/%lo_basis_dir/help ln -sf %lo_prefix/%lo_home/help/$file $RPM_BUILD_ROOT/%_datadir/%lo_home/help
echo "%lo_prefix/%lo_home/%lo_basis_dir/help/$file" >>file-lists/common_list.txt echo "%lo_prefix/%lo_home/help/$file" >>file-lists/common_list.txt
echo "%_datadir/%lo_home/%lo_basis_dir/help/$file" >>file-lists/common_list.txt echo "%_datadir/%lo_home/help/$file" >>file-lists/common_list.txt
done done
################ ################
# branding will be in separate packages # branding will be in separate packages
@ -1687,7 +1664,7 @@ for file in sofficerc \
done done
################ ################
# extra background picture into the gallery # extra background picture into the gallery
export galdir="%lo_prefix/%lo_home/%lo_basis_dir/share/gallery" export galdir="%lo_prefix/%lo_home/share/gallery"
install -m 644 "$RPM_SOURCE_DIR/Draft.jpg" "$RPM_BUILD_ROOT$galdir/www-back/" install -m 644 "$RPM_SOURCE_DIR/Draft.jpg" "$RPM_BUILD_ROOT$galdir/www-back/"
echo "$galdir/www-back/Draft.jpg" >>file-lists/common_list.txt echo "$galdir/www-back/Draft.jpg" >>file-lists/common_list.txt
# make sure that the existing galleries can be modified # make sure that the existing galleries can be modified
@ -1697,8 +1674,8 @@ LC_ALL=en_US.UTF-8 $RPM_BUILD_ROOT%lo_prefix/%lo_home/program/gengal -headless -
################ ################
# FIXME: fast hack to solve a customer issue, n#364523 # FIXME: fast hack to solve a customer issue, n#364523
# we need a more generic solution # we need a more generic solution
ln -sf acor_fr-FR.dat $RPM_BUILD_ROOT%lo_prefix/%lo_home/%lo_basis_dir/share/autocorr/acor_fr-CA.dat ln -sf acor_fr-FR.dat $RPM_BUILD_ROOT%lo_prefix/%lo_home/share/autocorr/acor_fr-CA.dat
echo "%lo_prefix/%lo_home/%lo_basis_dir/share/autocorr/acor_fr-CA.dat" >>file-lists/common_list.txt echo "%lo_prefix/%lo_home/share/autocorr/acor_fr-CA.dat" >>file-lists/common_list.txt
################ ################
# helper script to create libstlport compat symlink (bnc#458952) # helper script to create libstlport compat symlink (bnc#458952)
%ifarch %ix86 %ifarch %ix86
@ -1725,7 +1702,7 @@ cat << EOF > $RPM_BUILD_ROOT/%_prefix/sbin/unopkg-sync-bundled
#Create the command which creates a temporary directory #Create the command which creates a temporary directory
INSTDIR=\`mktemp -d -t "userinstall.XXXXXX"\` INSTDIR=\`mktemp -d -t "userinstall.XXXXXX"\`
unopkg sync "-env:BUNDLED_EXTENSIONS_USER=file://%lo_prefix/%lo_home/share/prereg/bundled" "-env:UserInstallation=file://\$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=file://%lo_prefix/%lo_home/%lo_basis_dir/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' unopkg sync "-env:BUNDLED_EXTENSIONS_USER=file://%lo_prefix/%lo_home/share/prereg/bundled" "-env:UserInstallation=file://\$INSTDIR" '-env:UNO_JAVA_JFW_INSTALL_DATA=file://%lo_prefix/%lo_home/share/config/javasettingsunopkginstall.xml' '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
find "%lo_prefix/%lo_home/share/prereg/bundled" -type f -exec chmod 644 {} \\; find "%lo_prefix/%lo_home/share/prereg/bundled" -type f -exec chmod 644 {} \\;
rm -rf "\$INSTDIR" rm -rf "\$INSTDIR"
@ -1754,38 +1731,11 @@ EOF
echo "%doc %dir \"%{_docdir}/%name-kde4\"" >>file-lists/kde4_list.txt echo "%doc %dir \"%{_docdir}/%name-kde4\"" >>file-lists/kde4_list.txt
echo "%doc \"%{_docdir}/%name-kde4/README.txt\"" >>file-lists/kde4_list.txt echo "%doc \"%{_docdir}/%name-kde4/README.txt\"" >>file-lists/kde4_list.txt
fi fi
################
# officebean subpackage
rm -f file-lists/officebean_list.txt
for file in %lo_prefix/%lo_home/%lo_basis_dir/program/classes/officebean.jar \
%lo_prefix/%lo_home/%lo_basis_dir/program/libofficebean.so ; do
grep -v $file file-lists/common_list.txt >file-lists/common_list.txt.new
mv file-lists/common_list.txt.new file-lists/common_list.txt
echo $file >>file-lists/officebean_list.txt
done
################
# extensions
mkdir -p $RPM_BUILD_ROOT%lo_prefix/%lo_home/share/extensions
find solver -name "*.oxt" -exec cp {} $RPM_BUILD_ROOT%lo_prefix/%lo_home/share/extensions \;
# prebuilt extensions
cp $RPM_SOURCE_DIR/*-gdocs_%{gdocs_version}_modified.oxt $RPM_BUILD_ROOT%lo_prefix/%lo_home/share/extensions/gdocs_%{gdocs_version}_modified.oxt
cp $RPM_SOURCE_DIR/numbertext-%{numbertext_version}.oxt $RPM_BUILD_ROOT%lo_prefix/%lo_home/share/extensions
# unpack the extensions
cd $RPM_BUILD_ROOT%lo_prefix/%lo_home/share/extensions
for file in *.oxt ; do
dir=`echo $file | sed s/.oxt$//`
mkdir $dir
# FIXME: gdocs_2.1.0_modified.oxt includes AbsoluteLayout.jar twice => we must force overwriting
unzip -o -d $dir $file
rm $file
done
cd - >/dev/null
################ ################
# Symlink uno.py and unohelper.py so that python can find them # Symlink uno.py and unohelper.py so that python can find them
mkdir -p $RPM_BUILD_ROOT%python_sitelib mkdir -p $RPM_BUILD_ROOT%python_sitelib
ln -s %_libdir/libreoffice/basis-link/program/uno.py $RPM_BUILD_ROOT%python_sitelib/uno.py ln -s %_libdir/libreoffice/program/uno.py $RPM_BUILD_ROOT%python_sitelib/uno.py
ln -s %_libdir/libreoffice/basis-link/program/unohelper.py $RPM_BUILD_ROOT%python_sitelib/unohelper.py ln -s %_libdir/libreoffice/program/unohelper.py $RPM_BUILD_ROOT%python_sitelib/unohelper.py
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -1851,10 +1801,10 @@ fi
%ifarch %ix86 %ifarch %ix86
%triggerin -- mysql-connector-java %triggerin -- mysql-connector-java
%lo_prefix/%lo_home/basis-link/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true %lo_prefix/%lo_home/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true
%triggerpostun -- mysql-connector-java %triggerpostun -- mysql-connector-java
%lo_prefix/%lo_home/basis-link/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true %lo_prefix/%lo_home/program/java-set-classpath /usr/share/java/mysql-connector-java.jar || true
%triggerin -- libstlport_gcc4 %triggerin -- libstlport_gcc4
# create compat link needed to run upstream extensions (bnc#458952) # create compat link needed to run upstream extensions (bnc#458952)
@ -2197,7 +2147,6 @@ fi
%files -f file-lists/common_list.txt %files -f file-lists/common_list.txt
%defattr(-,root,root) %defattr(-,root,root)
# common extensions # common extensions
%lo_prefix/%lo_home/share/extensions/script-provider-for-javascript
# ignore helper files for brp-symlink check # ignore helper files for brp-symlink check
%exclude %_datadir/%lo_home/program/sofficerc %exclude %_datadir/%lo_home/program/sofficerc
%exclude %_datadir/%lo_home/program/*.png %exclude %_datadir/%lo_home/program/*.png
@ -2221,9 +2170,8 @@ fi
%files -f file-lists/writer_list.txt writer %files -f file-lists/writer_list.txt writer
%defattr(-,root,root) %defattr(-,root,root)
%files base-drivers-postgresql %files -f file-lists/postgresql_list.txt base-drivers-postgresql
%defattr(-,root,root) %defattr(-,root,root)
%lo_prefix/%lo_home/share/extensions/postgresql-sdbc-*
%files -f file-lists/filters_list.txt filters-optional %files -f file-lists/filters_list.txt filters-optional
%defattr(-,root,root) %defattr(-,root,root)
@ -2235,6 +2183,7 @@ fi
%files -f file-lists/mono_list.txt mono %files -f file-lists/mono_list.txt mono
%defattr(-,root,root) %defattr(-,root,root)
%doc README-mono.txt
%endif %endif
%files -f file-lists/pyuno_list.txt pyuno %files -f file-lists/pyuno_list.txt pyuno
@ -2243,9 +2192,6 @@ fi
%python_sitelib/uno.py %python_sitelib/uno.py
%python_sitelib/unohelper.py %python_sitelib/unohelper.py
%files -f file-lists/testtool_list.txt testtool
%defattr(-,root,root)
%files -f file-lists/gnome_list.txt gnome %files -f file-lists/gnome_list.txt gnome
%defattr(-,root,root) %defattr(-,root,root)
@ -2257,7 +2203,6 @@ fi
%files -f file-lists/officebean_list.txt officebean %files -f file-lists/officebean_list.txt officebean
%defattr(-,root,root) %defattr(-,root,root)
%lo_prefix/%lo_home/share/extensions/script-provider-for-beanshell
%if %lo_build_sdk == yes %if %lo_build_sdk == yes
@ -2286,8 +2231,8 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%doc README-scsolver.txt %doc README-scsolver.txt
%lo_prefix/%lo_home/share/extensions/ConvertTextToNumber %lo_prefix/%lo_home/share/extensions/ConvertTextToNumber
%lo_prefix/%lo_home/share/extensions/NLPSolver %lo_prefix/%lo_home/share/extensions/nlpsolver
%lo_prefix/%lo_home/share/extensions/numbertext-%{numbertext_version} %lo_prefix/%lo_home/share/extensions/numbertext
%files draw-extensions %files draw-extensions
%defattr(-,root,root) %defattr(-,root,root)
@ -2300,7 +2245,7 @@ fi
%files writer-extensions %files writer-extensions
%defattr(-,root,root) %defattr(-,root,root)
%lo_prefix/%lo_home/share/extensions/gdocs_%{gdocs_version}_modified %lo_prefix/%lo_home/share/extensions/gdocs
%lo_prefix/%lo_home/share/extensions/wiki-publisher %lo_prefix/%lo_home/share/extensions/wiki-publisher
%files -f file-lists/icon_themes_prebuilt.txt icon-themes-prebuilt %files -f file-lists/icon_themes_prebuilt.txt icon-themes-prebuilt

351
lo-help-gen-spec
View File

@ -5,12 +5,13 @@
use strict; use strict;
use File::Copy; use File::Copy;
my $args = join ' ', @ARGV;
my $max_level = 2; my $max_level = 2;
sub init_lang_data($$$$$) sub init_lang_data($$$$$)
{ {
my ($datap, $lang_code, $long_name, $level, $group) = @_; my ($pdata, $lang_code, $long_name, $level, $group) = @_;
my $curLang; my $curLang;
my $upstreamLang; my $upstreamLang;
@ -26,33 +27,37 @@ sub init_lang_data($$$$$)
die "Syntax error: unknown format of the language code: $lang_code, line $."; die "Syntax error: unknown format of the language code: $lang_code, line $.";
} }
$datap->{'lang'}{$curLang}{'long_name'} = $long_name; % {$pdata->{'lang'}{$curLang}} = ();
$datap->{'lang'}{$curLang}{'level'} = $level; my $pld = \% {$pdata->{'lang'}{$curLang}};
$datap->{'lang'}{$curLang}{'group'} = $group;
$datap->{'lang'}{$curLang}{'locale'} = $upstreamLang;
$datap->{'lang'}{$curLang}{'locale'} =~ s/-/_/g;
$datap->{'lang'}{$curLang}{'package-help'} = ();
$datap->{'max_group'} = $group if ($group > $datap->{'max_group'}); $pld->{'long_name'} = $long_name;
$pld->{'level'} = $level;
$pld->{'group'} = $group;
$pld->{'locale'} = $upstreamLang;
$pld->{'locale'} =~ s/-/_/g;
$pld->{'package-help'} = ();
$pdata->{'max_group'} = $group if ($group > $pdata->{'max_group'});
($level <= $max_level) || die "Error: Maximum allowed level is $max_level, line $."; ($level <= $max_level) || die "Error: Maximum allowed level is $max_level, line $.";
foreach my $l ($level .. $max_level) { foreach my $l ($level .. $max_level) {
@ {$datap->{'level_langs_list'}[$l]} = () unless (defined $datap->{'level_langs_list'}[$l]); @ {$pdata->{'level_langs_list'}[$l]} = () unless (defined $pdata->{'level_langs_list'}[$l]);
push @ {$datap->{'level_langs_list'}[$l]}, $upstreamLang; push @ {$pdata->{'level_langs_list'}[$l]}, $upstreamLang;
$l++; $l++;
} }
return $curLang; return $pld;
} }
sub read_data($$) sub read_data($$)
{ {
my ($data_file, $datap) = @_; my ($data_file, $pdata) = @_;
my $curLang; # pointer to locale data
my $pld = undef;
$datap->{'max_group'} = 0; $pdata->{'max_group'} = 0;
$datap->{'level_langs_list'} = (); $pdata->{'level_langs_list'} = ();
@ {$datap->{'level_langs_list'}[$_]} = () foreach (0 .. $max_level); @ {$pdata->{'level_langs_list'}[$_]} = () foreach (0 .. $max_level);
open DATA , "< $data_file" or die "Can't open '$data_file'\n"; open DATA , "< $data_file" or die "Can't open '$data_file'\n";
@ -63,16 +68,14 @@ sub read_data($$)
if ( $line =~ m/^\s*\%lang\s+([\w\-\/]+)\s+(\w+)\s+(\d+)\s+(\d+)\s*$/ ) { if ( $line =~ m/^\s*\%lang\s+([\w\-\/]+)\s+(\w+)\s+(\d+)\s+(\d+)\s*$/ ) {
# long name without without quotation marks, e.g. %lang de German 1 1 # long name without without quotation marks, e.g. %lang de German 1 1
# the language code might be different for the packages for upstream file list, e.g. %lang gu-IN/gu Gujarati 2 3 # the language code might be different for the packages for upstream file list, e.g. %lang gu-IN/gu Gujarati 2 3
$curLang = init_lang_data($datap, "$1", "$2", "$3", "$4"); $pld = init_lang_data($pdata, "$1", "$2", "$3", "$4");
} elsif ( $line =~ m/^\s*\%lang\s+([\w\-\/]+)\s+\"([\w\s]+)\"\s+(\d+)\s+(\d+)\s*$/ ) { } elsif ( $line =~ m/^\s*\%lang\s+([\w\-\/]+)\s+\"([\w\s]+)\"\s+(\d+)\s+(\d+)\s*$/ ) {
# long name with with quotation marks, e.g. %lang en-ZA "South Africa English" 2 2 # long name with with quotation marks, e.g. %lang en-ZA "South Africa English" 2 2
$curLang = init_lang_data($datap, "$1", "$2", "$3", "$4"); $pld = init_lang_data($pdata, "$1", "$2", "$3", "$4");
} elsif ( $line =~ /^\s*\%poor-help\s*$/ ) { } elsif ( $line =~ /^\s*\%poor-help\s*$/ ) {
$datap->{'lang'}{$curLang}{'poor-help'} = 1; $pld->{'poor-help'} = 1;
} elsif ( $line =~ /^\s*\%package-help\s+(.*)$/ ) { } elsif ( $line =~ /^\s*\%package\s+(.*)$/ ) {
push @ {$datap->{'lang'}{$curLang}{'package-help'}}, "$1"; push @ {$pld->{'package'}}, "$1";
} elsif ( $line =~ /^\s*\%files-help\s+(.*)$/ ) {
push @ {$datap->{'lang'}{$curLang}{'files-help'}}, "$1";
} elsif ( $line =~ /^\s*$/ ) { } elsif ( $line =~ /^\s*$/ ) {
# ignore empty line # ignore empty line
} else { } else {
@ -82,14 +85,17 @@ sub read_data($$)
close(DATA); close(DATA);
} }
##################################
# conditional lines
sub write_level_begin($$$) sub write_level_begin($$$)
{ {
my ($curLevel, $newLevel, $outp) = @_; my ($curLevel, $newLevel, $outp) = @_;
if ($curLevel != $newLevel) { if ($curLevel != $newLevel) {
${$outp} .= "\n";
${$outp} .= "%endif\n" if ($curLevel > 0); ${$outp} .= "%endif\n" if ($curLevel > 0);
${$outp} .= "%if %test_build_langs >= $newLevel\n" if ($newLevel > 0); ${$outp} .= "%if %test_build_langs >= $newLevel\n" if ($newLevel > 0);
${$outp} .= "\n" if ($curLevel > 0);
} }
return $newLevel; return $newLevel;
@ -106,119 +112,205 @@ sub write_level_end($$)
return 0; return 0;
} }
sub write_help_package_section($$$) ##############################
# simple sections
sub write_do_not_edit_section($)
{ {
my ($datap, $curLang, $outp) = @_; my $out = "###################################################################\n" .
"## DO NOT EDIT THIS SPEC FILE\n" .
"## Generated by:\n" .
"## perl lo-help-gen-spec $args\n" .
"###################################################################";
return $out;
}
##############################
# all langs sections
sub write_metadata_section($$)
{
my ($pdata, $curLang) = @_;
my $pld = \% {$pdata->{'lang'}{$curLang}};
my $out = "";
return $out if (defined $pld->{'poor-help'});
my $oldPackage; my $oldPackage;
return if (defined $datap->{'lang'}{$curLang}{'poor-help'});
if ("$curLang" eq "en-US") { if ("$curLang" eq "en-US") {
$oldPackage = "OpenOffice_org"; $oldPackage = "OpenOffice_org";
} else { } else {
$oldPackage = "OpenOffice_org-$curLang"; $oldPackage = "OpenOffice_org-$curLang";
} }
${$outp} .= "\n"; $out .= "%package -n libreoffice-help-$curLang\n";
${$outp} .= "\n"; $out .= "Summary: $pld->{'long_name'} Help Localization for LibreOffice\n";
${$outp} .= "%package -n libreoffice-help-$curLang\n"; $out .= "Group: Productivity/Office/Suite\n";
${$outp} .= "License: LGPL-3.0\n"; $out .= "Provides: locale(libreoffice:$pld->{'locale'})\n";
${$outp} .= "Summary: $datap->{'lang'}{$curLang}{'long_name'} Help Localization for LibreOffice\n"; $out .= "%if 0%{?suse_version} > 01120\n";
${$outp} .= "Group: Productivity/Office/Suite\n"; $out .= "Requires(post): coreutils\n";
${$outp} .= "Provides: locale(libreoffice:$datap->{'lang'}{$curLang}{'locale'})\n"; $out .= "Requires(post): grep\n";
${$outp} .= "PreReq: libreoffice = %version\n"; $out .= "Requires(post): libreoffice >= 3.5\n";
${$outp} .= "%if 0%{?suse_version}\n"; $out .= "Requires(postun): coreutils\n";
${$outp} .= "Supplements: libreoffice-l10n-$curLang\n"; $out .= "Requires(postun): grep\n";
${$outp} .= "%endif\n"; $out .= "Requires(postun): libreoffice >= 3.5\n";
${$outp} .= "# compat stuff\n"; $out .= "%endif\n";
${$outp} .= "Provides: OpenOffice_org-help-$curLang = %version\n"; $out .= "%if 0%{?suse_version} && 0%{?suse_version} <= 01120\n";
${$outp} .= "Obsoletes: OpenOffice_org-help-$curLang <= %version\n"; $out .= "PreReq: coreutils\n";
${$outp} .= "Provides: $oldPackage:%_prefix/ooo-2.0/help/$curLang/default.css\n"; $out .= "PreReq: grep\n";
$out .= "PreReq: libreoffice >= 3.5\n";
foreach my $line (@{$datap->{'lang'}{$curLang}{'package-help'}}) { $out .= "%endif\n";
${$outp} .= "$line\n"; $out .= "Requires: libreoffice = %{version}\n";
foreach my $line (@{$pld->{'package-help'}}) {
$out .= "$line\n";
} }
$out .= "# compat stuff\n";
$out .= "Provides: OpenOffice_org-help-$curLang = %version\n";
$out .= "Obsoletes: OpenOffice_org-help-$curLang <= %version\n";
$out .= "Provides: $oldPackage:%_prefix/ooo-2.0/help/$curLang/default.css\n";
${$outp} .= "\n";
${$outp} .= "\n"; $out .= "\n";
${$outp} .= "%description -n libreoffice-help-$curLang\n"; $out .= "%description -n libreoffice-help-$curLang\n";
${$outp} .= "$datap->{'lang'}{$curLang}{'long_name'} help localization for LibreOffice. The other localized stuff\n"; $out .= "$pld->{'long_name'} help localization for LibreOffice. The other localized stuff\n";
${$outp} .= "is in libreoffice-l10n-$curLang.\n"; $out .= "is in libreoffice-l10n-$curLang.\n";
${$outp} .= "\n"; $out .= "\n";
return $out;
} }
sub write_help_scripts_section($$$) sub write_install_scripts_section($$)
{ {
my ($datap, $curLang, $outp) = @_; my ($pdata, $curLang) = @_;
my $pld = \% {$pdata->{'lang'}{$curLang}};
my $out = "";
return if (defined $datap->{'lang'}{$curLang}{'poor-help'}); return $out if (defined $pld->{'poor-help'});
${$outp} .= "# $curLang\n"; $out .= "# $curLang\n";
${$outp} .= "\n"; $out .= "\n";
${$outp} .= "\n"; $out .= "%posttrans -n libreoffice-help-$curLang\n";
${$outp} .= "%posttrans -n libreoffice-help-$curLang\n"; $out .= "%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_$pld->{'locale'}_list.txt || true\n";
${$outp} .= "%_datadir/%lo_home/link-to-ooo-home %_datadir/%lo_home/help_$datap->{'lang'}{$curLang}{'locale'}_list.txt || true\n"; $out .= "\n";
${$outp} .= "\n"; $out .= "%preun -n libreoffice-help-$curLang\n";
${$outp} .= "\n"; $out .= "test \"\$1\" = \"0\" && cp %_datadir/%lo_home/help_$pld->{'locale'}_list.txt %_datadir/%lo_home/help_$pld->{'locale'}_list.txt.postun || true\n";
${$outp} .= "%preun -n libreoffice-help-$curLang\n"; $out .= "\n";
${$outp} .= "test \"\$1\" = \"0\" && cp %_datadir/%lo_home/help_$datap->{'lang'}{$curLang}{'locale'}_list.txt %_datadir/%lo_home/help_$datap->{'lang'}{$curLang}{'locale'}_list.txt.postun || true\n"; $out .= "%postun -n libreoffice-help-$curLang\n";
${$outp} .= "\n"; $out .= "test \"\$1\" = \"0\" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_$pld->{'locale'}_list.txt.postun || true\n";
${$outp} .= "\n"; $out .= "rm -f %_datadir/%lo_home/help_$pld->{'locale'}_list.txt.postun 2>/dev/null\n";
${$outp} .= "%postun -n libreoffice-help-$curLang\n";
${$outp} .= "test \"\$1\" = \"0\" && %_datadir/%lo_home/link-to-ooo-home --unlink %_datadir/%lo_home/help_$datap->{'lang'}{$curLang}{'locale'}_list.txt.postun || true\n"; return $out;
${$outp} .= "rm -f %_datadir/%lo_home/help_$datap->{'lang'}{$curLang}{'locale'}_list.txt.postun 2>/dev/null\n";
} }
sub write_files_section($$)
sub write_help_files_section($$$$)
{ {
my ($datap, $curLang, $outp) = @_; my ($pdata, $curLang) = @_;
my $pld = \% {$pdata->{'lang'}{$curLang}};
my $out = "";
return if (defined $datap->{'lang'}{$curLang}{'poor-help'}); return $out if (defined $pld->{'poor-help'});
${$outp} .= "\n"; $out .= "%files -f file-lists/help_$pld->{'locale'}_list.txt -n libreoffice-help-$curLang\n";
${$outp} .= "\n"; $out .= "%defattr(-,root,root)\n";
${$outp} .= "%files -f file-lists/help_$datap->{'lang'}{$curLang}{'locale'}_list.txt -n libreoffice-help-$curLang\n"; $out .= "\n";
${$outp} .= "%defattr(-,root,root)\n";
foreach my $line (@{$datap->{'lang'}{$curLang}{'files-help'}}) { return $out;
${$outp} .= "$line\n";
}
} }
sub write_section($$$$) ########################################################
{ # universal writing functions
my ($datap, $group, $write_single_lang_section, $outp) = @_;
my $curLevel = 0;
foreach my $curLang (sort keys %{$datap->{'lang'}}) {
if ($datap->{'lang'}{$curLang}{'group'} == $group) {
$curLevel = write_level_begin($curLevel, $datap->{'lang'}{$curLang}{'level'}, $outp);
& {$write_single_lang_section} ($datap, $curLang, $outp);
}
}
$curLevel = write_level_end($curLevel, $outp);
}
sub write_level_langs($$$) sub write_level_langs($$$)
{ {
my ($datap, $group, $level) = @_; my ($pdata, $group, $level) = @_;
my $out = "";
my $level_langs = ""; foreach my $curLang (sort keys %{$pdata->{'lang'}}) {
foreach my $curLang (sort keys %{$datap->{'lang'}}) { my $pld = \% {$pdata->{'lang'}{$curLang}};
if ( ($group == $datap->{'lang'}{$curLang}{'group'}) && if ( ($group == $pld->{'group'}) &&
($level >= $datap->{'lang'}{$curLang}{'level'}) ) { ($level >= $pld->{'level'}) ) {
$level_langs .= " $datap->{'lang'}{$curLang}{'locale'}"; $out .= " $pld->{'locale'}";
} }
} }
$level_langs =~ s/^ //; $out =~ s/^ //;
$level_langs =~ s/_/-/g; $out =~ s/_/-/g;
return $level_langs; return $out;
} }
# the text is not repeated for each locale
sub write_simple_section($$)
{
my ($pdata, $write_section) = @_;
return & {$write_section} ($pdata);
}
# the text is repeated for each locale
# it is used on all distributions
sub write_locale_sections($$$)
{
my ($pdata, $group, $write_single_lang_section) = @_;
my $curLevel = 0;
my $out = "";
foreach my $curLang (sort keys %{$pdata->{'lang'}}) {
my $pld = \% {$pdata->{'lang'}{$curLang}};
if ($pld->{'group'} == $group) {
$curLevel = write_level_begin($curLevel, $pld->{'level'}, \$out);
$out .= & {$write_single_lang_section} ($pdata, $curLang);
}
}
$curLevel = write_level_end($curLevel, \$out);
return $out;
}
########################################################
# main write function
sub write_specs($$)
{
my ($pdata, $spec_template) = @_;
my $do_not_edit = write_simple_section ($pdata, \&write_do_not_edit_section);
foreach my $group (0 .. $pdata->{'max_group'}) {
my $metadata = write_locale_sections ($pdata, $group, \&write_metadata_section);
my $install_scripts = write_locale_sections ($pdata, $group, \&write_install_scripts_section);
my $files = write_locale_sections ($pdata, $group, \&write_files_section);
if ($metadata || $install_scripts || $files) {
my $spec = $spec_template;
$spec =~ s/.in$//;
$spec =~ s/groupX/group$group/;
print "Generating $spec...\n";
open TEMPLATE , "< $spec_template" or die "Can't open '$spec_template'\n";
open SPEC , "> $spec" or die "Can't open '$spec for writing'\n";
while( my $line = <TEMPLATE>) {
foreach my $level (0..2) {
my $level_langs = write_level_langs($pdata, $group, $level);
$line =~ s/\@OOO_LANGS_MIN_$level\@/$level_langs/;
}
$line =~ s/\@DO_NOT_EDIT_COMMENT\@/$do_not_edit/;
$line =~ s/\@GROUP_NUMBER\@/$group/;
$line =~ s/\@SUBPACKAGES_METAINFO\@/$metadata/;
$line =~ s/\@SUBPACKAGES_SCRIPTS\@/$install_scripts/;
$line =~ s/\@SUBPACKAGES_FILELIST\@/$files/;
print SPEC $line;
}
close(TEMPLATE);
close(SPEC);
}
$group++;
}
}
sub usage() sub usage()
{ {
@ -256,12 +348,6 @@ my $spec_template;
my $data_file; my $data_file;
my $help; my $help;
my $args = join ' ', @ARGV;
my $do_not_edit = "###################################################################\n" .
"## DO NOT EDIT THIS SPEC FILE\n" .
"## Generated by:\n" .
"## perl lo-help-gen-spec $args\n" .
"###################################################################";
for my $arg (@ARGV) { for my $arg (@ARGV) {
@ -284,47 +370,4 @@ die "Error: Spec file template is not defined, try --help" unless (defined $spec
die "Error: Data file is not defined, try --help" unless (defined $data_file); die "Error: Data file is not defined, try --help" unless (defined $data_file);
read_data($data_file, \%data); read_data($data_file, \%data);
write_specs(\%data, $spec_template);
foreach my $group (0 .. $data{'max_group'}) {
my $metainfo = "";
my $scripts = "";
my $filelist = "";
write_section (\%data, $group, \&write_help_package_section, \$metainfo);
write_section (\%data, $group, \&write_help_scripts_section, \$scripts);
write_section (\%data, $group, \&write_help_files_section, \$filelist);
if ($metainfo || $scripts || $filelist) {
my $spec = $spec_template;
$spec =~ s/.in$//;
$spec =~ s/groupX/group$group/;
if (-f $spec && ! -f "$spec.old") {
print "Saving $spec.old...\n";
copy("$spec","$spec.old");
}
print "Generating $spec...\n";
open TEMPLATE , "< $spec_template" or die "Can't open '$spec_template'\n";
open SPEC , "> $spec" or die "Can't open '$spec for writing'\n";
while( my $line = <TEMPLATE>) {
foreach my $level (0..2) {
my $level_langs = write_level_langs(\%data, $group, $level);
$line =~ s/\@OOO_LANGS_MIN_$level\@/$level_langs/;
}
$line =~ s/\@DO_NOT_EDIT_COMMENT\@/$do_not_edit/;
$line =~ s/\@GROUP_NUMBER\@/$group/;
$line =~ s/\@SUBPACKAGES_METAINFO\@/$metainfo/;
$line =~ s/\@SUBPACKAGES_SCRIPTS\@/$scripts/;
$line =~ s/\@SUBPACKAGES_FILELIST\@/$filelist/;
print SPEC $line;
}
close(TEMPLATE);
close(SPEC);
}
$group++;
}

3
make-3.82-gbuild-20120301.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d19a08fcc368d5ebd3bba307394a6d318f9dbd4c72fa83eded8b3b68c4a71359
size 1250130

9
mediawiki-no-broken-help.diff Normal file
View File

@ -0,0 +1,9 @@
--- swext/mediawiki/src/manifest.xml.old 2012-03-27 18:22:01.000000000 +0200
+++ swext/mediawiki/src/manifest.xml 2012-03-30 16:56:56.000000000 +0200
@@ -46,6 +46,4 @@
manifest:full-path="Types.xcu"/>
<manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
manifest:full-path="Paths.xcu"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
- manifest:full-path="help"/>
</manifest:manifest>

40
nlpsolver-no-broken-help.diff
View File

@ -1,28 +1,12 @@
--- nlpsolver/makefile.mk.old 2011-05-24 14:08:23.000000000 +0200 --- nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/manifest.xml.old 2012-03-27 18:22:01.000000000 +0200
+++ nlpsolver/makefile.mk 2011-08-31 15:09:01.000000000 +0200 +++ nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/manifest.xml 2012-03-30 16:44:37.000000000 +0200
@@ -42,7 +42,9 @@ TARFILE_MD5=90401bca927835b6fbae4a707ed1 @@ -2,8 +2,6 @@
TARFILE_NAME=nlpsolver-0.9 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
TARFILE_ROOTDIR=nlpsolver-0.9 <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components"
manifest:full-path="components.rdb"/>
-PATCH_FILES=nlpsolver-0.9.patch - <manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
+PATCH_FILES=\ - manifest:full-path="help"/>
+ nlpsolver-0.9.patch \ <manifest:file-entry manifest:media-type="application/vnd.sun.star.package-bundle-description"
+ nlpsolver-0.9-no-broken-help.patch manifest:full-path="description/extensiondescription.txt"/>
</manifest:manifest>
ANT_FLAGS+=-Dplatforms.JDK_1.5.home=$(JAVA_HOME) -Doffice.program.dir=$(SOLARBINDIR) \ No newline at end of file
--- nlpsolver/nlpsolver-0.9-no-broken-help.patch.old 2011-08-31 15:13:00.000000000 +0200
+++ nlpsolver/nlpsolver-0.9-no-broken-help.patch 2011-08-31 15:08:25.000000000 +0200
@@ -0,0 +1,12 @@
+--- misc/nlpsolver-0.9/src/uno-extension-manifest.xml.old 2009-03-30 18:20:03.000000000 +0200
++++ misc/build/nlpsolver-0.9/src/uno-extension-manifest.xml 2011-08-31 15:07:12.000000000 +0200
+@@ -2,8 +2,6 @@
+ <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=Java"
+ manifest:full-path="NLPSolver.jar"/>
+- <manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
+- manifest:full-path="help"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.package-bundle-description"
+ manifest:full-path="description/extensiondescription.txt"/>
+ </manifest:manifest>
+\ No newline at end of file

Some files were not shown because too many files have changed in this diff Show More