rpms/koffice/F-10 koffice-1.6.3-dejavu_fonts.patch, 1.1, 1.2 koffice.spec, 1.84, 1.85

Wed Aug 26 18:53:36 UTC 2009

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18707

Modified Files:
	koffice-1.6.3-dejavu_fonts.patch koffice.spec 
Log Message:
* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-24.20090306svn
- -kformula: Requires: lyx-cmex10-fonts


koffice-1.6.3-dejavu_fonts.patch:
 Makefile.am     |    2 +-
 contextstyle.cc |    2 +-
 fontstyle.cc    |    8 +++++++-
 symboltable.cc  |    2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

Index: koffice-1.6.3-dejavu_fonts.patch
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-10/koffice-1.6.3-dejavu_fonts.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2

--- koffice-1.6.3-dejavu_fonts.patch	28 Jul 2009 20:53:21 -0000	1.1
+++ koffice-1.6.3-dejavu_fonts.patch	26 Aug 2009 18:53:36 -0000	1.2
@@ -41,7 +41,7 @@ diff -up koffice-1.6.3/lib/kformula/font
                                   i18n("Some fonts have been installed to assure that symbols in formulas are properly visualized. You must restart the application in order so that changes take effect"));
 +*/
 +        KMessageBox::information(qApp->mainWidget(),
-+                                 i18n("Some symbol fonts for formulas was font to be missing")); 
++                                 i18n("Some symbol fonts for formulas are missing")); 
      }
      m_installed = true;
  }


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-10/koffice.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- koffice.spec	28 Jul 2009 23:56:20 -0000	1.84
+++ koffice.spec	26 Aug 2009 18:53:36 -0000	1.85
@@ -11,7 +11,7 @@ BuildRequires: libutempter-devel
 Name:           koffice
 Epoch:          2
 Version:        1.6.3
-Release:        22.%{svn}svn%{?dist}
+Release:        24.%{svn}svn%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -126,8 +126,6 @@ KOffice is an integrated office suite.
 Summary:        Core support files for %{name} 
 Group:          Applications/Productivity
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
 Requires:       perl
 Conflicts:      koffice-i18n < 4:%{version}
 %description core
@@ -234,9 +232,16 @@ Requires:       %{name}-core = %{epoch}:
 Summary:        A powerful formula editor
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{epoch}:%{version}-%{release}
-# for cmex10
-Requires:       mathml-fonts
-Requires:       dejavu-sans-fonts 
+#if 0%{?fedora} > 9 
+Requires:       lyx-cmex10-fonts
+#else
+#Requires:       mathml-fonts
+#endif
+%if 0%{?fedora} > 10
+Requires:       dejavu-lgc-sans-fonts
+%else
+Requires:       dejavu-lgc-fonts 
+%endif
 %description kformula
 %{summary}.
 
@@ -258,17 +263,24 @@ Requires:        %{name}-core = %{epoch}
 %prep
 %setup -q
 
-#patch1 -p0 -b .CVE-2007-3387
-#patch2 -p0 -b .CVE-2007-4352-5392-5393
-#patch3 -p1 -b .gcc43
+%if 0%{?svn:1}
+%patch100 -p1 -b .svn
+%patch101 -p1 -b .quint32
+%else
+%patch1 -p0 -b .CVE-2007-3387
+%patch2 -p0 -b .CVE-2007-4352-5392-5393
+%patch3 -p1 -b .gcc43
+%endif
 
 %patch4 -p1 -b .dejavu
+# use LGC variant instead
+sed -i.dejavu-lgc \
+  -e 's|DejaVu Sans|DejaVu LGC Sans|' \
+  -e 's|dejavu sans|dejavu lgc sans|' \
+  lib/kformula/{contextstyle,fontstyle,symboltable}.cc 
 
 %patch50 -p1 -b glibc_strrchr
 
-%patch100 -p1 -b .svn
-%patch101 -p1 -b .quint32
-
 # hack/fix for newer automake
 sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
 make -f admin/Makefile.common
@@ -350,58 +362,59 @@ rm -f %{buildroot}%{_libdir}/libkugar*.s
 %clean
 rm -rf %{buildroot}
 
-
 %post core
-xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/crystalsvg &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/locolor &> /dev/null || :
 
 %postun core
-xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kword
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kword
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kpresenter
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kpresenter 
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kugar
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kugar
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kexi
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kexi
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%post kchart
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun kchart
-/sbin/ldconfig
-xdg-desktop-menu forceupdate 2> /dev/null || :
+if [ $1 -eq 0 ]; then
+  gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+  update-desktop-database -q &> /dev/null ||:
+fi
+
+%posttrans core
+gtk-update-icon-cache %{_datadir}/icons/crystalsvg &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+update-desktop-database -q &> /dev/null ||:
+
+%post kword -p /sbin/ldconfig
+
+%postun kword -p /sbin/ldconfig
+
+%posttrans kword
+update-desktop-database -q &> /dev/null ||:
+
+%post kpresenter -p /sbin/ldconfig
+
+%postun kpresenter -p /sbin/ldconfig
+
+%posttrans kpresenter
+update-desktop-database -q &> /dev/null ||:
+
+%post kugar -p /sbin/ldconfig
+
+%postun kugar -p /sbin/ldconfig
+
+%posttrans kugar
+update-desktop-database -q &> /dev/null ||:
+
+%post kexi -p /sbin/ldconfig
+
+%postun kexi -p /sbin/ldconfig
+
+%posttrans kexi
+update-desktop-database -q &> /dev/null ||:
+
+%post kchart -p /sbin/ldconfig
+
+%postun kchart -p /sbin/ldconfig
+
+%posttrans kchart
+update-desktop-database -q &> /dev/null ||:
 
 %post filters -p /sbin/ldconfig
 %postun filters -p /sbin/ldconfig 
@@ -748,6 +761,13 @@ xdg-desktop-menu forceupdate 2> /dev/nul
 
 
 %changelog
+* Wed Aug 26 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-24.20090306svn
+- -kformula: Requires: lyx-cmex10-fonts
+
+* Wed Jul 29 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-23.20090306svn
+- -kformula: use dejavu-lgc-sans-fonts
+- optimize scriptlets
+
 * Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> 2:1.6.3-22.20090306svn
 - -kformula: omit bundled fonts
 - koffice kword crash with formulas (#514217)


