diff --git a/fix-implicit.patch b/fix-implicit.patch deleted file mode 100644 index 1740349..0000000 --- a/fix-implicit.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- scribus/md5.c -+++ scribus/md5.c -@@ -26,14 +26,8 @@ - - #include - --#if STDC_HEADERS || defined _LIBC --# include --# include --#else --# ifndef HAVE_MEMCPY --# define memcpy(d, s, n) bcopy ((s), (d), (n)) --# endif --#endif -+#include -+#include - - #include "md5.h" - ---- scribus/pixbuf/gdk-pixbuf-xlibrgb.c -+++ scribus/pixbuf/gdk-pixbuf-xlibrgb.c -@@ -49,16 +49,12 @@ - - #include - -+#include -+#include -+#include -+ - #if HAVE_CONFIG_H - # include "scconfig.h" --# if STDC_HEADERS --# include --# include --# include --# endif --#else --# include --# include - #endif - - #define ENABLE_GRAYSCALE diff --git a/scribus-1.3.3.13.tar.bz2 b/scribus-1.3.3.13.tar.bz2 deleted file mode 100644 index 4db9a1d..0000000 --- a/scribus-1.3.3.13.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a255e81d662f27729b2a3b658d6a8e2a6bc5caad328935b3d5a1fae5db3841a -size 14923426 diff --git a/scribus-1.3.3.14.tar.bz2 b/scribus-1.3.3.14.tar.bz2 new file mode 100644 index 0000000..fb8ea47 --- /dev/null +++ b/scribus-1.3.3.14.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dec70068ffe69d4b3f0089e7d3b3eedb13f9ccba7f42b3eda5f261d8b7e9e7c5 +size 15062170 diff --git a/scribus.changes b/scribus.changes index 2281efe..492ae56 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 25 23:12:01 UTC 2010 - mrdocs@opensuse.org + +-update to 1.3.3.14 +-drop the implicit patch as its now upstream + ------------------------------------------------------------------- Fri Jul 31 10:25:33 CEST 2009 - coolo@novell.com diff --git a/scribus.spec b/scribus.spec index c84683d..01bf843 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,7 +1,7 @@ # -# spec file for package scribus (Version 1.3.3.13) +# spec file for package scribus (Version 1.3.3.14) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,20 +26,20 @@ BuildRequires: cmake fdupes kde4-filesystem update-desktop-files %if %suse_version < 1010 BuildRequires: ghostscript-library libtiff-devel openssl-devel %endif -License: GPL v2 or later +License: GPLv2+ Group: Productivity/Publishing/Other AutoReqProv: on Requires: tk python-imaging Suggests: AdobeICCProfiles Provides: scribus-short-words Obsoletes: scribus-i18n-de scribus-i18n-en scribus-i18n-fr scribus-short-words -Version: 1.3.3.13 -Release: 2 +Version: 1.3.3.14 +Release: 1 %define tar_version %version Source: %{name}-%{tar_version}.tar.bz2 Source1: vnd.%name.desktop Source2: %name.desktop -Patch1: fix-implicit.patch +#Patch1: fix-implicit.patch Patch3: %{name}-1.3.3.10-doc-path.diff Url: http://www.scribus.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,7 +80,7 @@ Authors: %prep %setup -q -n %name-%tar_version -%patch1 +#%patch1 %patch3 %build