rpms/koffice/F-13 koffice.spec,1.146,1.147

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/koffice/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22146

Modified Files:
	koffice.spec 
Log Message:
* Wed Apr 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.1.82-3
- enable libQtGTL support

* Wed Apr 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.1.82-2
- -kdchart(-devel): License: GPLv2 or GPLv3



Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-13/koffice.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -p -r1.146 -r1.147
--- koffice.spec	6 Apr 2010 13:48:13 -0000	1.146
+++ koffice.spec	14 Apr 2010 16:57:53 -0000	1.147
@@ -14,14 +14,14 @@
 
 %if 0%{?fedora} > 11
 %ifnarch ppc64 ppc
-%define OpenGTL 1
+%define GTL 1
 %endif
 %endif
 
 Name:           koffice
 Epoch:          3 
 Version:        2.1.82
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        An integrated office suite
 
 Group:          Applications/Productivity
@@ -90,8 +90,8 @@ BuildRequires: freetds-devel
 BuildRequires: libpqxx-devel >= 1:3.0
 BuildRequires: mysql-devel
 %endif
-%if 0%{?OpenGTL}
-BuildRequires: OpenGTL-devel
+%if 0%{?GTL}
+BuildRequires: OpenGTL-devel libQtGTL-devel
 %endif
 BuildRequires: OpenEXR-devel
 BuildRequires: openjpeg-devel
@@ -196,6 +196,7 @@ Requires:       kdelibs4-devel
 %package kdchart
 Summary:	Runtime libraries for kdchart
 Group:		System Environment/Libraries
+License:        GPLv2 or GPLv3
 # split happened here
 Conflicts:      %{name}-libs < 3:2.1.81-8
 %description kdchart
@@ -204,6 +205,7 @@ Conflicts:      %{name}-libs < 3:2.1.81-
 %package kdchart-devel
 Summary:        Libraries needed for kdchart development
 Group:          Development/Libraries
+License:        GPLv2 or GPLv3
 Provides:       kdchart-devel
 Requires:       %{name}-kdchart%{?_isa} = %{epoch}:%{version}-%{release}
 Requires:       qt4-devel
@@ -745,7 +747,7 @@ fi
 %dir %{_datadir}/color/
 %dir %{_datadir}/color/icc/
 %{_datadir}/color/icc/pigment/
-%if 0%{?OpenGTL}
+%if 0%{?GTL}
 %{_kde4_appsdir}/pigmentcms/
 %endif
 %{_kde4_datadir}/kde4/servicetypes/pigment*.desktop
@@ -1126,6 +1128,12 @@ fi
 
 
 %changelog
+* Wed Apr 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.1.82-3
+- enable libQtGTL support
+
+* Wed Apr 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.1.82-2
+- -kdchart(-devel): License: GPLv2 or GPLv3
+
 * Mon Apr 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.1.82-1
 - koffice-2.1.82