rpms/koffice/devel .cvsignore, 1.5, 1.6 koffice.spec, 1.10, 1.11 sources, 1.5, 1.6 koffice-admin-disable-fvisibility.patch, 1.1, NONE

[Andreas Bierfert (awjb)]

Author: awjb

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

Modified Files:
	.cvsignore koffice.spec sources 
Removed Files:
	koffice-admin-disable-fvisibility.patch 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Aug 2005 08:46:31 -0000	1.5
+++ .cvsignore	15 Oct 2005 23:14:13 -0000	1.6
@@ -1 +1 @@
-koffice-1.4.1.tar.bz2
+koffice-1.4.2.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- koffice.spec	29 Sep 2005 13:26:10 -0000	1.10
+++ koffice.spec	15 Oct 2005 23:14:13 -0000	1.11
@@ -1,18 +1,17 @@
 Name:           koffice
-Version:        1.4.1
-Release:        6%{?dist}
+Version:        1.4.2
+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/stable/koffice-1.4.1/src/koffice-1.4.1.tar.bz2
+Source0:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-1.4.2.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-Patch1:         koffice-admin-disable-fvisibility.patch 
-Patch2:         koffice-qt3.3.5.patch
+Patch1:         koffice-qt3.3.5.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -193,9 +192,8 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2
+#%patch0 -p1
+%patch1
 
 # this will make sure that patch0 and patch1 are considered
 make -f admin/Makefile.common
@@ -253,7 +251,7 @@
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category=X-Fedora \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/kformdesigner.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/kformdesigner.desktop
 
 #kword
 desktop-file-install \
@@ -293,7 +291,14 @@
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category=X-Fedora \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_magic.desktop
+
+desktop-file-install \
+  --vendor=fedora \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category=X-Fedora \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/krita.desktop
 
 #kugar
 desktop-file-install \
@@ -572,6 +577,7 @@
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
 %{_datadir}/applications/fedora-krita.desktop
+%{_datadir}/applications/fedora-krita_magic.desktop
 
 %files kugar
 %defattr(-,root,root,-)
@@ -741,6 +747,10 @@
 %{_datadir}/servicetypes/kofilter*.desktop
 
 %changelog
+* Sun Oct 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.2-1
+- version upgrade
+
 * Wed Sep 28 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.1-6
 - add patch for qt-3.3.5 problem


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Aug 2005 08:46:31 -0000	1.5
+++ sources	15 Oct 2005 23:14:13 -0000	1.6
@@ -1 +1 @@
-91a7b68757addc5934c5a8209a4926d5  koffice-1.4.1.tar.bz2
+6b456fb7d54c84b11396b27a96ae0cf8  koffice-1.4.2.tar.bz2


--- koffice-admin-disable-fvisibility.patch DELETED ---