diff --git a/xfig.3.2.5b-libpng14.dif b/xfig.3.2.5b-libpng14.dif
deleted file mode 100644
index 08e0625..0000000
--- a/xfig.3.2.5b-libpng14.dif
+++ /dev/null
@@ -1,14 +0,0 @@
---- f_readpng.c
-+++ f_readpng.c 2010-04-20 15:45:02.627072958 +0000
-@@ -136,7 +136,11 @@ read_png(FILE *file, int filetype, F_pic
-
- if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
- png_get_hIST(png_ptr, info_ptr, &histogram);
-+#if (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && (PNG_LIBPNG_VER_MINOR > 4))) || defined(png_set_quantize)
-+ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0);
-+#else
- png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0);
-+#endif
- }
- }
- if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
diff --git a/xfig.3.2.5b-mediaboxrealnb.dif b/xfig.3.2.5b-mediaboxrealnb.dif
new file mode 100644
index 0000000..b00840a
--- /dev/null
+++ b/xfig.3.2.5b-mediaboxrealnb.dif
@@ -0,0 +1,29 @@
+--- f_readeps.c
++++ f_readeps.c 2013-02-08 11:11:22.717952436 +0000
+@@ -77,11 +77,13 @@ read_epsf_pdf(FILE *file, int filetype,
+
+ /* look for /MediaBox for pdf file */
+ if (pdf_flag) {
+- if (!strncmp(buf, "/MediaBox", 8)) { /* look for the MediaBox spec */
++ char *s;
++ for(s=buf; (s=strchr(s,'/')); s++) {
++ if (!strncmp(s, "/MediaBox", 8)) { /* look for the MediaBox spec */
+ char *c;
+
+- c = strchr(buf, '[') + 1;
+- if (c && sscanf(c, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) {
++ c = strchr(buf, '[');
++ if (c && sscanf(c+1, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) {
+ llx = lly = 0;
+ urx = paper_sizes[0].width * 72 / PIX_PER_INCH;
+ ury = paper_sizes[0].height * 72 / PIX_PER_INCH;
+@@ -89,7 +91,9 @@ read_epsf_pdf(FILE *file, int filetype,
+ appres.INCHES ? "Letter" : "A4");
+ app_flush();
+ }
++ break;
+ }
++ }
+ /* look for bounding box */
+ } else if (!nested && !strncmp(buf, "%%BoundingBox:", 14)) {
+ if (!strstr(buf, "(atend)")) { /* make sure doesn't say (atend) */
diff --git a/xfig.3.2.5b-patches.tar.bz2 b/xfig.3.2.5b-patches.tar.bz2
new file mode 100644
index 0000000..6b9ae5f
--- /dev/null
+++ b/xfig.3.2.5b-patches.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57f3deba38d376e7b6f980e69679f47f491bf8bad6b9d778afa92786b6723756
+size 2485
diff --git a/xfig.3.2.5b.dif b/xfig.3.2.5b.dif
index e2e3903..607a9e8 100644
--- a/xfig.3.2.5b.dif
+++ b/xfig.3.2.5b.dif
@@ -1,3 +1,35 @@
+--- Doc/xfig.man
++++ Doc/xfig.man
+@@ -1475,8 +1475,11 @@
+ See the
+ .IR Imakefile .
+ .TP
+-/usr/lib/X11/xfig
+-This directory contains the html documentation, the above mentioned
++/usr/share/doc/packages/xfig
++This directory contains the documentation.
++.TP
++/usr/share/X11/xfig
++This directory contains the above mentioned
+ CompKeyDB file, and a directory of libraries containing Fig objects
+ such as electrical symbols, logic symbols, etc.
+ .TP
+--- Doc/xfig_man.html
++++ Doc/xfig_man.html
+@@ -2539,8 +2539,11 @@
+ See the
+ Imakefile.
+
+-/usr/lib/X11/xfig
+-This directory contains the html documentation, the above mentioned
++/usr/share/doc/packages/xfig
++This directory contains the documentation.
++
++/usr/share/X11/xfig
++This directory contains the above mentioned
+ CompKeyDB file, and a directory of libraries containing Fig objects
+ such as electrical symbols, logic symbols, etc.
+ Fig.ad and Fig-color.ad
--- Fig.ad
+++ Fig.ad 2009-12-14 11:42:24.307429001 +0000
@@ -15,6 +15,8 @@ Fig.version: 3.2.5b
diff --git a/xfig.changes b/xfig.changes
index cd4c7b2..add5371 100644
--- a/xfig.changes
+++ b/xfig.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Feb 8 11:14:39 UTC 2013 - werner@suse.de
+
+- User original patches from Debian
+
+-------------------------------------------------------------------
+Thu Feb 7 14:12:21 UTC 2013 - werner@suse.de
+
+- Add xfig.3.2.5b-mediaboxrealnb.dif to fix regarding pdf import,
+ reported by Loic Le Guyader compare with Debian bug #530898
+
-------------------------------------------------------------------
Wed Oct 10 07:25:44 UTC 2012 - werner@suse.de
diff --git a/xfig.spec b/xfig.spec
index 5b73351..74aac4d 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -1,7 +1,7 @@
#
# spec file for package xfig
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -56,15 +56,17 @@ Source1: font-test.fig
Source2: browser
Source3: xfig.sh
Source4: xfig.desktop
+Source5: xfig.%{version}-patches.tar.bz2
Patch0: xfig.%{version}.dif
Patch1: xfig.3.2.5-urw-fonts.dif
Patch2: xfig.3.2.5-xim.dif
Patch3: xfig.3.2.3d-international-std-fonts.dif
+# PATCH-FIX-UPSTREAM xfig.3.2.5b-mediaboxrealnb.dif [debian#530898]
+Patch4: xfig.3.2.5b-mediaboxrealnb.dif
Patch5: xfig.3.2.5b-null.dif
Patch6: xfig.3.2.5b-locale.dif
Patch7: xfig.3.2.5b-fixes.dif
Patch8: xfig.3.2.5b-pspdftex.dif
-Patch9: xfig.3.2.5b-libpng14.dif
Patch10: xfig.3.2.5b-preview.dif
Patch11: xfig.3.2.5b-bnc657393.dif
Patch12: xfig.3.2.5b-bnc777469.diff
@@ -105,15 +107,16 @@ Authors:
%prep
%setup -q -n xfig.%{version}
find -type f | xargs -r chmod a-x,go-w
+tar Oxfj %{S:5} | patch -p1 -s
%patch0 -p0
%patch1 -p0 -b .urw-fonts
%patch2 -p0 -b .xim
%patch3 -p1 -b .international-std-fonts
+%patch4 -p0 -b .mbox
%patch5 -p0 -b .null
%patch6 -p0 -b .locale
%patch7 -p0 -b .fixes
%patch8 -p0 -b .pspdftex
-%patch9 -p0 -b .libpng14
%patch10 -p0 -b .preview
%patch11 -p0 -b .vsprintf
%patch12 -p1 -b .ovflow