rpms/koffice/devel .cvsignore, 1.14, 1.15 koffice.spec, 1.50, 1.51 sources, 1.14, 1.15

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore koffice.spec sources 
Log Message:
* 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/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	1 Dec 2006 17:30:09 -0000	1.14
+++ .cvsignore	23 Feb 2007 20:23:58 -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/devel/koffice.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- koffice.spec	12 Dec 2006 04:14:44 -0000	1.50
+++ koffice.spec	23 Feb 2007 20:23:58 -0000	1.51
@@ -1,7 +1,7 @@
 
 Name:           koffice
-Version:        1.6.1
-Release:        4%{?dist}
+Version:        1.6.2
+Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
@@ -15,7 +15,7 @@
 # BuildRequires: world-devel ;)
 BuildRequires:  kdebase-devel
 BuildRequires:  kdelibs-devel
-## kjsembed bits, not sure if it is really used or not yet -- Rex
+## kjsembed bits, afaict, not really used (yet) -- Rex
 #BuildRequires:  kdebindings-devel
 BuildRequires:  freetype-devel
 BuildRequires:  fontconfig-devel
@@ -23,9 +23,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 +49,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 +157,7 @@
 Summary:        A pixel-based image manipulation program 
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{version}-%{release}
+Requires:	%{name}-filters
 
 %description krita
 %{summary}
@@ -673,18 +672,23 @@
 
 
 %changelog
-* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net>
-1.6.2-4
+* 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/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	1 Dec 2006 17:30:09 -0000	1.14
+++ sources	23 Feb 2007 20:23:58 -0000	1.15
@@ -1,2 +1,2 @@
 03382edf62db9913b57ad8760c7d5f52  koshell.png
-f7b90b46b79019edc60761a6bff2d387  koffice-1.6.1.tar.bz2
+74ef62a5f8f766fe8192d5b7d65a3928  koffice-1.6.2.tar.bz2