From d0375338d7c7f042dd3fb3d97ea5514ad1784f18 Mon Sep 17 00:00:00 2001
From: Daniel Jahre <rock@lospalmos.net>
Date: Tue, 18 Oct 2005 14:35:37 +0000
Subject: [PATCH] Daniel Jahre: 	updated scribus to version 1.3.1

[2005100521195716826] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6471 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/public/scribus/glibc234.patch | 35 ---------------------
 package/public/scribus/math.patch     | 45 ---------------------------
 package/public/scribus/scribus.desc   |  4 +--
 3 files changed, 2 insertions(+), 82 deletions(-)
 delete mode 100644 package/public/scribus/glibc234.patch
 delete mode 100644 package/public/scribus/math.patch

diff --git a/package/public/scribus/glibc234.patch b/package/public/scribus/glibc234.patch
deleted file mode 100644
index 0bd02ca7c..000000000
--- a/package/public/scribus/glibc234.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/jsaw/scribus/glibc234.patch
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-
-A trival fix for compilation with gcc-2.3.4 ...
-
-  - Rene Rebe <rene@exactcode.de>
-
---- scribus-1.1.6/scribus/page.cpp.orig	2004-05-15 23:16:48.585516928 +0200
-+++ scribus-1.1.6/scribus/page.cpp	2004-05-15 23:17:39.016850200 +0200
-@@ -15,6 +15,8 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <unistd.h> // unlink
-+
- #include "page.h"
- #include "page.moc"
- #include "pageitem.h"
diff --git a/package/public/scribus/math.patch b/package/public/scribus/math.patch
deleted file mode 100644
index 8aff9db80..000000000
--- a/package/public/scribus/math.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/jsaw/scribus/math.patch
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-
-The usual pow, ... builtin for x86 - but not for many others.
-
-  - Rene Rebe <rene@exactcode.de>
-
---- ./scribus/scribusview.cpp.vanilla	2004-06-12 15:23:03.058045128 +0200
-+++ ./scribus/scribusview.cpp	2004-06-12 15:23:18.707666024 +0200
-@@ -25,6 +25,7 @@
- #endif
- 
- #include "pageback.h"
-+#include <math.h>
- #include <qcolor.h>
- #include <qfont.h>
- #include <qfontmetrics.h>
---- ./scribus/scribus.cpp.vanilla	2004-06-12 15:25:20.734115184 +0200
-+++ ./scribus/scribus.cpp	2004-06-12 15:25:47.676019392 +0200
-@@ -29,6 +29,8 @@
- #include <qvbox.h>
- #include <cstdio>
- #include <cstdlib>
-+#include <math.h>
-+
- #include <dlfcn.h>
- #include <unistd.h>
- #include <iostream>
diff --git a/package/public/scribus/scribus.desc b/package/public/scribus/scribus.desc
index 3ddbf498d..60e90445c 100644
--- a/package/public/scribus/scribus.desc
+++ b/package/public/scribus/scribus.desc
@@ -36,7 +36,7 @@
 
 [L] GPL
 [S] Stable
-[V] 1.1.7
+[V] 1.3.1
 [P] X -?---5---9 220.100
 
-[D] 3447531109 scribus-1.1.7.tar.gz http://ahnews.music.salford.ac.uk/scribus/downloads/
+[D] 3851090953 scribus-1.3.1.tar.bz2 http://www.scribus.org.uk/downloads/1.3.1/