diff --git a/_constraints b/_constraints index 003eedc..f69361b 100644 --- a/_constraints +++ b/_constraints @@ -7,7 +7,7 @@ 6000 - 18 + 20 diff --git a/libreoffice-branding-upstream.changes b/libreoffice-branding-upstream.changes deleted file mode 100644 index 2571bc9..0000000 --- a/libreoffice-branding-upstream.changes +++ /dev/null @@ -1,624 +0,0 @@ -------------------------------------------------------------------- -Thu Jan 2 10:13:33 UTC 2014 - tchvatal@suse.com - -- Version bump to 4.2.0rc for testing purposes. - -------------------------------------------------------------------- -Wed Dec 4 11:43:36 UTC 2013 - tchvatal@suse.com - -- Polish a bit with spec cleaner. - -------------------------------------------------------------------- -Thu Nov 7 13:52:26 UTC 2013 - tchvatal@suse.com - -- Version bump to 4.1.3 bugfix release. News: http://blog.documentfoundation.org/2013/11/01/the-document-foundation-announces-libreoffice-4-1-3/ - -------------------------------------------------------------------- -Tue Oct 8 16:45:35 UTC 2013 - tchvatal@suse.com - -- Version bump to 4.1.2.3: bugfix release only. - -------------------------------------------------------------------- -Wed Aug 21 14:56:46 UTC 2013 - pmladek@suse.com - -- update to 4.1.1.2 - -------------------------------------------------------------------- -Tue Aug 13 15:21:02 UTC 2013 - pmladek@suse.com - -- update to 4.1.1.1 - -------------------------------------------------------------------- -Tue Jul 30 13:06:00 UTC 2013 - pmladek@suse.com - -- update to 4.1.0.4 with very big help from tchvatal@suse.com - -------------------------------------------------------------------- -Mon Jun 17 17:34:03 UTC 2013 - fridrich.strba@suse.com - -- update to 4.0.3.3.5 (SUSE 4.0-rc5, tag suse-4.0-5, based on upstream 4.0.3.3) - -------------------------------------------------------------------- -Fri May 31 15:14:07 UTC 2013 - pmladek@suse.com - -- update to 4.0.3.3.4 (SUSE 4.0-rc4, tag suse-4.0-4, based on upstream 4.0.3.3) - -------------------------------------------------------------------- -Fri May 24 14:21:06 UTC 2013 - pmladek@suse.com - -- update to 4.0.3.3.3 (SUSE 4.0-rc3, tag suse-4.0-3, based on upstream 4.0.3.3) - -------------------------------------------------------------------- -Fri May 10 09:53:14 UTC 2013 - pmladek@suse.com - -- update to 4.0.3.3.2 (SUSE 4.0-rc2, tag suse-4.0-2, based on upstream 4.0.3.3) - -------------------------------------------------------------------- -Wed Apr 17 10:10:05 UTC 2013 - pmladek@suse.com - -- update to 4.0.2.2.1 (SUSE 4.0-rc1, tag suse-4.0-1, based on upstream 4.0.2.2) - -------------------------------------------------------------------- -Wed Apr 3 13:17:12 UTC 2013 - pmladek@suse.com - -- update to 4.0.2.2 - -------------------------------------------------------------------- -Tue Mar 19 18:04:38 UTC 2013 - pmladek@suse.com - -- update to 4.0.2.1 - -------------------------------------------------------------------- -Thu Feb 28 10:27:15 UTC 2013 - pmladek@suse.com - -- update to 4.0.1.2 - -------------------------------------------------------------------- -Thu Feb 21 10:27:15 UTC 2013 - tchvatal@suse.com - -- update to 4.0.1.1: - * new upstream branding - -------------------------------------------------------------------- -Tue Jan 22 12:28:43 UTC 2013 - tchvatal@suse.com - -- update to 4.0.0.3 - -------------------------------------------------------------------- -Wed Jan 9 15:31:16 UTC 2013 - tchvatal@suse.com - -- update to 4.0.0.1 - -------------------------------------------------------------------- -Wed Dec 19 13:14:12 UTC 2012 - tchvatal@suse.com - -- update to 4.0.0.0.beta2 - -------------------------------------------------------------------- -Wed Dec 19 09:01:42 UTC 2012 - tchvatal@suse.com - -- update to 4.0.0.0.beta1 -- use xz tarballs instead of bz ones -- add "xz" to BuildRequires; explicitly needed on older SUSE versions - -------------------------------------------------------------------- -Fri Dec 14 16:08:15 UTC 2012 - pmladek@suse.com - -- update to 3.6.3.2.4 (SUSE 3.6-rc4, tag suse-3.6-4, based on upstream 3.6.3.2) - -------------------------------------------------------------------- -Fri Nov 23 15:43:06 UTC 2012 - pmladek@suse.com - -- update to 3.6.3.2.3 (SUSE 3.6-rc3, tag suse-3.6-3, based on upstream 3.6.3.2) - -------------------------------------------------------------------- -Wed Nov 7 15:30:31 UTC 2012 - pmladek@suse.com - -- update to 3.6.3.2.2 (SUSE 3.6-rc2, tag suse-3.6-2, based on upstream 3.6.3.2) -- flat_logo.svg has to be branded as well - -------------------------------------------------------------------- -Tue Oct 30 11:58:44 UTC 2012 - pmladek@suse.com - -- updated to version 3.6.2.2.1 (SUSE 3.6 rc1 based on upstream 3.6.2.2) - -------------------------------------------------------------------- -Fri Aug 24 13:52:09 UTC 2012 - pmladek@suse.com - -- update version 3.6.1.2 - -------------------------------------------------------------------- -Fri Jul 27 14:19:29 UTC 2012 - pmladek@suse.com - -- update version 3.6.0.4: - * new upstream branding - -* Jun 22 2012 by pmladek@suse.com in LibreOffice:Unstable - -- update version 3.6.0.0.beta2 -- small spec clean up - -* Jun 14 2012 by pmladek@suse.com in LibreOffice:Unstable - -- updated to libreoffice-3.5.99.1 (3.6.0-beta1) -- pack about.svg instead of about.png -- icons are moved in sources - -------------------------------------------------------------------- -Mon Jul 9 17:06:28 UTC 2012 - pmladek@suse.com - -- update to libreoffice-3.5.4.7 (SUSE 3.5 rc3, based on upstream 3.5.5-rc3) - -------------------------------------------------------------------- -Thu Jun 28 13:33:54 UTC 2012 - pmladek@suse.com - -- updated to libreoffice-3.5.4.6 (SUSE 3.5 rc2, based on upstream 3.5.5-rc2) - -------------------------------------------------------------------- -Mon Jun 25 15:19:57 UTC 2012 - pmladek@suse.com - -- updated to libreoffice-3.5.4.5 (SUSE 3.5 rc1, based on upstream 3.5.5-rc2) - -------------------------------------------------------------------- -Thu Jun 14 15:38:44 UTC 2012 - pmladek@suse.com - -- updated to libreoffice-3.5.4.4 (SUSE 3.5 beta2, based on upstream 3.5.5-rc1) - -------------------------------------------------------------------- -Thu May 17 19:06:15 UTC 2012 - pmladek@suse.com - -- updated to libreoffice-3.5.4.3 (SUSE 3.5 beta1, based on upstream 3.5.4-rc1) - -------------------------------------------------------------------- -Wed Apr 25 15:23:26 UTC 2012 - pmladek@suse.com - -- updated to libreoffice-3.5.3.2 (3.5.3-rc2) - -------------------------------------------------------------------- -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 - -- updated to libreoffice-3.4.5.4 (SUSE 3.4.5-rc2) - -------------------------------------------------------------------- -Thu Feb 23 17:28:17 UTC 2012 - pmladek@suse.com - -- patch license to follow spdx.org standard - -------------------------------------------------------------------- -Fri Feb 17 10:37:12 UTC 2012 - pmladek@suse.com - -- updated to libreoffice-3.4.5.3 (SUSE 3.4.5-rc1) - -------------------------------------------------------------------- -Wed Nov 23 14:29:30 CET 2011 - pmladek@suse.cz - -- updated to libreoffice-3.4.4.3 (SUSE 3.4.4-rc1 == final) - -------------------------------------------------------------------- -Mon Sep 12 16:48:48 UTC 2011 - pmladek@suse.com - -- libreoffice-3.4.2.6 == SUSE 3.4.2-rc3 == final - -------------------------------------------------------------------- -Thu Sep 8 15:28:56 UTC 2011 - pmladek@suse.com - -- updated to libreoffice-3.4.2.6 (SUSE 3.4.2-rc3) - -------------------------------------------------------------------- -Fri Sep 2 14:25:16 UTC 2011 - pmladek@suse.com - -- updated to libreoffice-3.4.2.5 (SUSE 3.4.2-rc2) - -------------------------------------------------------------------- -Wed Aug 24 13:45:45 UTC 2011 - pmladek@novell.com - -- updated to libreoffice-3.4.2.4 (SUSE 3.4.2-rc1) - -------------------------------------------------------------------- -Wed Jul 27 15:10:40 UTC 2011 - pmladek@novell.com - -- updated to libreoffice-3.4.2.3 (3.4.2-rc3) -- started building directly from libreoffice-artwork source tarball -- used prebuilt sofficerc - -------------------------------------------------------------------- -Wed Jun 8 17:29:54 CEST 2011 - pmladek@suse.cz - -- updated to libreoffice-3.3.3.1 (3.3.3-rc1) - -------------------------------------------------------------------- -Wed Mar 23 20:08:17 CET 2011 - pmladek@suse.cz - -- libreoffice-3.3.2.2 == 3.3.2-rc2 == final - -------------------------------------------------------------------- -Fri Mar 18 16:40:02 CET 2011 - pmladek@suse.cz - -- updated to libreoffice-3.3.2.2 (3.3.2-rc2) - -------------------------------------------------------------------- -Wed Mar 9 17:42:27 CET 2011 - pmladek@suse.cz - -- updated to libreoffice-3.3.2.1 (3.3.2-rc1) - -------------------------------------------------------------------- -Wed Feb 23 14:08:35 CET 2011 - pmladek@suse.cz - -- libreoffice-3.3.1.2 == 3.3.1-rc2 == final - -------------------------------------------------------------------- -Wed Feb 16 16:27:04 CET 2011 - pmladek@suse.cz - -- updated to libreoffice-3.3.1.2 (3.3.1-rc2) - -------------------------------------------------------------------- -Tue Feb 8 20:53:59 CET 2011 - pmladek@suse.cz - -- updated to libreoffice-3.3.1.1 (3.3.1-rc1) - -------------------------------------------------------------------- -Mon Jan 31 20:32:38 CET 2011 - pmladek@suse.cz - -- libreoffice-build-3.3.0.4 == 3.3.0-rc4 == final - -------------------------------------------------------------------- -Wed Jan 19 12:58:21 CET 2011 - pmladek@suse.cz - -- updated to libreoffice-3.3.0.4 (3.3-rc4) - -------------------------------------------------------------------- -Tue Jan 11 16:41:58 CET 2011 - pmladek@suse.cz - -- updated to libreoffice-3.3.0.3 (3.3-rc3) - -------------------------------------------------------------------- -Tue Dec 21 19:44:02 CET 2010 - pmladek@suse.cz - -- updated to libreoffice-3.3.0.2 (3.3-rc2) - -------------------------------------------------------------------- -Wed Dec 1 19:41:47 CET 2010 - pmladek@suse.cz - -- updated to libreoffice-3.3.0.1 (3.3-rc1): - + removed obsolete intro.bmp - + added branding for the welcome screen (bnc#653519) - + added BrOffice branding requested by the Brazilian community -- fixed URL, summary, and description for LibreOffice - -------------------------------------------------------------------- -Fri Nov 12 12:24:42 CET 2010 - pmladek@suse.cz - -- updated to libreoffice-3.2.99.3 (3.3-beta3) - -------------------------------------------------------------------- -Thu Oct 14 19:12:31 CEST 2010 - pmladek@suse.cz - -- switched to the LibreOffice code base, http://www.documentfoundation.org/ -- renamed packages from OpenOffice_org* to libreoffice* -- updated to libreoffice-3.2.99.2 (3.3-beta2) - -------------------------------------------------------------------- -Wed Sep 15 20:45:27 CEST 2010 - pmladek@suse.cz - -- updated to version 3.2.98.1 - -------------------------------------------------------------------- -Thu Sep 2 15:45:12 CEST 2010 - pmladek@suse.cz - -- updated to version 3.2.1.6 - -------------------------------------------------------------------- -Tue Aug 24 16:37:41 CEST 2010 - pmladek@suse.cz - -- updated to version 3.2.1.5 - -------------------------------------------------------------------- -Wed Jun 16 19:17:34 CEST 2010 - pmladek@suse.cz - -- updated to version 3.2.1.4 - -------------------------------------------------------------------- -Mon May 31 17:27:18 CEST 2010 - pmladek@suse.cz - -- ooo-build-3.2.1.3 == 3.2.1-rc3 == final - -------------------------------------------------------------------- -Fri May 28 17:37:09 CEST 2010 - pmladek@suse.cz - -- updated to version 3.2.1.3 - -------------------------------------------------------------------- -Tue May 25 17:44:26 CEST 2010 - pmladek@suse.cz - -- updated to version 3.2.1.2 - -Thu May 13 20:29:10 CEST 2010 - pmladek@suse.cz - -- updated to version 3.2.1.1 -- added initial support for build on MeeGo distro - -------------------------------------------------------------------- -Fri Apr 23 11:30:30 CEST 2010 - pmladek@suse.cz - -- updated to version 3.2.0.99.3 - + replaced about.bmp with about.png - + added intro.png - + added sofficerc - -------------------------------------------------------------------- -Fri Apr 23 11:30:30 CEST 2010 - pmladek@suse.cz - -- updated to version 3.2.0.99.3 - + replaced about.bmp with about.png - + added intro.png - + added sofficerc - -------------------------------------------------------------------- -Thu Mar 25 21:38:09 CET 2010 - pmladek@suse.cz - -- updated to version 3.2.0.99.2 - -------------------------------------------------------------------- -Thu Mar 11 21:18:47 CET 2010 - pmladek@suse.cz - -- updated to version 3.2.0.99.1 - -------------------------------------------------------------------- -Fri Feb 26 17:11:58 CET 2010 - pmladek@suse.cz - -- updated to version 3.2.0.98.1 - -------------------------------------------------------------------- -Wed Feb 24 17:20:34 CET 2010 - pmladek@suse.cz - -- updated to version 3.2.0.7 - -------------------------------------------------------------------- -Thu Feb 18 20:46:24 CET 2010 - pmladek@suse.cz - -- updated to version 3.2.0.6 - -------------------------------------------------------------------- -Thu Feb 4 19:36:48 CET 2010 - pmladek@suse.cz - -- ooo-build-3.2.0.5 == 3.2-rc5 == final - -------------------------------------------------------------------- -Thu Feb 4 15:33:42 CET 2010 - pmladek@suse.cz - -- updated to version 3.2.0.5 - -------------------------------------------------------------------- -Wed Jan 27 20:29:22 CET 2010 - pmladek@suse.cz - -- updated to version 3.2.0.4 - -------------------------------------------------------------------- -Wed Jan 13 19:32:02 CET 2010 - pmladek@suse.cz - -- updated to version 3.2.0.2 - -------------------------------------------------------------------- -Sun Dec 20 19:38:12 CET 2009 - pmladek@suse.cz - -- updated to version 3.2.0.1 - -------------------------------------------------------------------- -Mon Dec 7 17:53:37 CET 2009 - pmladek@suse.cz - -- updated to version 3.1.99.4 - -------------------------------------------------------------------- -Tue Nov 24 16:57:27 CET 2009 - pmladek@suse.cz - -- updated to version 3.1.99.3 - -------------------------------------------------------------------- -Fri Nov 13 17:34:52 CET 2009 - pmladek@suse.cz - -- updated to version 3.1.99.2 - -------------------------------------------------------------------- -Thu Oct 29 22:57:28 CET 2009 - pmladek@suse.cz - -- updated to version 3.1.99.1 - -------------------------------------------------------------------- -Tue Oct 20 16:45:29 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.1.4 - -------------------------------------------------------------------- -Tue Oct 6 17:01:57 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.1.3 - -------------------------------------------------------------------- -Tue Sep 22 16:15:15 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.1.2 -- fixed major version in the branding description - -------------------------------------------------------------------- -Tue Sep 1 13:02:33 CEST 2009 - pmladek@suse.cz - -- do not exclude archs for noarch packages - -------------------------------------------------------------------- -Wed Aug 26 13:28:08 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.1.1 - -------------------------------------------------------------------- -Tue Aug 18 19:51:59 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.0.99.3 - -------------------------------------------------------------------- -Tue Aug 4 22:19:15 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.0.99.2 - -------------------------------------------------------------------- -Thu Jul 23 21:16:24 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.0.99.1 - -------------------------------------------------------------------- -Mon Jun 29 19:30:31 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.0.98.2 - -------------------------------------------------------------------- -Mon Jun 15 21:16:25 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.0.98.1 - -------------------------------------------------------------------- -Thu May 28 19:24:34 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.0.6 - -------------------------------------------------------------------- -Tue May 26 16:38:52 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.0.5 - -------------------------------------------------------------------- -Fri May 22 13:57:45 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.0.4 - -------------------------------------------------------------------- -Thu May 21 18:40:21 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.0.3 - -------------------------------------------------------------------- -Tue May 19 16:30:15 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.0.2 - -------------------------------------------------------------------- -Fri May 15 17:38:01 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.0.1 - -------------------------------------------------------------------- -Thu May 7 23:12:05 CEST 2009 - pmladek@suse.cz - -- updated to version 3.1.0.0 - -------------------------------------------------------------------- -Thu Apr 30 19:56:03 CEST 2009 - pmladek@suse.cz - -- updated to version 3.0.99.7 - -------------------------------------------------------------------- -Fri Apr 24 13:48:09 CEST 2009 - pmladek@suse.cz - -- updated to version 3.0.99.6 - -------------------------------------------------------------------- -Fri Apr 17 17:43:05 CEST 2009 - pmladek@suse.cz - -- updated to version 3.0.99.5 - -------------------------------------------------------------------- -Wed Apr 8 19:48:24 CEST 2009 - pmladek@suse.cz - -- updated to version 3.0.99.4 - -------------------------------------------------------------------- -Fri Mar 27 21:17:08 CET 2009 - pmladek@suse.cz - -- updated to version 3.0.99.3 - -------------------------------------------------------------------- -Fri Mar 20 16:09:23 CET 2009 - pmladek@suse.cz - -- updated to version 3.0.99.2 - -------------------------------------------------------------------- -Tue Mar 10 12:00:11 CET 2009 - pmladek@suse.cz - -- updated to version 3.0.99.1 - -------------------------------------------------------------------- -Fri Feb 20 14:02:10 CET 2009 - pmladek@suse.cz - -- updated to version 3.0.0.16.1 - -------------------------------------------------------------------- -Fri Feb 6 16:06:46 CET 2009 - pmladek@suse.cz - -- updated to version 3.0.0.15 - -------------------------------------------------------------------- -Fri Jan 23 17:43:56 CET 2009 - pmladek@suse.cz - -- updated to version 3.0.0.13 - -------------------------------------------------------------------- -Fri Jan 9 15:51:56 CET 2009 - pmladek@suse.cz - -- updated to version 3.0.0.11 - -------------------------------------------------------------------- -Fri Dec 5 21:52:22 CET 2008 - pmladek@suse.cz - -- updated to version 3.0.0.10 - -------------------------------------------------------------------- -Fri Nov 21 13:31:47 CET 2008 - pmladek@suse.cz - -- updated to version 3.0.0.9 - -------------------------------------------------------------------- -Fri Nov 7 13:48:05 CET 2008 - pmladek@suse.cz - -- updated to version 3.0.0.8 - -------------------------------------------------------------------- -Mon Oct 27 15:17:32 CET 2008 - pmladek@suse.cz - -- updated to version 3.0.0.7 - -------------------------------------------------------------------- -Fri Oct 10 16:01:11 CEST 2008 - pmladek@suse.cz - -- updated to version 3.0.0.6 -- added BuildIgnore OpenOffice_org to avoid cyclic build dependency - -------------------------------------------------------------------- -Mon Oct 6 15:00:38 CEST 2008 - sbrabec@suse.cz - -- Conflict with other branding providers (FATE#304881). - -------------------------------------------------------------------- -Sat Sep 27 12:04:54 CEST 2008 - pmladek@suse.cz - -- updated to the milestone ooo300-m7 (3.0rc2) -- updated ooo-build to version 3.0.0.5 -- fixed provides - -------------------------------------------------------------------- -Thu Sep 11 17:37:47 CEST 2008 - pmladek@suse.cz - -- split from the main OpenOffice_org package, version 3.0 - diff --git a/libreoffice-branding-upstream.spec b/libreoffice-branding-upstream.spec deleted file mode 100644 index 3f831b4..0000000 --- a/libreoffice-branding-upstream.spec +++ /dev/null @@ -1,88 +0,0 @@ -# -# spec file for package libreoffice-branding-upstream -# -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -%define lo_home libreoffice -Name: libreoffice-branding-upstream -Version: 4.2.0.1 -Release: 0 -Summary: Original Branding for LibreOffice -License: LGPL-3.0+ or MPL-1.1+ -Group: Productivity/Office/Suite -Url: http://www.documentfoundation.org/ -Source0: libreoffice-%{version}.tar.xz -BuildRequires: xz -Supplements: packageand(libreoffice:branding-upstream) -Provides: libreoffice-branding = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -Conflicts: otherproviders(libreoffice-branding) -#BRAND: source: libreoffice.tar.xz:libreoffice/default_images/brand/intro.png -#BRAND: type: PNG image data, 440 x 286, 8-bit/color RGB, non-interlaced -#BRAND: purpose: "splash" image displayed for a short time, when the application is launching -#BRAND: text: should mention the app name "LibreOffice" -#BRAND: context: no border is being displayed around the splash windows -#BRAND: the picture is overlapped by the progress bar: x,y=212,216; w,h=263,8 -#BRAND: the default progress bar color is 0,0,128 (blue) -#BRAND: the progress bar has 1 pixel width white border -# -#BRAND: source: libreoffice.tar.xz:libreoffice/default_images/brand/shell/about.svg -#BRAND: type: SVG image data, 486 x 322 -#BRAND: purpose: background for the the Help/About LibreOffice dialog -#BRAND: text: no space for text; all text is written by the application -#BRAND: on top if this background -#BRAND: context: the application name and vendo is written on top of the dialog; -#BRAND: product description and license text is in the middle; -#BRAND: there are few buttons on the bottom of the dialog -#BRAND: the text is black on a white background -# -#BRAND: source: libreoffice.tar.xz:src/sofficerc-upstream -#BRAND: type: text config file (ini-files-like) -#BRAND: purpose: defines the position, size and, color of the status bar - -%description -This package includes the original branding for the LibreOffice -office suite. - -%prep -%setup -q -n libreoffice-%{version} - -%build - -%install -install -m 755 -d %{buildroot}%{_datadir}/%{lo_home}/program/shell -# sofficerc -install -m 644 $RPM_SOURCE_DIR/sofficerc-upstream \ - %{buildroot}%{_datadir}/%{lo_home}/program/sofficerc -# pictures -for pict in intro.png \ - flat_logo.svg \ - shell/about.svg \ - shell/backing_left.png \ - shell/backing_right.png \ - shell/backing_rtl_left.png \ - shell/backing_rtl_right.png \ - shell/backing_space.png ; do - install -m 644 icon-themes/galaxy/brand/$pict \ - %{buildroot}%{_datadir}/%{lo_home}/program/$pict -done - -%files -%defattr(-,root,root) -%{_datadir}/%{lo_home} - -%changelog diff --git a/libreoffice.changes b/libreoffice.changes index dedf5d4..cfb800f 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Jan 4 10:54:18 UTC 2014 - tchvatal@suse.com + +- Drop branding-upstream package to merge it back to main one. + +------------------------------------------------------------------- +Sat Jan 4 09:54:53 UTC 2014 - tchvatal@suse.com + +- Raise required size for constraints to 20G. + ------------------------------------------------------------------- Fri Jan 3 20:43:30 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 4239a17..8daebdf 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -274,6 +274,18 @@ example: - libreoffice-l10n-fr - libreoffice-l10n-it +%package branding-upstream +Summary: Original Branding for LibreOffice +License: Apache-2.0 and Artistic-1.0 and BSD-3-Clause and BSD-4-Clause and GPL-2.0+ and LPPL-1.3c and LGPL-2.1+ and LGPL-3.0 and MPL-1.1 and MIT and SUSE-Public-Domain and W3C +Group: Productivity/Office/Suite +Supplements: packageand(libreoffice:branding-upstream) +Provides: libreoffice-branding = %{version} +BuildArch: noarch +Conflicts: otherproviders(libreoffice-branding) + +%description branding-upstream +This package includes the original branding for the LibreOffice office suite. + %package icon-theme-crystal Summary: Crystal LibreOffice Icon Theme (KDE3 default) License: LGPL-2.1 @@ -976,7 +988,7 @@ done # help files are luckily in just one folder mkdir -p %{buildroot}/%{_datadir}/%{name}/help/ echo "%dir %{_datadir}/%{name}/help" >>file-lists/common_list.txt -mv %{buildroot}/%{_datadir}/%{name}/help/ %{buildroot}/%{_datadir}%{name} +mv %{buildroot}/%{_libdir}/%{name}/help/ %{buildroot}/%{_datadir}%{name} ln -s %{_datadir}/%{name}/help/ %{buildroot}/%{_libdir}/%{name}/help echo "%{_libdir}/%{name}/help" >> file-lists/common_list.txt for file in idxcaption.xsl idxcontent.xsl main_transform.xsl ; do @@ -1003,11 +1015,9 @@ for file in sofficerc \ shell/backing_rtl_left.png \ shell/backing_rtl_right.png \ shell/backing_space.png ; do - rm -f %{buildroot}/%{_libdir}/%{name}/program/$file - ln -sf %{_datadir}/%{name}/program/$file %{buildroot}/%{_libdir}/%{name}/program/$file - # touch the target file to make brp-symlink happy; the touched files are not packaged - # it would be possible to disable the error using NO_BRP_STALE_LINK_ERROR=yes but the check is pretty useful to catch other errors - touch %{buildroot}/%{_datadir}/%{name}/program/$file + mv "%{buildroot}%{_libdir}/%{name}/program/$file" "%{buildroot}%{_datadir}/%{name}/program/$file" + ln -sf "%{_datadir}/%{name}/program/$file" "%{buildroot}/%{_libdir}/%{name}/program/$file" + echo "%{buildroot}%{_datadir}/%{name}/program/$file" >> file-lists/branding-upstream.txt done ################ @@ -1022,8 +1032,11 @@ mkdir -p %{buildroot}%{python_sitelib} ln -s %{_libdir}/libreoffice/program/uno.py %{buildroot}%{python_sitelib}/uno.py ln -s %{_libdir}/libreoffice/program/unohelper.py %{buildroot}%{python_sitelib}/unohelper.py +# Remove translations source as we need more space +rm -rf translations/source/ + # We have ton of duped files so run over it -%fdupes -s %{buildroot}/usr +%fdupes %{buildroot}/usr %pre # do not crate cache for bundled extensions because it is not secure @@ -1159,39 +1172,42 @@ test "$1" = "0" && rm -rf ./%{_libdir}/%{name}/share/uno_packages/cache || true %{_libdir}/%{name}/share/extensions/gdocs %{_libdir}/%{name}/share/extensions/wiki-publisher -%files -n libreoffice-icon-theme-crystal +%files icon-theme-crystal %defattr(-,root,root) %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/share %dir %{_datadir}/%{name}/share/config %{_datadir}/%{name}/share/config/images_crystal.zip -%files -n libreoffice-icon-theme-galaxy +%files icon-theme-galaxy %defattr(-,root,root) %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/share %dir %{_datadir}/%{name}/share/config %{_datadir}/%{name}/share/config/images.zip -%files -n libreoffice-icon-theme-hicontrast +%files icon-theme-hicontrast %defattr(-,root,root) %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/share %dir %{_datadir}/%{name}/share/config %{_datadir}/%{name}/share/config/images_hicontrast.zip -%files -n libreoffice-icon-theme-oxygen +%files icon-theme-oxygen %defattr(-,root,root) %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/share %dir %{_datadir}/%{name}/share/config %{_datadir}/%{name}/share/config/images_oxygen.zip -%files -n libreoffice-icon-theme-tango +%files icon-theme-tango %defattr(-,root,root) %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/share %dir %{_datadir}/%{name}/share/config %{_datadir}/%{name}/share/config/images_tango.zip +%files -f file-lists/branding_upstream.txt branding-upstream +%defattr(-,root,root) + %changelog