rpms/koffice/devel koffice.spec,1.136,1.137
Rex Dieter
rdieter at fedoraproject.org
Wed Jan 27 12:13:36 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/koffice/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31347
Modified Files:
koffice.spec
Log Message:
* Wed Jan 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 2:2.1.1-4
- BR: OpenGTL-devel (f12+)
- -krita: add scriptlets
Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- koffice.spec 21 Jan 2010 14:31:23 -0000 1.136
+++ koffice.spec 27 Jan 2010 12:13:36 -0000 1.137
@@ -9,10 +9,14 @@
%define external_lilypond_fonts 1
%endif
+%if 0%{?fedora} > 11
+%define OpenGTL 1
+%endif
+
Name: koffice
Epoch: 3
Version: 2.1.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: An integrated office suite
Group: Applications/Productivity
@@ -24,7 +28,6 @@ BuildRoot: %{_tmppath}/%{name}-%{ve
#-- The following OPTIONAL packages could NOT be located on your system.
#-- Consider installing them to enable more features from this software.
-#+ OpenCTL, 0.9.2 or higher: OpenCTL is needed for some color spaces (High Dynamic Range Color Spaces, YCbCr and LMS) <http://www.openctl.org>
#+ Spnav: Spnav is the library which is required by the space navigator device plugin <http://spacenav.sourceforge.net/>
BuildRequires: boost-devel
@@ -57,8 +60,9 @@ BuildRequires: libxslt-devel
BuildRequires: mysql-devel
BuildRequires: libpqxx-devel
%endif
-## when OpenCTL/OpenGTL is ready
-#BuildRequires: OpenGTL-devel
+%if 0%{?OpenGTL}
+BuildRequires: OpenGTL-devel
+%endif
BuildRequires: OpenEXR-devel
BuildRequires: perl
BuildRequires: phonon-devel
@@ -398,6 +402,14 @@ update-desktop-database -q &> /dev/null
/sbin/ldconfig
update-desktop-database -q &> /dev/null ||:
+%post krita
+update-desktop-database -q &> /dev/null ||:
+update-mime-database %{_kde4_datadir}/mime &> /dev/null ||:
+
+%postun krita
+update-desktop-database -q &> /dev/null ||:
+update-mime-database %{_kde4_datadir}/mime &> /dev/null ||:
+
%post kugar
/sbin/ldconfig
update-desktop-database -q &> /dev/null ||:
@@ -495,8 +507,9 @@ update-desktop-database -q &> /dev/null
%dir %{_datadir}/color/
%dir %{_datadir}/color/icc/
%{_datadir}/color/icc/pigment/
-## when OpenGTL support is enabled
-#{_kde4_appsdir}/pigmentcms/
+%if 0%{?OpenGTL}
+%{_kde4_appsdir}/pigmentcms/
+%endif
%{_kde4_datadir}/kde4/servicetypes/pigment*.desktop
%{_kde4_libdir}/kde4/pathshapes.so
%{_kde4_datadir}/kde4/services/pathshapes.desktop
@@ -630,8 +643,7 @@ update-desktop-database -q &> /dev/null
%{_kde4_datadir}/kde4/services/krita*.desktop
%{_kde4_datadir}/kde4/servicetypes/krita*.desktop
%{_kde4_datadir}/applications/kde4/*krita*.desktop
-# FIXME: add scriptlet
-%{_datadir}/mime/packages/krita_ora.xml
+%{_kde4_datadir}/mime/packages/krita_ora.xml
%{_kde4_appsdir}/kritaplugins/
%{_datadir}/color/icc/krita/
%{_kde4_datadir}/kde4/services/ServiceMenus/krita_konqi.desktop
@@ -807,6 +819,10 @@ update-desktop-database -q &> /dev/null
%changelog
+* Wed Jan 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 2:2.1.1-4
+- BR: OpenGTL-devel (f12+)
+- -krita: add scriptlets
+
* Thu Jan 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 2:2.1.1-3
- -kformula: Requires: lyx-fonts
More information about the scm-commits
mailing list