rpms/koffice/devel koffice.spec,1.61,1.62

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	koffice.spec 
Log Message:
* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
1.6.3-8
- License: GPLv2+



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- koffice.spec	23 Jun 2007 18:44:45 -0000	1.61
+++ koffice.spec	12 Aug 2007 03:18:18 -0000	1.62
@@ -1,21 +1,18 @@
 
 Name:           koffice
 Version:        1.6.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
-License:        GPL/LGPL
+# apps GPLv2+, libs LGPLv2+
+License:        GPLv2+
 URL:            http://www.koffice.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 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 +235,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 +278,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,25 +687,29 @@
 
 
 %changelog
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.3-8
+- License: GPLv2+
+
 * Sat Jun 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
-1.6.2-7
+1.6.3-7
 - -devel: %%exclude %%_libdir/libkudesignercore.so (#245333)
 
 * Thu Jun 21 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
-1.6.2-6
+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.2-5
+1.6.3-5
 - mark applnk/.hidden/*.desktop NoDisplay=True instead (#245061)
 
 * Fri Jun 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
-1.6.2-3
+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.2-2
+1.6.3-2
 - Require version of kdelibs used to build against (#244091)
 - -suite: use versioned Requires