rpms/koffice/FC-6 .cvsignore, 1.14, 1.15 koffice.spec, 1.46, 1.47 sources, 1.14, 1.15
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Sun Mar 4 23:31:27 UTC 2007
Author: rdieter
Update of /cvs/extras/rpms/koffice/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27849
Modified Files:
.cvsignore koffice.spec sources
Log Message:
* Mon Feb 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
1.6.2-3
- kexi_export patch
- kdchart_export patch (#222965)
* Fri Feb 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
1.6.2-1
- koffice-1.6.2
- -krita: +Requires: koffice-filters (#228204)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 1 Dec 2006 22:07:48 -0000 1.14
+++ .cvsignore 4 Mar 2007 23:30:55 -0000 1.15
@@ -1,3 +1,4 @@
koffice-1.6.0.tar.bz2
koffice-1.6.1.tar.bz2
koshell.png
+koffice-1.6.2.tar.bz2
Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-6/koffice.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- koffice.spec 15 Dec 2006 13:36:39 -0000 1.46
+++ koffice.spec 4 Mar 2007 23:30:55 -0000 1.47
@@ -1,7 +1,7 @@
Name: koffice
-Version: 1.6.1
-Release: 4%{?dist}
+Version: 1.6.2
+Release: 3%{?dist}
Summary: A free, integrated office suite for KDE
Group: Applications/Productivity
@@ -10,6 +10,9 @@
Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-%{version}/src/koffice-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1: koffice-1.6.2-kexi_export.patch
+Patch2: koffice-1.6.2-kdchart_export.patch
+
Source100: koshell.png
# BuildRequires: world-devel ;)
@@ -23,9 +26,7 @@
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel
-%if 0%{?fedora} > 4 || 0%{?rhel} > 3
BuildRequires: GraphicsMagick-devel
-%endif
BuildRequires: ImageMagick-devel
BuildRequires: bzip2-devel
BuildRequires: zlib-devel
@@ -51,11 +52,11 @@
%define ruby 1
BuildRequires: ruby ruby-devel >= 1.8.2
%endif
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+%if 0%{?fedora} > 4 || 0%{?rhel} > 3
BuildRequires: poppler-qt-devel
-BuildRequires: libpaper-devel
%endif
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+BuildRequires: libpaper-devel
BuildRequires: libXi-devel
%endif
@@ -159,6 +160,7 @@
Summary: A pixel-based image manipulation program
Group: Applications/Productivity
Requires: %{name}-core = %{version}-%{release}
+Requires: %{name}-filters
%description krita
%{summary}
@@ -233,6 +235,9 @@
%prep
%setup -q
+%patch1 -p1 -b .kexi_export
+%patch2 -p1 -b .kdchart_export
+
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -277,7 +282,10 @@
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applnk/Office/*.desktop
-rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
+## Unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+# shouldn't these be in koffice-l10n?
+rm -f $RPM_BUILD_ROOT%{_datadir}/locale/pl/LC_MESSAGES/kexi_{add,delete}_column_gui_transl_pl.sh
%clean
@@ -533,7 +541,7 @@
%files kexi
%defattr(-,root,root,-)
-%{_bindir}/kexi
+%{_bindir}/kexi*
%{_bindir}/ksqlite*
%{_bindir}/krossrunner
%{_libdir}/libkdeinit_kexi.so
@@ -556,6 +564,8 @@
%{_datadir}/doc/HTML/en/kexi/
%{_datadir}/applications/kde/*kexi.desktop
%{_datadir}/services/kexidb_sqlite*driver.desktop
+# shouldn't this be in koffice-l10n?
+#%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/kexi*
%files kexi-driver-mysql
%defattr(-,root,root,-)
@@ -673,18 +683,28 @@
%changelog
-* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net>
-1.6.2-4
+* Mon Feb 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.2-3
+- kexi_export patch
+- kdchart_export patch (#222965)
+
+* Fri Feb 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.2-1
+- koffice-1.6.2
+- -krita: +Requires: koffice-filters (#228204)
+
+* Mon Dec 11 2006 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.1-4
- -devel: +%%defattr
- -libs: (new) subpkg, multilib issues
- BR: +libpaper-devel -graphviz-devel
-* Sun Dec 10 2006 Rex Dieter <rexdieter[AT]users.sf.net>
-1.6.2-3
+* Sun Dec 10 2006 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.1-3
- -devel %%files: +%%exclude %%_libdir/libkdeinit_*.so
-* Sat Dec 09 2006 Rex Dieter <rexdieter[AT]users.sf.net>
-1.6.2-2
+* Sat Dec 09 2006 Rex Dieter <rdieter[AT]fedoraproject.org>
+1.6.1-2
- BR: poppler-qt-devel (#158941,#212145)
* Fri Dec 01 2006 Rex Dieter <rexdieter[AT]users.sf.net>
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 1 Dec 2006 22:07:48 -0000 1.14
+++ sources 4 Mar 2007 23:30:55 -0000 1.15
@@ -1,2 +1,2 @@
03382edf62db9913b57ad8760c7d5f52 koshell.png
-f7b90b46b79019edc60761a6bff2d387 koffice-1.6.1.tar.bz2
+74ef62a5f8f766fe8192d5b7d65a3928 koffice-1.6.2.tar.bz2
More information about the fedora-extras-commits
mailing list