rpms/koffice/FC-5 koffice-forms-plugins.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 koffice.spec, 1.36, 1.37 sources, 1.10, 1.11 koffice-filters-krita-tiff.patch, 1.1, NONE koffice-kexi-version.patch, 1.1, NONE
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Tue May 30 07:27:37 UTC 2006
- Previous message (by thread): rpms/koffice/FC-4 .cvsignore, 1.7, 1.8 koffice.spec, 1.13, 1.14 sources, 1.7, 1.8
- Next message (by thread): rpms/koffice/devel koffice-forms-plugins.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 koffice.spec, 1.35, 1.36 sources, 1.10, 1.11 koffice-kexi-version.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/extras/rpms/koffice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30044/FC-5
Modified Files:
.cvsignore koffice.spec sources
Added Files:
koffice-forms-plugins.patch
Removed Files:
koffice-filters-krita-tiff.patch koffice-kexi-version.patch
Log Message:
- fix #191388
- add kexi forms patch
- version upgrade
- exclude x-raw.desktop again
koffice-forms-plugins.patch:
--- NEW FILE koffice-forms-plugins.patch ---
Index: plugins/forms/Makefile.am
===================================================================
--- plugins/forms/Makefile.am (wersja 541836)
+++ plugins/forms/Makefile.am (kopia robocza)
@@ -23,9 +23,10 @@
kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \
kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \
kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp
-libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
+libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \
$(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner
Index: plugins/reports/Makefile.am
===================================================================
--- plugins/reports/Makefile.am (wersja 541836)
+++ plugins/reports/Makefile.am (kopia robocza)
@@ -5,24 +5,29 @@
kexihandler_report_la_SOURCES = kexireports.cpp
kexihandler_report_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined
kexihandler_report_la_LIBADD = ../../core/libkexicore.la \
- ../../widget/utils/libkexiguiutils.la \
- ../../widget/libkexiextendedwidgets.la \
- ../../formeditor/libkformdesigner.la \
- ../forms/libkexiformutils.la \
+ $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \
+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \
+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
./libkexireportutils.la
kexireportwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module
kexireportwidgets_la_SOURCES = reportwidgets.cpp kexireportfactory.cpp
kexireportwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \
+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la \
+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
+ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
./libkexireportutils.la
lib_LTLIBRARIES = libkexireportutils.la
libkexireportutils_la_SOURCES = \
kexireportpart.cpp kexireportview.cpp kexireportform.cpp
-libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -Wnounresolved
+libkexireportutils_la_LDFLAGS = $(all_libraries) $(VER_INFO)
libkexireportutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \
+ $(top_builddir)/kexi/formeditor/libkformdesigner.la \
+ $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \
$(top_builddir)/kexi/widget/libkexiextendedwidgets.la \
- $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la
+ $(top_builddir)/kexi/plugins/forms/libkexiformutils.la
kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner
kformdesignerservices_DATA = kformdesigner_kexireportfactory.desktop
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 16 Apr 2006 22:05:51 -0000 1.10
+++ .cvsignore 30 May 2006 07:27:37 -0000 1.11
@@ -1 +1 @@
-koffice-1.5.0.tar.bz2
+koffice-1.5.1.tar.bz2
Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- koffice.spec 22 Apr 2006 07:41:24 -0000 1.36
+++ koffice.spec 30 May 2006 07:27:37 -0000 1.37
@@ -1,17 +1,17 @@
Name: koffice
-Version: 1.5.0
+Version: 1.5.1
Release: 1%{?dist}
Summary: A free, integrated office suite for KDE
Group: Applications/Productivity
License: GPL/LGPL
URL: http://www.koffice.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.1/src/koffice-1.5.1.tar.bz2
Source100: koshell.png
# stuff for the build configuration
Patch0: koffice-admin-gcc4isok.patch
-Patch1: koffice-kexi-version.patch
+Patch1: koffice-forms-plugins.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# BuildRequires: world-devel ;)
@@ -227,8 +227,9 @@
%prep
%setup -q
%patch0 -p1
+cd kexi
%patch1
-
+cd ..
# this will make sure that patch0 is considered
make -f admin/Makefile.common
@@ -479,6 +480,8 @@
%{_libdir}/libkformulalib.so.*
%{_libdir}/libkopalette.so.*
%{_libdir}/libkoproperty.so.*
+%{_libdir}/libkrossapi.so.*
+%{_libdir}/libkrossmain.so.*
%{_libdir}/kde3/kfile_koffice.*
%{_libdir}/kde3/kfile_ooo.*
%{_libdir}/kde3/kfile_abiword.*
@@ -527,6 +530,7 @@
%{_datadir}/apps/kross
%{_libdir}/kde3/krosspython.*
%{_libdir}/kde3/krossruby.*
+%exclude %{_datadir}/mimelnk/image/x-raw.desktop
%files devel
%{_includedir}/*
@@ -704,7 +708,6 @@
%{_libdir}/kde3/libkritapngimport.*
%{_libdir}/kde3/libkritatiffexport.*
%{_libdir}/kde3/libkritatiffimport.*
-%{_libdir}/kde3/kritaperftest.*
%{_libdir}/kde3/krosskritacore.*
%{_datadir}/apps/krita
%{_datadir}/services/krita*.desktop
@@ -769,8 +772,6 @@
%{_libdir}/kde3/kexihandler_csv_importexport.*
%{_libdir}/kde3/krosskexiapp.*
%{_libdir}/kde3/krosskexidb.*
-%{_libdir}/libkrossapi.so.*
-%{_libdir}/libkrossmain.so.*
%{_datadir}/config/kexirc
%{_datadir}/config/magic/kexi.magic
%{_datadir}/mimelnk/application/*
@@ -911,6 +912,13 @@
%{_datadir}/applications/fedora-kplato.desktop
%changelog
+* Sun May 21 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.1-1
+- fix #191388
+- add kexi forms patch
+- version upgrade
+- exclude x-raw.desktop again
+
* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
1.5.0-1
- split out kexi-drivers (#188746) and fix some related issues
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 16 Apr 2006 22:05:51 -0000 1.10
+++ sources 30 May 2006 07:27:37 -0000 1.11
@@ -1 +1 @@
-220b6bde28b5ebd5c6621bc87ca2c05f koffice-1.5.0.tar.bz2
+50897bd5dfd4eba8a0d78a02003a6ec9 koffice-1.5.1.tar.bz2
--- koffice-filters-krita-tiff.patch DELETED ---
--- koffice-kexi-version.patch DELETED ---
- Previous message (by thread): rpms/koffice/FC-4 .cvsignore, 1.7, 1.8 koffice.spec, 1.13, 1.14 sources, 1.7, 1.8
- Next message (by thread): rpms/koffice/devel koffice-forms-plugins.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 koffice.spec, 1.35, 1.36 sources, 1.10, 1.11 koffice-kexi-version.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list