[Frugalware-git] kdetesting: koffice-2.1.0-1-i686

2010-01-09 Thread Miklos Vajna
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=5ae3a0a88e313e1db2a31bf41f0589ede06b8a54

commit 5ae3a0a88e313e1db2a31bf41f0589ede06b8a54
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sun Jan 10 01:26:16 2010 +0100

koffice-2.1.0-1-i686

- version bump

diff --git a/source/kde-extra/koffice/FrugalBuild 
b/source/kde-extra/koffice/FrugalBuild
index b0d0709..03b6495 100644
--- a/source/kde-extra/koffice/FrugalBuild
+++ b/source/kde-extra/koffice/FrugalBuild
@@ -3,38 +3,29 @@
# Maintainer: crazy cr...@frugalware.org

pkgname=koffice
-pkgver=1.6.3
-pkgrel=8
+pkgver=2.1.0
+pkgrel=1
pkgdesc=An integrated Office suite for KDE
url=http://www.koffice.org;
-depends=('libkexif' 'kdebase=3.5.10-3' 'libpqxx=2.6.9' 'wv2' 'libmysqlclient' 
'libwpd' \
-   'python=2.6' 'ruby=1.8.4-2' 'imagemagick' 'poppler-qt=0.8.0' 
'imagemagick' 'readline')
-makedepends=('doxygen' 'qt-docs=3.3.6' 'kdebindings=3.5.9' 'mysql' 
'pkgconfig' 'postgresql')
+_F_cmakekde_final=FALSE
+Finclude kde
+depends=('libkexif' kdebase=$_F_kde_ver 'libpqxx=2.6.9' 'wv2' 
'libmysqlclient' 'libwpd' \
+   'python=2.6' 'ruby=1.8.4-2' 'imagemagick' 'poppler-qt4=0.8.0' 
'imagemagick' 'readline')
+makedepends=('doxygen' 'qt-docs=3.3.6' 'mysql' 'pkgconfig' 'postgresql')
groups=('kde-extra')
archs=('i686' 'x86_64' 'ppc')
_F_kde_split_docs=1
options=('nodocs')
-Finclude kde
url=http://www.koffice.org;
-up2date=lynx -dump 
http://ftp.gwdg.de/pub/x11/kde/stable/$pkgname-latest/src/|Flasttar
-source=(ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/stable/$pkgname-latest/src/$pkgname-$pkgver.tar.bz2
 \
-   desktop-files.patch \
-   
ftp://ftp.kde.org/pub/kde/security_patches/koffice-xpdf-CVE-2007-3387.diff \
-   
ftp://ftp.kde.org/pub/kde/security_patches/koffice-1.6.3-xpdf2-CVE-2007-4352-5392-5393.diff
 \
-   gcc-43.patch digest_cc.diff glibc210.diff)
+up2date=Flasttar http://ftp.gwdg.de/pub/x11/kde/stable/$pkgname-latest/;
+source=(ftp://ftp.fu-berlin.de/pub/unix/X11/gui/kde/stable/$pkgname-latest/$pkgname-$pkgver.tar.bz2)

subpkgs=($pkgname-docs)
subdescs=('Koffice Documentation.')
-subdepends=($pkgname=$pkgver)
+subrodepends=($pkgname=$pkgver)
subgroups=('kde-extra')
subarchs=('i686 x86_64 ppc')

-sha1sums=('de84214dec913eac1d47dab04dd93f3d81729fd3' \
-  'a5efbe2b1effecde988ef55cf65eebb5d8c95a4a' \
-  'bff4f540389a77320bc87e2dedece50b82932e59' \
-  'a3d1d85567ccf729a2237f4aa837f7e025ce00ae' \
-  '807e3717de8710621007556a41e72fe89ee5cba2' \
-  '76f840156fa3105ceebd3628796af26d9d1bc951' \
-  '58ee7b81dca085692d063f064ece89b514135f65')
+sha1sums=('0fd0bf64e6d166d41bae41730b17d5194e7f5adf')

# optimization OK
diff --git a/source/kde-extra/koffice/desktop-files.patch 
b/source/kde-extra/koffice/desktop-files.patch
deleted file mode 100644
index a2e7716..000
--- a/source/kde-extra/koffice/desktop-files.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -Nurp koffice-1.6.0/filters/krita/jpeg/krita_jpeg.desktop 
koffice-1.6.0-p/filters/krita/jpeg/krita_jpeg.desktop
 koffice-1.6.0/filters/krita/jpeg/krita_jpeg.desktop2006-10-07 
15:33:33.0 +0200
-+++ koffice-1.6.0-p/filters/krita/jpeg/krita_jpeg.desktop  2006-10-23 
02:34:13.0 +0200
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Categories=
-+NoDisplay=true
- Encoding=UTF-8
- Exec=krita %u
- GenericName=Application for Drawing and Handling of Images
-diff -Nurp koffice-1.6.0/karbon/data/karbon.desktop 
koffice-1.6.0-p/karbon/data/karbon.desktop
 koffice-1.6.0/karbon/data/karbon.desktop   2006-10-07 15:38:10.0 
+0200
-+++ koffice-1.6.0-p/karbon/data/karbon.desktop 2006-10-23 02:36:28.0 
+0200
-@@ -63,4 +63,4 @@ InitialPreference=5
- Type=Application
- Icon=karbon
- X-KDE-NativeMimeType=application/x-karbon
--Categories=Qt;KDE;Office;X-KDE-More;
-+Categories=Qt;KDE;Office;
-diff -Nurp koffice-1.6.0/kchart/kchart.desktop 
koffice-1.6.0-p/kchart/kchart.desktop
 koffice-1.6.0/kchart/kchart.desktop2006-10-07 15:35:49.0 
+0200
-+++ koffice-1.6.0-p/kchart/kchart.desktop  2006-10-23 02:37:42.0 
+0200
-@@ -95,4 +95,4 @@ X-KDE-NativeMimeType=application/vnd.oas
- X-KDE-NativeOasisMimeType=application/vnd.oasis.opendocument.chart
- X-KDE-StartupNotify=true
- X-DCOP-ServiceType=Multi
--Categories=Qt;KDE;Office;X-KDE-More;
-+Categories=Qt;KDE;Office;
-diff -Nurp koffice-1.6.0/kformula/kformula.desktop 
koffice-1.6.0-p/kformula/kformula.desktop
 koffice-1.6.0/kformula/kformula.desktop2006-10-07 15:27:55.0 
+0200
-+++ koffice-1.6.0-p/kformula/kformula.desktop  2006-10-23 02:39:29.0 
+0200
-@@ -75,4 +75,4 @@ Icon=kformula
- X-KDE-NativeMimeType=application/vnd.oasis.opendocument.formula
- X-DCOP-ServiceType=Multi
- DocPath=kformula/index.html
--Categories=Qt;KDE;Office;X-KDE-More;
-+Categories=Qt;KDE;Office;
-diff -Nurp koffice-1.6.0/krita/krita.desktop 
koffice-1.6.0-p/krita/krita.desktop
 koffice-1.6.0/krita/krita.desktop  2006-10-07 

[Frugalware-git] kdetesting: koffice-2.1.0-1-i686

2010-01-09 Thread Miklos Vajna
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=kdetesting.git;a=commitdiff;h=011c13c53b63c35bc7d203e243e3dd5360bdca48

commit 011c13c53b63c35bc7d203e243e3dd5360bdca48
Author: Miklos Vajna vmik...@frugalware.org
Date:   Sun Jan 10 03:23:59 2010 +0100

koffice-2.1.0-1-i686

- forgot to inherit makedepends() from cmake.sh

diff --git a/source/kde-extra/koffice/FrugalBuild 
b/source/kde-extra/koffice/FrugalBuild
index 03b6495..d046699 100644
--- a/source/kde-extra/koffice/FrugalBuild
+++ b/source/kde-extra/koffice/FrugalBuild
@@ -11,7 +11,7 @@ _F_cmakekde_final=FALSE
Finclude kde
depends=('libkexif' kdebase=$_F_kde_ver 'libpqxx=2.6.9' 'wv2' 
'libmysqlclient' 'libwpd' \
'python=2.6' 'ruby=1.8.4-2' 'imagemagick' 'poppler-qt4=0.8.0' 'imagemagick' 
'readline')
-makedepends=('doxygen' 'qt-docs=3.3.6' 'mysql' 'pkgconfig' 'postgresql')
+makedepends=(${makedepen...@]} 'doxygen' 'qt-docs=3.3.6' 'mysql' 
'pkgconfig' 'postgresql')
groups=('kde-extra')
archs=('i686' 'x86_64' 'ppc')
_F_kde_split_docs=1
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git