rpms/koffice/F-13 .cvsignore, 1.39, 1.40 koffice.spec, 1.145, 1.146 sources, 1.39, 1.40 koffice-2.1.81-ascii_import_crash.patch, 1.1, NONE koffice-2.1.81-dsolinking.patch, 1.1, NONE koffice-2.1.81-krita_disable_painterlyframework.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Tue Apr 6 13:48:14 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/koffice/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6298
Modified Files:
.cvsignore koffice.spec sources
Removed Files:
koffice-2.1.81-ascii_import_crash.patch
koffice-2.1.81-dsolinking.patch
koffice-2.1.81-krita_disable_painterlyframework.patch
Log Message:
* Mon Apr 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.1.82-1
- koffice-2.1.82
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-13/.cvsignore,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- .cvsignore 23 Mar 2010 21:09:20 -0000 1.39
+++ .cvsignore 6 Apr 2010 13:48:13 -0000 1.40
@@ -1 +1 @@
-koffice-2.1.81.tar.bz2
+koffice-2.1.82.tar.bz2
Index: koffice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-13/koffice.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -p -r1.145 -r1.146
--- koffice.spec 2 Apr 2010 16:49:23 -0000 1.145
+++ koffice.spec 6 Apr 2010 13:48:13 -0000 1.146
@@ -1,10 +1,12 @@
+#define freoffice 1
%define kchart 1
%define kexi 1
%define kformula 1
#define kivio 1
%define kplato 1
#define kugar 1
+#define wv2
%if 0%{?fedora} > 10
%define external_lilypond_fonts 1
@@ -18,8 +20,8 @@
Name: koffice
Epoch: 3
-Version: 2.1.81
-Release: 7%{?dist}
+Version: 2.1.82
+Release: 1%{?dist}
Summary: An integrated office suite
Group: Applications/Productivity
@@ -29,15 +31,9 @@ URL: http://www.koffice.org/
Source0: http://download.kde.org/unstable/koffice-%{version}/koffice-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# workaround krita startup crasher, https://bugs.kde.org/224233
-Patch1: koffice-2.1.81-krita_disable_painterlyframework.patch
-
## upstreamable patches
-Patch50: koffice-2.1.81-dsolinking.patch
## upstream patches
-# http://bugs.kde.org/225448
-Patch100: koffice-2.1.81-ascii_import_crash.patch
#-- The following OPTIONAL packages could NOT be located on your system.
#-- Consider installing them to enable more features from this software.
@@ -152,6 +148,9 @@ Group: Applications/Productivit
Requires: lilypond-emmentaler-fonts
%endif
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+%if ! 0%{?freoffice}
+Obsoletes: koffice-freoffice < %{epoch}:%{version}-%{release}
+%endif
%if ! 0%{?kchart}
Obsoletes: koffice-kchart < %{epoch}:%{version}-%{release}
Obsoletes: koffice-kchart-libs < %{epoch}:%{version}-%{release}
@@ -189,11 +188,27 @@ Group: System Environment/Libra
%package devel
Summary: Libraries needed for koffice development
Group: Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: kdelibs4-devel
-
%description devel
-%{summary}
+%{summary}.
+
+%package kdchart
+Summary: Runtime libraries for kdchart
+Group: System Environment/Libraries
+# split happened here
+Conflicts: %{name}-libs < 3:2.1.81-8
+%description kdchart
+%{summary}.
+
+%package kdchart-devel
+Summary: Libraries needed for kdchart development
+Group: Development/Libraries
+Provides: kdchart-devel
+Requires: %{name}-kdchart%{?_isa} = %{epoch}:%{version}-%{release}
+Requires: qt4-devel
+%description kdchart-devel
+%{summary}.
%package freoffice
Summary: Simple Office file Viewer
@@ -209,7 +224,7 @@ Requires: %{name}-kword-libs%{?_is
# when -libs was introduced
Obsoletes: koffice-kword < 3:2.1.81-2
%description kword
-%{summary}
+%{summary}.
%package kword-libs
Summary: Runtime libraries for %{name}-kword
@@ -348,9 +363,10 @@ Obsoletes: koffice-kchart < 3:2.1.8
%{summary}
%package kchart-libs
-Summary: Runtime libraries for %{name}-kchart
-Group: System Environment/Libraries
-Requires: %{name}-kchart = %{epoch}:%{version}-%{release}
+Summary: Runtime libraries for %{name}-kchart
+Group: System Environment/Libraries
+Requires: %{name}-kchart = %{epoch}:%{version}-%{release}
+Requires: %{name}-kdchart%{?_isa} = %{epoch}:%{version}-%{release}
%description kchart-libs
%{summary}.
%endif
@@ -436,9 +452,15 @@ Requires: libxml2-devel
%prep
%setup -q
-%patch1 -p1 -b .krita_disable_painterlyframework
-%patch50 -p1 -b .dsolinking
-%patch100 -p2 -b .ascii_import_crash
+## kdchart munging begin
+pushd kchart/kdchart
+mv src kdchart
+sed -i.kdchart_fix -e 's|../src/||' kdchart/Ternary/KDChartTernaryAxis.cpp
+sed -i.kdchart_fix -e 's|add_subdirectory(src)|add_subdirectory(kdchart)|' CMakeLists.txt
+mv include include.kdchart_fix && cp -a include.kdchart_fix include/
+sed -i -e 's|../src|../kdchart|' include/*
+popd
+## kdchart munging end
%build
@@ -462,6 +484,18 @@ rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+## kdchart munging begin
+pushd kchart/kdchart
+mkdir -p %{buildroot}%{_includedir}/KDChart
+install -m644 -p include/* %{buildroot}%{_includedir}/KDChart/
+for inc_dir in kdchart kdchart/LeveyJennings kdchart/PrerenderedElements kdchart/Scenery kdchart/Ternary ; do
+mkdir -p %{buildroot}%{_includedir}/${inc_dir}
+install -m644 -p ${inc_dir}/*.h %{buildroot}%{_includedir}/${inc_dir}/
+rm -f %{buildroot}%{_includedir}/${inc_dir}/*_p.h
+done
+popd
+## kdchart munging end
+
## unpackaged files
# fonts
%if 0%{?external_lilypond_fonts}
@@ -482,7 +516,7 @@ rm -fv %{buildroot}%{_kde4_libdir}/libka
rm -fv %{buildroot}%{_kde4_libdir}/libkexi*.so
rm -fv %{buildroot}%{_kde4_libdir}/libkisexiv2.so
rm -fv %{buildroot}%{_kde4_libdir}/libkformulalib.so
-rm -fv %{buildroot}%{_kde4_libdir}/libko{chart,plugin,property,report,wmf}.so
+rm -fv %{buildroot}%{_kde4_libdir}/libko{chart,plugin,property,report,wmf,wv2}.so
rm -fv %{buildroot}%{_kde4_libdir}/libkplato*.so
rm -fv %{buildroot}%{_kde4_libdir}/libkword*.so
rm -fv %{buildroot}%{_kde4_libdir}/libkrita*.so
@@ -490,8 +524,6 @@ rm -fv %{buildroot}%{_kde4_libdir}/libkr
rm -fv %{buildroot}%{_kde4_libdir}/libkwmf.so
rm -fv %{buildroot}%{_kde4_libdir}/libmsooxml.so
rm -fv %{buildroot}%{_libdir}/libwv2.la
-# at least until we properly export api/headers
-rm -fv %{buildroot}%{_kde4_libdir}/libkdchart.so
%if ! 0%{?kchart}
rm -fv %{buildroot}%{_kde4_libdir}/libkchartcommon.so.*
@@ -519,9 +551,8 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4
%check
-## FIXME: fix validation errors
for desktop_file in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
-desktop-file-validate ${desktop_file} ||:
+desktop-file-validate ${desktop_file}
done
@@ -721,11 +752,13 @@ fi
%{_kde4_libdir}/kde4/pathshapes.so
%{_kde4_datadir}/kde4/services/pathshapes.desktop
+%if 0%{?freoffice}
%files freoffice
%defattr(-,root,root,-)
%{_kde4_bindir}/FreOffice
%{_kde4_datadir}/applications/hildon/FreOffice.desktop
%{_datadir}/dbus-1/services/com.nokia.FreOffice.service
+%endif
%files libs
%defattr(-,root,root,-)
@@ -735,7 +768,6 @@ fi
%exclude %{_kde4_libdir}/kde4/formulashape.*
%endif
%{_kde4_libdir}/libchartshapelib.so.*
-%{_kde4_libdir}/libkdchart.so.*
%{_kde4_libdir}/libkochart.so.*
%{_kde4_libdir}/libkokross.so.*
%{_kde4_libdir}/libkomain.so.*
@@ -747,6 +779,7 @@ fi
%{_kde4_libdir}/libkotext.so.*
%{_kde4_libdir}/libkowidgets.so.*
%{_kde4_libdir}/libkowmf.so.*
+%{_kde4_libdir}/libkowv2.so.4*
%{_kde4_libdir}/libkspreadcommon.so.*
%{_kde4_libdir}/libkwmf.so.*
%if 0%{?kformula}
@@ -772,6 +805,16 @@ fi
%{_kde4_libdir}/libkformdesigner.so
%{_kde4_includedir}/styles/
+%files kdchart
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkdchart.so.*
+
+%files kdchart-devel
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkdchart.so
+%{_includedir}/kdchart
+%{_includedir}/KDChart/
+
%files kspread
%defattr(-,root,root,-)
%{_kde4_bindir}/kspread
@@ -1008,7 +1051,7 @@ fi
%{_kde4_libdir}/kde4/libwmlexport.*
%{_kde4_libdir}/kde4/libwmlimport.*
%{_kde4_libdir}/kde4/libwpexport.*
-#{_kde4_libdir}/kde4/libwpgimport.*
+%{_kde4_libdir}/kde4/libwpgimport.*
%{_kde4_libdir}/kde4/libwpimport.*
%{_kde4_libdir}/kde4/libmswordodf_import.*
%{_kde4_libdir}/kde4/libxlsximport.*
@@ -1068,6 +1111,7 @@ fi
%defattr(-,root,root,-)
%{_kde4_libdir}/libkwordprivate.so.*
+%if 0%{?wv2}
%files -n wv2
%defattr(-,root,root,-)
%{_libdir}/libwv2.so.4*
@@ -1078,9 +1122,19 @@ fi
%{_libdir}/libwv2.so
%{_libdir}/wvWare/
%{_includedir}/wv2/
+%endif
%changelog
+* Mon Apr 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.1.82-1
+- koffice-2.1.82
+
+* Mon Apr 05 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.1.81-9
+- fix validation errors in krita_psd.desktop
+
+* Fri Apr 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.1.81-8
+- kdchart(-devel) subpkgs, until a standalone kdchart surfaces (#575170)
+
* Fri Apr 02 2010 Rex Dieter <rdieter at fedoraproject.org> - 3:2.1.81-7
- fix for multilib upgrades
- fixup Epoch references in %%changelog
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/koffice/F-13/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- sources 23 Mar 2010 21:09:21 -0000 1.39
+++ sources 6 Apr 2010 13:48:13 -0000 1.40
@@ -1 +1 @@
-d6a01209a5b47c7db947623c1a377e5d koffice-2.1.81.tar.bz2
+e15923791e8cf76cfa7c1dd8908b7e5c koffice-2.1.82.tar.bz2
--- koffice-2.1.81-ascii_import_crash.patch DELETED ---
--- koffice-2.1.81-dsolinking.patch DELETED ---
--- koffice-2.1.81-krita_disable_painterlyframework.patch DELETED ---
More information about the scm-commits
mailing list