mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-23 18:43:00 +00:00
Fix Math desktop category, minor spec cleanups
This commit is contained in:
Andrey Bondrov
parent
02cfa62f82
commit
c29df4ebbd
2 changed files with 36 additions and 37 deletions
|
|
@ -54,7 +54,7 @@ diff -Naur libreoffice-4.2.5.2.orig/sysui/desktop/menus/math.desktop libreoffice
|
|||
Icon=math
|
||||
Type=Application
|
||||
-Categories=Office;Spreadsheet;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other;
|
||||
+Categories=Office;Education;Science;Math;
|
||||
+Categories=Science;Math;
|
||||
Exec=${UNIXBASISROOTNAME} --math %%FILE%%
|
||||
MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml;
|
||||
Name=%PRODUCTNAME Math
|
||||
|
|
|
|||
|
|
@ -40,14 +40,14 @@
|
|||
%define _provides_exceptions libsndfile.so\\|libportaudio.so\\|libdb-4.2.so\\|libdb_java-4.2.so\\|libmyspell.so\\|libstlport_gcc.so\\|librdf.so.0\\|libraptor.so.1\\|libxmlsec1-nss.so.1\\|libxmlsec1.so.1
|
||||
%endif
|
||||
|
||||
Summary: Office suite
|
||||
Summary: Office suite
|
||||
Name: libreoffice
|
||||
Epoch: 1
|
||||
Version: 4.3.1
|
||||
%if "%beta" != ""
|
||||
%if "%{beta}" != ""
|
||||
Release: 0.%{beta}.1
|
||||
%else
|
||||
Release: 1
|
||||
Release: 2
|
||||
%endif
|
||||
Source0: %{relurl}/%{ooname}-%{buildver}.tar.xz
|
||||
Source1: %{relurl}/%{ooname}-dictionaries-%{buildver}.tar.xz
|
||||
|
|
@ -62,30 +62,30 @@ Source10: Mandriva-Rosa_Icons.tar.bz2
|
|||
Source34: %{devurl}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
|
||||
Source35: %{devurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
|
||||
Source36: %{devurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
|
||||
Source37: %{devurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
Source37: %{devurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
|
||||
|
||||
# External Download Sources
|
||||
Source40: http://hg.services.openoffice.org/binaries/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
|
||||
Source40: http://hg.services.openoffice.org/binaries/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
|
||||
|
||||
# Extensions
|
||||
Source50: %{srcurl}451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
|
||||
Source51: %{srcurl}b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
|
||||
Source52: %{oxyurl}3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt
|
||||
Source53: %{oxyurl}8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt
|
||||
Source54: %{oxyurl}b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
|
||||
Source55: %{srcurl}27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt
|
||||
Source56: %{srcurl}b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
|
||||
Source57: %{oxyurl}9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
|
||||
Source58: %{oxyurl}bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
|
||||
Source59: %{oxyurl}23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
|
||||
Source51: %{srcurl}b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
|
||||
Source52: %{oxyurl}3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt
|
||||
Source53: %{oxyurl}8d74685d41f8bffe8c3e71fe8deac09d-SmART_0.9.5.oxt
|
||||
Source54: %{oxyurl}b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
|
||||
Source55: %{srcurl}27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt
|
||||
Source56: %{srcurl}b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
|
||||
Source57: %{oxyurl}9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
|
||||
Source58: %{oxyurl}bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
|
||||
Source59: %{oxyurl}23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
|
||||
Source60: %{oxyurl}af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip
|
||||
Source61: %{oxyurl}1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip
|
||||
Source62: %{oxyurl}53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt
|
||||
Source63: %{oxyurl}472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt
|
||||
Source64: %{oxyurl}4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt
|
||||
Source65: %{oxyurl}a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt
|
||||
Source66: %{oxyurl}09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt
|
||||
Source67: %{oxyurl}b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt
|
||||
Source62: %{oxyurl}53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt
|
||||
Source63: %{oxyurl}472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt
|
||||
Source64: %{oxyurl}4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt
|
||||
Source65: %{oxyurl}a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt
|
||||
Source66: %{oxyurl}09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt
|
||||
Source67: %{oxyurl}b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt
|
||||
Source68: %{srcurl}4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2
|
||||
Source69: %{srcurl}OpenCOLLADA-master-6509aa13af.tar.bz2
|
||||
Source70: %{srcurl}libgltf/3d9ea1f2828c46f8ba94b88a87b3326d-libgltf-0.0.0.tar.bz2
|
||||
|
|
@ -105,15 +105,11 @@ Patch100: libreoffice-4.1-vendor.patch
|
|||
Patch101: libreoffice-4.2.5.2-desktop-categories.patch
|
||||
Patch102: npapi_h.patch
|
||||
|
||||
%if %{with icecream}
|
||||
BuildRequires: icecream
|
||||
%endif
|
||||
BuildRequires: bison
|
||||
BuildRequires: bsh
|
||||
%if %{with ccache}
|
||||
BuildRequires: ccache
|
||||
%endif
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: bison
|
||||
BuildRequires: bsh
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: doxygen >= 1.8.4
|
||||
BuildRequires: ed
|
||||
|
|
@ -122,42 +118,42 @@ BuildRequires: flex
|
|||
BuildRequires: flute
|
||||
BuildRequires: git
|
||||
BuildRequires: gperf
|
||||
%if %{with icecream}
|
||||
BuildRequires: icecream
|
||||
%endif
|
||||
BuildRequires: icu
|
||||
BuildRequires: imagemagick
|
||||
BuildRequires: mysql-connector-c++-devel
|
||||
BuildRequires: pentaho-libxml
|
||||
BuildRequires: pentaho-reporting-flow-engine
|
||||
BuildRequires: perl
|
||||
BuildRequires: perl-Archive-Zip
|
||||
BuildRequires: perl-MDK-Common
|
||||
BuildRequires: perl-HTML-Parser
|
||||
BuildRequires: perl-XML-Twig
|
||||
BuildRequires: python-translate >= 1.9.0
|
||||
BuildRequires: servlet3
|
||||
BuildRequires: sharutils
|
||||
BuildRequires: recode
|
||||
BuildRequires: sac
|
||||
BuildRequires: servlet3
|
||||
BuildRequires: sharutils
|
||||
BuildRequires: tcsh
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xsltproc >= 1.0.19
|
||||
BuildRequires: zip
|
||||
BuildRequires: boost-devel
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: glm-devel
|
||||
BuildRequires: hyphen-devel
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: kdelibs4-devel
|
||||
BuildRequires: pkgconfig(libwpd-0.10)
|
||||
BuildRequires: pkgconfig(libwpg-0.3)
|
||||
BuildRequires: libwps-devel
|
||||
BuildRequires: lpsolve-devel
|
||||
BuildRequires: mysql-connector-c++-devel
|
||||
BuildRequires: nas-devel
|
||||
BuildRequires: openldap-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: postgresql-devel
|
||||
BuildRequires: qt4-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: unixODBC-devel
|
||||
BuildRequires: vigra-devel
|
||||
BuildRequires: glm-devel
|
||||
BuildRequires: pkgconfig(bluez)
|
||||
BuildRequires: pkgconfig(cppunit)
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
|
|
@ -192,11 +188,14 @@ BuildRequires: pkgconfig(libmspub-0.1)
|
|||
BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.1
|
||||
BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.0
|
||||
BuildRequires: pkgconfig(liborcus-0.8) >= 0.7.0
|
||||
BuildRequires: pkgconfig(libpq)
|
||||
BuildRequires: pkgconfig(librsvg-2.0)
|
||||
BuildRequires: pkgconfig(libstartup-notification-1.0)
|
||||
BuildRequires: pkgconfig(libsvg)
|
||||
BuildRequires: pkgconfig(libucpp)
|
||||
BuildRequires: pkgconfig(libvisio-0.1)
|
||||
BuildRequires: pkgconfig(libwpd-0.10)
|
||||
BuildRequires: pkgconfig(libwpg-0.3)
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
BuildRequires: pkgconfig(libxslt)
|
||||
BuildRequires: pkgconfig(libxul)
|
||||
|
|
@ -228,14 +227,14 @@ BuildRequires: pkgconfig(glew)
|
|||
%if !%{javaless}
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-apache-regexp
|
||||
BuildRequires: hsqldb1.8.0
|
||||
BuildRequires: apache-commons-codec
|
||||
BuildRequires: apache-commons-lang
|
||||
BuildRequires: hsqldb1.8.0
|
||||
BuildRequires: jakarta-commons-httpclient
|
||||
BuildRequires: junit
|
||||
BuildRequires: java-1.7.0-openjdk-devel
|
||||
Suggests: %{name}-java = %{EVRD}
|
||||
%endif
|
||||
%endif
|
||||
# STLport-devel 4.5 + private patches are needed
|
||||
BuildConflicts: STLport-devel
|
||||
# Requres to all our packages
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue