rpms/koffice/devel koffice.spec,1.59,1.60

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18183

Modified Files:
	koffice.spec 
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)



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- koffice.spec	21 Jun 2007 00:58:45 -0000	1.59
+++ koffice.spec	21 Jun 2007 15:56:03 -0000	1.60
@@ -1,7 +1,7 @@
 
 Name:           koffice
 Version:        1.6.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -12,9 +12,9 @@
 
 Source100:      koshell.png
 
-# http://bugzilla.redhat.com/245061
+## http://bugzilla.redhat.com/245061
 Patch1: koffice-1.6.3-nodisplay.patch
-BuildRequires:  automake libtool
+#BuildRequires:  automake libtool
 
 # BuildRequires: world-devel ;)
 BuildRequires:  kdebase-devel
@@ -51,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
@@ -239,8 +238,9 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .nodisplay
-make -f admin/Makefile.common
+## see NoDisplay hack in %%install... 
+#patch1 -p1 -b .nodisplay
+#make -f admin/Makefile.common
 
 
 %build
@@ -285,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? 
@@ -519,7 +525,7 @@
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
 %{_datadir}/applications/kde/*krita*.desktop
-#{_datadir}/applnk/.hidden/*krita*.desktop
+%{_datadir}/applnk/.hidden/*krita*.desktop
 %{_datadir}/apps/kritaplugins/
 %{_datadir}/doc/HTML/en/krita/
 
@@ -686,6 +692,11 @@
 
 
 %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)