diff --git a/0001-Package-filter-in-common-pack.patch b/0001-Package-filter-in-common-pack.patch deleted file mode 100644 index c25f37e..0000000 --- a/0001-Package-filter-in-common-pack.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5deb84c3b45024dffa3db5b8aaf528be643634fc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Tue, 24 Jun 2014 09:55:29 +0200 -Subject: [PATCH] Package filter in common pack - -Change-Id: I3728244712966cf2245a79f2630ac46cb63f1d21 ---- - bin/distro-install-file-lists | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists -index ada7295..87c2a09 100755 ---- a/bin/distro-install-file-lists -+++ b/bin/distro-install-file-lists -@@ -78,6 +78,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then - rm -f common_list.txt - for module in gid_Module_Root gid_Module_Root_Brand \ - gid_Module_Root_Files_[0-9] \ -+ gid_Module_Filter \ - gid_Module_Root_Hack \ - gid_Module_Oo_Linguistic \ - gid_Module_Root_Extension_Dictionary_* \ -@@ -405,6 +406,7 @@ else - create_package_directory gid_Module_Root_Files_Images pkg/libreoffice-common - create_package_directory gid_Module_Oo_Linguistic pkg/libreoffice-common - create_package_directory gid_Module_Optional_Xsltfiltersamples pkg/libreoffice-common -+ create_package_directory gid_Module_Filter pkg/libreoffice-common - create_package_directory gid_Module_Optional_Grfflt pkg/libreoffice-draw - create_package_directory gid_Module_Prg_Calc_Bin pkg/libreoffice-calc - create_package_directory gid_Module_Prg_Math_Bin pkg/libreoffice-math --- -1.8.5.5 - diff --git a/libreoffice-4.3.0.1.tar.xz b/libreoffice-4.3.0.1.tar.xz deleted file mode 100644 index 48b376f..0000000 --- a/libreoffice-4.3.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e87236ea3e70b1bd810807cc836741a2bde12a2eac654187b66987a4df5023b3 -size 151976276 diff --git a/libreoffice-4.3.0.2.tar.xz b/libreoffice-4.3.0.2.tar.xz new file mode 100644 index 0000000..d08b5aa --- /dev/null +++ b/libreoffice-4.3.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cfe173deeefe0b78606db3da6d3f00a8331cfcfdfc8ef55aaef48537ab3fd1f +size 152011220 diff --git a/libreoffice-help-4.3.0.1.tar.xz b/libreoffice-help-4.3.0.1.tar.xz deleted file mode 100644 index 71b102f..0000000 --- a/libreoffice-help-4.3.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9da050efac3299835a322775923eaff1bdba4e929acb03f201e70653a0615820 -size 1854656 diff --git a/libreoffice-help-4.3.0.2.tar.xz b/libreoffice-help-4.3.0.2.tar.xz new file mode 100644 index 0000000..7c95aa8 --- /dev/null +++ b/libreoffice-help-4.3.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:043ed6999e502497f700c82c0035addff480a9235deb455f5e5f5c4b859d45cc +size 1854852 diff --git a/libreoffice-translations-4.3.0.1.tar.xz b/libreoffice-translations-4.3.0.1.tar.xz deleted file mode 100644 index 5171699..0000000 --- a/libreoffice-translations-4.3.0.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc7c9716484c5c6d80db31681cb77dbdec2a37a1788a8e75ad109739039ad3bc -size 126570768 diff --git a/libreoffice-translations-4.3.0.2.tar.xz b/libreoffice-translations-4.3.0.2.tar.xz new file mode 100644 index 0000000..135c17d --- /dev/null +++ b/libreoffice-translations-4.3.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:196b14b7c383d4c26a7ee7981d9ea850d3805c3cb3b5a0e0f397df8d217ddcae +size 126756520 diff --git a/libreoffice.changes b/libreoffice.changes index 6754ab0..66ea50e 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jul 3 11:21:45 UTC 2014 - tchvatal@suse.com + +- Version bump to 4.3.0.2: + * Various small bugfixes +- Drop upstreamed patches: + * 0001-Package-filter-in-common-pack.patch + ------------------------------------------------------------------- Wed Jun 25 11:04:41 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index fa04277..31c341c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -32,7 +32,7 @@ %define tarball_url http://download.documentfoundation.org/libreoffice/src/4.3.0/ # This is used due to the need for beta releases Name: libreoffice -Version: 4.3.0.1 +Version: 4.3.0.2 Release: 0 Summary: A Free Office Suite (Framework) 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 @@ -88,8 +88,6 @@ Patch12: mediawiki-no-broken-help.diff Patch13: jvmfwk-disable-gcj.diff # Fix running wizards in py2 as the utf is not there Patch16: wizards-create-temlates-with-python-2.6.diff -# PATCH-FIX-UPSTREAM: files missing from packagelist -Patch17: 0001-Package-filter-in-common-pack.patch # try to save space by using hardlinks Patch990: install-with-hardlinks.diff BuildRequires: ImageMagick @@ -852,7 +850,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %patch12 %patch13 -p1 %patch16 -p1 -%patch17 -p1 %patch990 -p1 # 256x256 icons tar -xjf %{SOURCE20}