rpms/koffice/devel .cvsignore, 1.7, 1.8 koffice.spec, 1.31, 1.32 sources, 1.7, 1.8

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6787

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Feb 2006 12:47:27 -0000	1.7
+++ .cvsignore	15 Mar 2006 21:16:35 -0000	1.8
@@ -1 +1 @@
-koffice-1.4.90.tar.bz2
+koffice-1.4.95.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- koffice.spec	26 Feb 2006 08:54:13 -0000	1.31
+++ koffice.spec	15 Mar 2006 21:16:35 -0000	1.32
@@ -1,18 +1,17 @@
 Name:           koffice
-Version:        1.4.90
-Release:        4%{?dist}
+Version:        1.4.95
+Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        http://download.kde.org/unstable/koffice-1.5-beta1/src/koffice-1.4.90.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-beta2/koffice-1.4.95.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-# Fix --enable-final
-Patch1:         koffice-kotext-lines.patch
+Patch1:         koffice-kspread-cpp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -54,7 +53,6 @@
 BuildRequires:  aspell-devel
 BuildRequires:  libacl-devel
 BuildRequires:  libxslt-devel
-# new with 1.4.90
 BuildRequires:  OpenEXR-devel
 BuildRequires:  libexif-devel
 BuildRequires:  libGL-devel libGLU-devel
@@ -210,7 +208,7 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p2
+%patch1
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -400,15 +398,6 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kplato.desktop
 
-#writeup
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/writeup.desktop
-
-
 rm $RPM_BUILD_ROOT/%{_libdir}/*.la
 
 %clean
@@ -524,14 +513,6 @@
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
 %{_datadir}/apps/kross
-# add writeup here for now
-%{_bindir}/writeup
-%{_libdir}/kde3/libwriteup_part.*
-%{_libdir}/kde3/writeup.*
-%{_libdir}/libkdeinit_writeup.so
-%{_datadir}/applications/fedora-writeup.desktop
-%{_datadir}/apps/writeup
-%{_datadir}/services/writeuppart.desktop
 %exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
@@ -742,6 +723,7 @@
 %defattr(-,root,root,-)
 %{_bindir}/kexi
 %{_bindir}/ksqlite*
+%{_bindir}/krossrunner
 %{_libdir}/libkdeinit_kexi.so
 %{_libdir}/libkexicore.so.*
 %{_libdir}/libkexidatatable.so.*
@@ -913,6 +895,10 @@
 %{_datadir}/applications/fedora-kplato.desktop
 
 %changelog
+* Mon Mar 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.95-1
+- version upgrade
+
 * Sun Feb 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.90-4
 - kivio requires kdegraphics (#182289)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Feb 2006 12:47:27 -0000	1.7
+++ sources	15 Mar 2006 21:16:35 -0000	1.8
@@ -1 +1 @@
-99a8de4e93b00e1c3148a5f96b67d966  koffice-1.4.90.tar.bz2
+ddeca5c989e892baf4871a443fd2daea  koffice-1.4.95.tar.bz2