From f9158bbbbff4ae44bee73f57cdb8f4ab158bb39dbf55a8736197670c63b8826f Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 9 Oct 2008 10:10:06 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/scribus?expand=0&rev=14

---
 fix-implicit.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
 scribus.changes    |  6 ++++++
 scribus.spec       | 21 +++++++++++++++++----
 3 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 fix-implicit.patch

diff --git a/fix-implicit.patch b/fix-implicit.patch
new file mode 100644
index 0000000..1740349
--- /dev/null
+++ b/fix-implicit.patch
@@ -0,0 +1,42 @@
+--- scribus/md5.c
++++ scribus/md5.c
+@@ -26,14 +26,8 @@
+ 
+ #include <sys/types.h>
+ 
+-#if STDC_HEADERS || defined _LIBC
+-# include <stdlib.h>
+-# include <string.h>
+-#else
+-# ifndef HAVE_MEMCPY
+-#  define memcpy(d, s, n) bcopy ((s), (d), (n))
+-# endif
+-#endif
++#include <stdlib.h>
++#include <string.h>
+ 
+ #include "md5.h"
+ 
+--- scribus/pixbuf/gdk-pixbuf-xlibrgb.c
++++ scribus/pixbuf/gdk-pixbuf-xlibrgb.c
+@@ -49,16 +49,12 @@
+ 
+ #include <math.h>
+ 
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++
+ #if HAVE_CONFIG_H
+ #  include "scconfig.h"
+-#  if STDC_HEADERS
+-#    include <stdio.h>
+-#    include <stdlib.h>
+-#    include <string.h>
+-#  endif
+-#else
+-#  include <stdio.h>
+-#  include <stdlib.h>
+ #endif
+ 
+ #define ENABLE_GRAYSCALE
diff --git a/scribus.changes b/scribus.changes
index 6c5c9c0..683d357 100644
--- a/scribus.changes
+++ b/scribus.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct  9 11:28:54 CEST 2008 - meissner@suse.de
+
+- added stdlib.h, string.h
+- run %fdupes
+
 -------------------------------------------------------------------
 Tue Jun  3 00:54:07 CEST 2008 - crrodriguez@suse.de
 
diff --git a/scribus.spec b/scribus.spec
index 5e649ec..4adb50b 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -2,9 +2,16 @@
 # spec file for package scribus (Version 1.3.3.12)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -15,7 +22,7 @@ Name:           scribus
 BuildRequires:  cairo-devel cups cups-devel python-devel shared-mime-info
 BuildRequires:  fontconfig-devel libtiff-devel libxml2-devel openssl-devel
 BuildRequires:  gcc-c++ pkgconfig qt3-devel
-BuildRequires:  cmake kde4-filesystem update-desktop-files
+BuildRequires:  cmake fdupes kde4-filesystem update-desktop-files
 %if %suse_version < 1010
 BuildRequires:  -ghostscript-library libtiff-devel openssl-devel
 %endif
@@ -28,8 +35,9 @@ Provides:       scribus-short-words
 Obsoletes:      scribus-i18n-de scribus-i18n-en scribus-i18n-fr scribus-short-words
 %define tar_version 1.3.3.12svn
 Version:        1.3.3.12
-Release:        19
+Release:        72
 Source:         %{name}-%{tar_version}.tar.bz2
+Patch1:         fix-implicit.patch
 Patch3:         %{name}-1.3.3.10-doc-path.diff
 Patch4:         cmake-2.6.diff
 Url:            http://www.scribus.net/
@@ -71,6 +79,7 @@ Authors:
 
 %prep
 %setup -q -n %name-%tar_version
+%patch1
 %patch3
 %patch4
 
@@ -94,6 +103,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/mimelnk
 install -m 644 -D scribus.desktop $RPM_BUILD_ROOT%{_datadir}/applications/scribus.desktop
 %suse_update_desktop_file -r %name Office WordProcessor
 install -m 644 -D scribus.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages/scribus.xml
+%fdupes $RPM_BUILD_ROOT
 
 %post
 if [ -f /usr/bin/update-mime-database ]; then
@@ -123,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/man/pl/man1
 
 %changelog
+* Thu Oct 09 2008 meissner@suse.de
+- added stdlib.h, string.h
+- run %%fdupes
 * Tue Jun 03 2008 crrodriguez@suse.de
 - needs fno-strict-aliasing
 * Wed Apr 16 2008 dmueller@suse.de