commit OpenOffice_org-branding-upstream for openSUSE:Factory
Hello community, here is the log from the commit of package OpenOffice_org-branding-upstream for openSUSE:Factory checked in at Mon Apr 26 22:53:56 CEST 2010. -------- --- OpenOffice_org-branding-upstream/OpenOffice_org-branding-upstream.changes 2010-03-25 21:48:27.000000000 +0100 +++ OpenOffice_org-branding-upstream/OpenOffice_org-branding-upstream.changes 2010-04-23 15:20:02.000000000 +0200 @@ -1,0 +2,8 @@ +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 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-branding-upstream.spec ++++++ --- /var/tmp/diff_new_pack.IqICWf/_old 2010-04-26 22:52:20.000000000 +0200 +++ /var/tmp/diff_new_pack.IqICWf/_new 2010-04-26 22:52:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-branding-upstream (Version 3.2.0.99.2) +# spec file for package OpenOffice_org-branding-upstream (Version 3.2.0.99.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,12 @@ Name: OpenOffice_org-branding-upstream -Version: 3.2.0.99.2 +Version: 3.2.0.99.3 Release: 1 -%define ooo_build_version 3.2.0.99.2 +%define ooo_build_version 3.2.0.99.3 #!BuildIgnore: OpenOffice_org -BuildRequires: OpenOffice_org-artwork-devel >= 2.99 +BuildRequires: OpenOffice_org-bootstrap >= 3.2.0.99.3 +BuildRequires: OpenOffice_org-artwork-devel >= 3.2.0.99.3 %define ooo_basis_dir basis3.2 %define ooo_home ooo3 License: LGPLv3 @@ -37,21 +38,30 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build #!ExclusiveArch: %ix86 x86_64 ppc BuildArch: noarch -#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/intro.bmp -#BRAND: type: PC bitmap data, Windows 3.x format, 440 x 286 x 24 (BMP) +#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/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 "OpenOffice.org" and the major version "3" #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: -#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/about.bmp -#BRAND: type: PC bitmap data, Windows 3.x format, 415 x 95 x 24 (BMP) +# +#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/intro.bmp +#BRAND: type: PC bitmap data, Windows 3.x format, 440 x 286 x 24 +#BRAND: purpose: BMP variant of the above picture; it is needed in our build +#BRAND: until we enhance oosplash to read PNG +# +#BRAND: source: %ooo_build_tag-core.tar.bz2:%ooo_build_tag/default_images/introabout/about.png +#BRAND: type: PNG image data, 415 x 95, 8-bit/color RGB, non-interlaced #BRAND: purpose: displayed on top of the Help/About OpenOffice.org dialog #BRAND: text: should mention the app name "OpenOffice.org" and the major version "3" #BRAND: context: there are displayed several lines of some text below the picture #BRAND: the text is black on a white background +# +#BRAND: source: %ooo_build_tag-bootstrap.tar.bz2: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 OpenOffice.org @@ -65,7 +75,11 @@ %install install -m 755 -d $RPM_BUILD_ROOT%_datadir/%ooo_home/program -install -m 644 %_datadir/%ooo_home/solver/default_images/introabout/about.bmp \ +install -m 644 %_datadir/%ooo_home/ooo-build/src/sofficerc-upstream \ + $RPM_BUILD_ROOT%_datadir/%ooo_home/program/sofficerc +install -m 644 %_datadir/%ooo_home/solver/default_images/introabout/about.png \ + $RPM_BUILD_ROOT%_datadir/%ooo_home/program +install -m 644 %_datadir/%ooo_home/solver/default_images/introabout/intro.png \ $RPM_BUILD_ROOT%_datadir/%ooo_home/program install -m 644 %_datadir/%ooo_home/solver/default_images/introabout/intro.bmp \ $RPM_BUILD_ROOT%_datadir/%ooo_home/program ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de