- patches merged upstream, put font in TTF dir; rel 0.2

Changed files:
    libreoffice.spec -> 1.472

diff --git a/libreoffice.spec b/libreoffice.spec
index e93e1f0b9f1e9bee3a565caf59d98081f11e7384..1ca0652be82180345f5fa9ac3467c0af08b1730b 100644 (file)
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -26,21 +26,26 @@ Summary:    OpenOffice - powerful office suite
 Summary(pl):   OpenOffice - potê¿ny pakiet biurowy
 Name:          openoffice
 Version:       %{fullver}
-Release:       0.1
+Release:       0.2
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
 # Source0:     http://ooo.ximian.com/packages/OOO_1_1_2/ooo-build-%{ooobver}.tar.gz
-Source0:       http://ooo.ximian.com/packages/snap/ooo-build-%{ooobver}-ooo-build-1-3-20041006.tar.gz
-# Source0-md5: a2af065f5c4db882be4067259fd58ac6
+Source0:       http://ooo.ximian.com/packages/snap/ooo-build-%{ooobver}-ooo-build-1-3-20041015.tar.gz
+# Source0-md5: 78231f49923e1a7ea01ceb98a314f371
+# Source0-size:        2952279
 Source1:       http://ooo.ximian.com/packages/OOO_%{dfullver}/OOO_%{dfullver}.tar.bz2
 # Source1-md5: f7f13576ad04e6a958dcd9d4cb569538
+# Source1-size:        163238527
 Source2:       http://ooo.ximian.com/packages/ooo-icons-OOO_1_1-10.tar.gz
 # Source2-md5: be79d3cb5f64d2c0ac8a75e65a59cb09
+# Source2-size:        1563326
 Source3:       http://kde.openoffice.org/files/documents/159/1975/ooo-KDE_icons-OOO_1_1-0.3.tar.gz
 # Source3-md5: 05ff784fff01c54cd3dd7b975b46bae2
+# Source3-size:        1017540
 Source4:       http://ooo.ximian.com/packages/libwpd-snap-20040823.tar.gz
 # Source4-md5: c3d8c9f5ae2abbe1b7091817265b9ef3
+# Source4-size:        447710
 Source10:      oocalc.desktop
 Source11:      oodraw.desktop
 Source12:      ooffice.desktop
@@ -62,36 +67,47 @@ Source19:   oowriter.desktop
 # Help content
 Source400:     %{cftp}/helpcontent/helpcontent_01_unix.tgz
 # Source400-md5:       7da2aff674c2c84aba8b21ac2ab16bb6
+# Source400-size:      12052480
 Source401:     %{cftp}/helpcontent/helpcontent_31_unix.tgz
 # Source401-md5:       c7e618e2d9b8bd25cae12954ef2548c9
+# Source401-size:      12073861
 Source402:     %{cftp}/helpcontent/helpcontent_33_unix.tgz
 # Source402-md5:       68d58bc30b485a77c0a0fba08af3aee3
+# Source402-size:      12574720
 Source403:     %{cftp}/helpcontent/helpcontent_34_unix.tgz
 # Source403-md5:       8696bbee3dc4d5b6fd60218123016e29
+# Source403-size:      12554240
 Source404:     %{cftp}/helpcontent/helpcontent_39_unix.tgz
 # Source404-md5:       c2ae86d02f462d2b663d621190f5ef34
+# Source404-size:      12482560
 Source405:     %{cftp}/helpcontent/helpcontent_46_unix.tgz
 # Source405-md5:       7b013981edce2fabe4a8751ff64a8d58
+# Source405-size:      12072960
 Source406:     %{cftp}/helpcontent/helpcontent_49_unix.tgz
 # Source406-md5:       a39f44ec40f452c963a4a187f31d1acb
+# Source406-size:      13649920
 Source407:     %{cftp}/helpcontent/helpcontent_55_unix.tgz
 # Source407-md5:       804d3ce61e11335193a410aaf9603f8e
+# Source407-size:      11549758
 Source408:     %{cftp}/helpcontent/helpcontent_81_unix.tgz
 # Source408-md5:       81b705057a0e14ebcbf02fac4762781a
+# Source408-size:      12902400
 Source409:     %{cftp}/helpcontent/helpcontent_82_unix.tgz
 # Source409-md5:       3121fbd251176d7c7b6e33ecec744c65
+# Source409-size:      12369920
 Source410:     %{cftp}/helpcontent/helpcontent_86_unix.tgz
 # Source410-md5:       aee37935139c5ccd4b6d8abdd2037c66
+# Source410-size:      12769280
 Source411:     %{cftp}/helpcontent/helpcontent_88_unix.tgz
 # Source411-md5:       3b00571318e45965dee0545d86306d65
+# Source411-size:      12953600
 Source412:     %{cftp}/helpcontent/helpcontent_90_unix.tgz
 # Source412-md5:       9521a01c5817e87178f356762f8cdab5
+# Source412-size:      12495734
 
 Patch0:                %{name}-rh-disable-spellcheck-all-langs.patch
 # PLD-specific, they ooo-build people don't like it
 Patch1:                %{name}-files.patch
-Patch2:                %{name}-build.patch
-Patch3:                %{name}-scresplit.patch
 
 URL:           http://www.openoffice.org/
 BuildRequires: ImageMagick
@@ -1821,8 +1837,6 @@ zuluskim.
 %setup -q -n ooo-build-%{ooobver}
 %patch0 -p1
 %patch1 -p1 
-%patch2 -p1
-%patch3 -p1
 
 install -d src
 # sources, icons, KDE_icons
@@ -1992,8 +2006,8 @@ touch $RPM_BUILD_ROOT%{_libdir}/%{name}/share/dict/ooo/dictionary.lst
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/share/fonts/truetype/*
 
 # Copy fixed OpenSymbol to correct location
-install -d $RPM_BUILD_ROOT%{_fontsdir}/openoffice
-install fonts/opens___.ttf $RPM_BUILD_ROOT%{_fontsdir}/openoffice
+install -d $RPM_BUILD_ROOT%{_fontsdir}/TTF
+install fonts/opens___.ttf $RPM_BUILD_ROOT%{_fontsdir}/TTF
 # %%ghost the fonts.cache-1 file
 touch $RPM_BUILD_ROOT%{_fontsdir}/openoffice/fonts.cache-1
 
@@ -2070,10 +2084,10 @@ umask 022
 [ ! -x /usr/bin/update-desktop-database ] || /usr/bin/update-desktop-database >/dev/null 2>&1
 
 %post libs
-fontpostinst TTF %{_fontsdir}/%{name}
+fontpostinst TTF %{_fontsdir}/TTF
 
 %postun libs
-fontpostinst TTF %{_fontsdir}/%{name}
+fontpostinst TTF %{_fontsdir}/TTF
 
 %files
 %defattr(644,root,root,755)
@@ -2207,9 +2221,7 @@ fontpostinst TTF %{_fontsdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/program/*.so.*
 %attr(755,root,root) %{_libdir}/%{name}/program/filter/*.so
 
-%dir %{_fontsdir}/openoffice
 %{_fontsdir}/openoffice/*.ttf
-%ghost %{_fontsdir}/openoffice/fonts.cache-1
 
 %files libs-kde -f en.lang.kde
 %defattr(644,root,root,755)