rpms/koffice/FC-6 koffice-1.6.3-nodisplay.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 koffice.spec, 1.48, 1.49 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

Mon Jul 2 10:43:08 UTC 2007

Author: rdieter

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

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-1.6.3-nodisplay.patch 
Removed Files:
	koffice-1.6.2-kdchart_export.patch 
	koffice-1.6.2-kexi_export.patch 
Log Message:
* Fri Jun 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
1.6.3-1
- koffice-1.6.3


koffice-1.6.3-nodisplay.patch:

--- NEW FILE koffice-1.6.3-nodisplay.patch ---
--- koffice-1.6.3/filters/krita/raw/Makefile.am.nodisplay	2007-05-30 16:39:40.000000000 -0500
+++ koffice-1.6.3/filters/krita/raw/Makefile.am	2007-06-20 19:39:19.000000000 -0500
@@ -21,8 +21,7 @@ libkrita_raw_import_la_LIBADD = \
 service_DATA = krita_raw_import.desktop
 servicedir = $(kde_servicesdir)
 
-kdelnk_DATA = krita_raw.desktop
-kdelnkdir = $(kde_appsdir)/.hidden
+xdg_apps_DATA = krita_raw.desktop
 
 libkrita_raw_import_la_SOURCES = kis_raw_import.cpp wdgrawimport.ui
 
--- koffice-1.6.3/filters/krita/raw/krita_raw.desktop.nodisplay	2007-05-30 16:39:40.000000000 -0500
+++ koffice-1.6.3/filters/krita/raw/krita_raw.desktop	2007-06-20 19:39:27.000000000 -0500
@@ -54,3 +54,4 @@ Icon=krita
 Categories=
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
+NoDisplay=True
--- koffice-1.6.3/filters/krita/png/Makefile.am.nodisplay	2007-05-30 16:39:37.000000000 -0500
+++ koffice-1.6.3/filters/krita/png/Makefile.am	2007-06-20 19:37:50.000000000 -0500
@@ -28,8 +28,7 @@ INCLUDES= \
 service_DATA = krita_png_import.desktop krita_png_export.desktop
 servicedir = $(kde_servicesdir)
 
-kdelnk_DATA = krita_png.desktop
-kdelnkdir = $(kde_appsdir)/.hidden
+xdg_apps_DATA = krita_png.desktop
 
 libkritapngimport_la_SOURCES = kis_png_import.cc kis_png_converter.cc
 libkritapngexport_la_SOURCES = kis_wdg_options_png.ui kis_png_export.cc kis_png_converter.cc
--- koffice-1.6.3/filters/krita/png/krita_png.desktop.nodisplay	2007-05-30 16:39:37.000000000 -0500
+++ koffice-1.6.3/filters/krita/png/krita_png.desktop	2007-06-20 19:36:55.000000000 -0500
@@ -54,3 +54,4 @@ Icon=krita
 Categories=
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
+NoDisplay=True
--- koffice-1.6.3/filters/krita/tiff/Makefile.am.nodisplay	2007-05-30 16:39:39.000000000 -0500
+++ koffice-1.6.3/filters/krita/tiff/Makefile.am	2007-06-20 19:40:08.000000000 -0500
@@ -27,7 +27,6 @@ INCLUDES= \
 servicedir = $(kde_servicesdir)
 
 
-kdelnkdir = $(kde_appsdir)/.hidden
 
 
 
@@ -40,7 +39,7 @@ libkritatiffimport_la_SOURCES = kis_tiff
 libkritatiffexport_la_SOURCES = kis_tiff_export.cc kis_wdg_options_tiff.ui \
 	kis_dlg_options_tiff.cpp
 service_DATA = krita_tiff_export.desktop krita_tiff_import.desktop
-kdelnk_DATA = krita_tiff.desktop
+xdg_apps_DATA = krita_tiff.desktop
 noinst_HEADERS = kis_dlg_options_tiff.h kis_tiff_writer_visitor.h \
 	kis_tiff_ycbcr_reader.h
 libkritatiffconverter_la_LDFLAGS = -no-undefined $(all_libraries)
--- koffice-1.6.3/filters/krita/tiff/krita_tiff.desktop.nodisplay	2007-05-30 16:39:39.000000000 -0500
+++ koffice-1.6.3/filters/krita/tiff/krita_tiff.desktop	2007-06-20 19:39:54.000000000 -0500
@@ -60,3 +60,4 @@ X-DCOP-ServiceType=multi
 X-KDE-StartupNotify=true
 X-KDE-SubstituteUID=false
 X-KDE-Username=
+NoDisplay=True
--- koffice-1.6.3/filters/krita/jpeg/Makefile.am.nodisplay	2007-05-30 16:39:38.000000000 -0500
+++ koffice-1.6.3/filters/krita/jpeg/Makefile.am	2007-06-20 19:33:44.000000000 -0500
@@ -32,8 +32,7 @@ INCLUDES= \
 service_DATA = krita_jpeg_import.desktop krita_jpeg_export.desktop
 servicedir = $(kde_servicesdir)
 
-kdelnk_DATA = krita_jpeg.desktop
-kdelnkdir = $(kde_appsdir)/.hidden
+xdg_apps_DATA = krita_jpeg.desktop
 
 libkritajpegimport_la_SOURCES = kis_jpeg_import.cc
 libkritajpegexport_la_SOURCES = kis_wdg_options_jpeg.ui kis_jpeg_export.cc
--- koffice-1.6.3/filters/krita/jpeg/krita_jpeg.desktop.nodisplay	2007-05-30 16:39:38.000000000 -0500
+++ koffice-1.6.3/filters/krita/jpeg/krita_jpeg.desktop	2007-06-20 19:33:31.000000000 -0500
@@ -54,3 +54,4 @@ X-DCOP-ServiceType=multi
 X-KDE-StartupNotify=true
 X-KDE-SubstituteUID=false
 X-KDE-Username=
+NoDisplay=True
--- koffice-1.6.3/filters/krita/gmagick/Makefile.am.nodisplay	2007-05-30 16:39:37.000000000 -0500
+++ koffice-1.6.3/filters/krita/gmagick/Makefile.am	2007-06-20 19:32:45.000000000 -0500
@@ -28,8 +28,7 @@ INCLUDES= \
 service_DATA = krita_magick_import.desktop krita_magick_export.desktop
 servicedir = $(kde_servicesdir)
 
-kdelnk_DATA = krita_magick.desktop
-kdelnkdir = $(kde_appsdir)/.hidden
+xdg_apps_DATA = krita_magick.desktop
 
 libkritagmagickimport_la_SOURCES = magickimport.cpp kis_image_magick_converter.cc
 libkritagmagickexport_la_SOURCES = magickexport.cpp kis_image_magick_converter.cc
--- koffice-1.6.3/filters/krita/gmagick/krita_magick.desktop.nodisplay	2007-05-30 16:39:37.000000000 -0500
+++ koffice-1.6.3/filters/krita/gmagick/krita_magick.desktop	2007-06-20 19:31:28.000000000 -0500
@@ -54,3 +54,4 @@ Icon=krita
 Categories=
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
+NoDisplay=True
--- koffice-1.6.3/filters/krita/pdf/Makefile.am.nodisplay	2007-05-30 16:39:39.000000000 -0500
+++ koffice-1.6.3/filters/krita/pdf/Makefile.am	2007-06-20 19:36:05.000000000 -0500
@@ -13,8 +13,6 @@ INCLUDES = \
 
 servicedir = $(kde_servicesdir)
 
-kdelnkdir = $(kde_appsdir)/.hidden
-
 METASOURCES = AUTO
 kde_module_LTLIBRARIES = libkritapdfimport.la
 libkritapdfimport_la_LDFLAGS = -avoid-version -module -no-undefined  $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries)
@@ -25,4 +23,4 @@ noinst_HEADERS = kis_pdf_import.h kis_pd
 libkritapdfimport_la_SOURCES = kis_pdf_import.cpp pdfimportwidgetbase.ui \
 	kis_pdf_import_widget.cpp
 kde_services_DATA = krita_pdf_import.desktop
-kdelnk_DATA = krita_pdf.desktop
+xdg_apps_DATA = krita_pdf.desktop
--- koffice-1.6.3/filters/krita/pdf/krita_pdf.desktop.nodisplay	2007-05-30 16:39:39.000000000 -0500
+++ koffice-1.6.3/filters/krita/pdf/krita_pdf.desktop	2007-06-20 19:36:25.000000000 -0500
@@ -60,3 +60,4 @@ X-DCOP-ServiceType=multi
 X-KDE-StartupNotify=true
 X-KDE-SubstituteUID=false
 X-KDE-Username=
+NoDisplay=True
--- koffice-1.6.3/filters/krita/openexr/Makefile.am.nodisplay	2007-05-30 16:39:35.000000000 -0500
+++ koffice-1.6.3/filters/krita/openexr/Makefile.am	2007-06-20 19:35:19.000000000 -0500
@@ -36,8 +36,7 @@ libkrita_openexr_import_la_LIBADD = \
 service_DATA = krita_openexr_import.desktop krita_openexr_export.desktop
 servicedir = $(kde_servicesdir)
 
-kdelnk_DATA = krita_openexr.desktop
-kdelnkdir = $(kde_appsdir)/.hidden
+xdg_apps_DATA = krita_openexr.desktop
 
 libkrita_openexr_import_la_SOURCES = kis_openexr_import.cpp
 libkrita_openexr_export_la_SOURCES = kis_openexr_export.cpp
--- koffice-1.6.3/filters/krita/openexr/krita_openexr.desktop.nodisplay	2007-05-30 16:39:35.000000000 -0500
+++ koffice-1.6.3/filters/krita/openexr/krita_openexr.desktop	2007-06-20 19:35:09.000000000 -0500
@@ -54,3 +54,4 @@ Icon=krita
 Categories=
 X-KDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
+NoDisplay=True


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/FC-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	4 Mar 2007 23:30:55 -0000	1.15
+++ .cvsignore	2 Jul 2007 10:42:32 -0000	1.16
@@ -2,3 +2,4 @@
 koffice-1.6.1.tar.bz2
 koshell.png
 koffice-1.6.2.tar.bz2
+koffice-1.6.3.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/FC-6/koffice.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- koffice.spec	4 Mar 2007 23:45:31 -0000	1.48
+++ koffice.spec	2 Jul 2007 10:42:32 -0000	1.49
@@ -1,7 +1,7 @@
 
 Name:           koffice
-Version:        1.6.2
-Release:        3%{?dist}.1
+Version:        1.6.3
+Release:        1%{?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/
@@ -432,6 +441,7 @@
 %{_includedir}/*
 %{_datadir}/doc/HTML/en/koffice-apidocs/
 %{_libdir}/lib*.so
+%exclude %{_libdir}/libkudesignercore.so
 %exclude %{_libdir}/libkdeinit_*.so
 
 %files kword
@@ -683,6 +693,10 @@
 
 
 %changelog
+* 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
 - kexi_export patch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/FC-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	4 Mar 2007 23:30:55 -0000	1.15
+++ sources	2 Jul 2007 10:42:32 -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 ---


