From 951a758c3fabe62365cc408d88d59de18faf33afa6515cdf1eee0628b7517f06 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 8 Feb 2013 12:53:57 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/graphics/xfig?expand=0&rev=33
---
 xfig.3.2.5b-libpng14.dif    | 14 --------------
 xfig.3.2.5b-patches.tar.bz2 |  3 +++
 xfig.3.2.5b.dif             | 32 ++++++++++++++++++++++++++++++++
 xfig.changes                |  2 +-
 xfig.spec                   |  4 ++--
 5 files changed, 38 insertions(+), 17 deletions(-)
 delete mode 100644 xfig.3.2.5b-libpng14.dif
 create mode 100644 xfig.3.2.5b-patches.tar.bz2

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-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
+ <I>Imakefile</I>.
+ 
+-<DT>/usr/lib/X11/xfig<DD>
+-This directory contains the html documentation, the above mentioned
++<DT>/usr/share/doc/packages/xfig<DD>
++This directory contains the documentation.
++
++<DT>/usr/share/X11/xfig<DD>
++This directory contains the above mentioned
+ CompKeyDB file, and a directory of libraries containing Fig objects
+ such as electrical symbols, logic symbols, etc.
+ <DT><B>Fig.ad and Fig-color.ad</B>
 --- 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 f624bce..add5371 100644
--- a/xfig.changes
+++ b/xfig.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Fri Feb  8 11:14:39 UTC 2013 - werner@suse.de
 
-- User original patch from Debian 
+- User original patches from Debian 
 
 -------------------------------------------------------------------
 Thu Feb  7 14:12:21 UTC 2013 - werner@suse.de
diff --git a/xfig.spec b/xfig.spec
index 105b92f..74aac4d 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -56,6 +56,7 @@ 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
@@ -66,7 +67,6 @@ 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
@@ -107,6 +107,7 @@ 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
@@ -116,7 +117,6 @@ find -type f | xargs -r chmod a-x,go-w
 %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