rpms/koffice/FC-5 koffice.spec, 1.46, 1.47 sources, 1.15, 1.16 koffice-1.6.2-kdchart_export.patch, 1.1, NONE koffice-1.6.2-kexi_export.patch, 1.1, NONE

Fri Jun 22 00:19:11 UTC 2007

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6475

Modified Files:
	koffice.spec sources 
Removed Files:
	koffice-1.6.2-kdchart_export.patch 
	koffice-1.6.2-kexi_export.patch 
Log Message:
koffice-1.6.3, sync w/devel branch



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/FC-5/koffice.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47

--- koffice.spec	25 Apr 2007 11:59:29 -0000	1.46
+++ koffice.spec	22 Jun 2007 00:18:36 -0000	1.47
@@ -1,7 +1,7 @@
 
 Name:           koffice
-Version:        1.6.2
-Release:        3%{?dist}.1
+Version:        1.6.3
+Release:        6%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -10,14 +10,17 @@
 Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1:         koffice-1.6.2-kexi_export.patch
-Patch2:         koffice-1.6.2-kdchart_export.patch
-
 Source100:      koshell.png
 
+## http://bugzilla.redhat.com/245061
+Patch1: koffice-1.6.3-nodisplay.patch
+#BuildRequires:  automake libtool
+
 # BuildRequires: world-devel ;)
 BuildRequires:  kdebase-devel
 BuildRequires:  kdelibs-devel
+# See http://bugzilla.redhat.com/244091
+%global kdelibs_ver %((kde-config --version 2>/dev/null || echo KDE 3.5.6) | grep '^KDE' | cut -d' ' -f2 | cut -d'-' -f1)
 ## kjsembed bits, afaict, not really used (yet) -- Rex
 #BuildRequires:  kdebindings-devel
 BuildRequires:  freetype-devel
@@ -48,13 +51,12 @@
 BuildRequires:  libexif-devel
 BuildRequires:  libGL-devel libGLU-devel
 BuildRequires:  readline-devel
-%if 0%{?fedora} > 2  || 0%{?rhel} > 4
+# rawhide/ruby is busted atm -- Rex
+%if 0%{?fedora} != 8 || 0%{?rhel} > 4
 %define ruby 1
 BuildRequires:  ruby ruby-devel >= 1.8.2
 %endif
-%if 0%{?fedora} > 4 || 0%{?rhel} > 3
 BuildRequires:  poppler-qt-devel
-%endif
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires:  libpaper-devel
 BuildRequires:  libXi-devel
@@ -69,21 +71,21 @@
 Group:          Applications/Productivity
 Obsoletes:      koffice <= 4:%{version}-%{release}
 Obsoletes:      koffice-i18n < 4:%{version}
-Requires:       koffice-core
-Requires:       koffice-kword
-Requires:       koffice-kspread
-Requires:       koffice-kpresenter
-Requires:       koffice-kivio
-Requires:       koffice-karbon
-Requires:       koffice-krita
-Requires:       koffice-kugar
-Requires:       koffice-kexi
-Requires:       koffice-kexi-driver-mysql
-Requires:       koffice-kexi-driver-pgsql
-Requires:       koffice-kchart
-Requires:       koffice-kformula
-Requires:       koffice-filters
-Requires:       koffice-kplato
+Requires:       koffice-core = %{version}-%{release} 
+Requires:       koffice-kword = %{version}-%{release} 
+Requires:       koffice-kspread = %{version}-%{release} 
+Requires:       koffice-kpresenter = %{version}-%{release}
+Requires:       koffice-kivio = %{version}-%{release}
+Requires:       koffice-karbon = %{version}-%{release}
+Requires:       koffice-krita = %{version}-%{release}
+Requires:       koffice-kugar = %{version}-%{release}
+Requires:       koffice-kexi = %{version}-%{release}
+Requires:       koffice-kexi-driver-mysql = %{version}-%{release}
+Requires:       koffice-kexi-driver-pgsql = %{version}-%{release}
+Requires:       koffice-kchart = %{version}-%{release}
+Requires:       koffice-kformula = %{version}-%{release}
+Requires:       koffice-filters = %{version}-%{release}
+Requires:       koffice-kplato = %{version}-%{release}
 
 %description suite
 KOffice - Integrated Office Suite
@@ -103,6 +105,7 @@
 Summary:        Runtime libraries for koffice
 Group:          System Environment/Libraries
 Conflicts:      koffice <= 4:%{version}-%{release}
+Requires:       kdelibs >= 6:%{kdelibs_ver}
 %description libs
 %{summary}.
 
@@ -235,8 +238,9 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .kexi_export
-%patch2 -p1 -b .kdchart_export
+## see NoDisplay hack in %%install... 
+#patch1 -p1 -b .nodisplay
+#make -f admin/Makefile.common
 
 
 %build
@@ -244,7 +248,6 @@
 
 %configure \
   --disable-rpath --disable-dependency-tracking \
-  --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --with-pic --enable-shared --disable-static \
@@ -282,6 +285,12 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Office/*.desktop
 
+## Hack-in NoDisplay=True, until http://bugzilla.redhat.com/245190 is fixed
+for desktop_file in $RPM_BUILD_ROOT%{_datadir}/applnk/.hidden/*.desktop ; do
+  grep "^NoDisplay=" ${desktop_file} || \
+    echo "NoDisplay=True" >> ${desktop_file}
+done
+
 ## Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 # shouldn't these be in koffice-l10n? 
@@ -312,7 +321,6 @@
 gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
 update-desktop-database >& /dev/null ||:
 
-
 %post kword -p /sbin/ldconfig
 %postun kword -p /sbin/ldconfig
 
@@ -401,6 +409,7 @@
 %{_datadir}/servicetypes/koplugin.desktop
 %{_datadir}/servicetypes/kwmailmerge.desktop
 %{_datadir}/servicetypes/widgetfactory.desktop
+%{_datadir}/applications/kde/*koffice.desktop
 %{_datadir}/applications/kde/*KThesaurus.desktop
 %{_datadir}/applications/kde/*koshell.desktop
 %{_datadir}/apps/kofficewidgets/
@@ -683,9 +692,27 @@
 
 
 %changelog
-* Wed Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
-1.6.2-3.1
-- FC-5: +BR: poppler-qt-devel (#158941,#212145)
+* Thu Jun 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.2-6
+- use simpler NoDisplay=True hack (workaround #245190)
+- disable (kross)ruby on rawhide (for now)
+
+* Wed Jun 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.2-5
+- mark applnk/.hidden/*.desktop NoDisplay=True instead (#245061)
+
+* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.2-3
+- (really) require version of kdelibs used to build against (#244091)
+
+* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.2-2
+- Require version of kdelibs used to build against (#244091)
+- -suite: use versioned Requires
+
+* Fri Jun 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.3-1
+- koffice-1.6.3
 
 * Mon Feb 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
 1.6.2-3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	5 Mar 2007 13:08:09 -0000	1.15
+++ sources	22 Jun 2007 00:18:36 -0000	1.16
@@ -1,2 +1,2 @@
 03382edf62db9913b57ad8760c7d5f52  koshell.png
-74ef62a5f8f766fe8192d5b7d65a3928  koffice-1.6.2.tar.bz2
+386d388094734f9759977c3267098e30  koffice-1.6.3.tar.bz2


--- koffice-1.6.2-kdchart_export.patch DELETED ---


--- koffice-1.6.2-kexi_export.patch DELETED ---


