rpms/koffice/FC-6 koffice.spec,1.49,1.50

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	koffice.spec 
Log Message:
sync w/devel branch



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/FC-6/koffice.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- koffice.spec	2 Jul 2007 10:42:32 -0000	1.49
+++ koffice.spec	9 Jul 2007 11:57:12 -0000	1.50
@@ -1,7 +1,7 @@
 
 Name:           koffice
 Version:        1.6.3
-Release:        1%{?dist}
+Release:        7%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -12,10 +12,6 @@
 
 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
@@ -238,10 +234,6 @@
 %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
@@ -285,7 +277,8 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Office/*.desktop
 
-## Hack-in NoDisplay=True, until http://bugzilla.redhat.com/245190 is fixed
+## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
+## 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}
@@ -693,6 +686,28 @@
 
 
 %changelog
+* Sat Jun 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.3-7
+- -devel: %%exclude %%_libdir/libkudesignercore.so (#245333)
+
+* Thu Jun 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.3-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.3-5
+- mark applnk/.hidden/*.desktop NoDisplay=True instead (#245061)
+
+* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.3-3
+- (really) require version of kdelibs used to build against (#244091)
+
+* Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.3-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