rpms/koffice/F-7 koffice-1.6.3-nodisplay.patch, NONE, 1.1 koffice.spec, 1.56, 1.57
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Jun 21 20:05:13 UTC 2007
- Previous message (by thread): rpms/mailgraph/devel mailgraph-spampd.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mailgraph.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/em8300-kmod/FC-5 em8300-kmod.spec,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/koffice/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5985
Modified Files:
koffice.spec
Added Files:
koffice-1.6.3-nodisplay.patch
Log Message:
* 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)
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: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-7/koffice.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- koffice.spec 15 Jun 2007 17:40:52 -0000 1.56
+++ koffice.spec 21 Jun 2007 20:04:38 -0000 1.57
@@ -1,7 +1,7 @@
Name: koffice
Version: 1.6.3
-Release: 3%{?dist}
+Release: 6%{?dist}
Summary: A free, integrated office suite for KDE
Group: Applications/Productivity
@@ -12,6 +12,10 @@
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
@@ -47,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
@@ -235,6 +238,10 @@
%prep
%setup -q
+## see NoDisplay hack in %%install...
+#patch1 -p1 -b .nodisplay
+#make -f admin/Makefile.common
+
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -278,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?
@@ -679,6 +692,15 @@
%changelog
+* 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)
- Previous message (by thread): rpms/mailgraph/devel mailgraph-spampd.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mailgraph.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/em8300-kmod/FC-5 em8300-kmod.spec,1.18,1.19
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list