Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Switch to upstream appdata/metainfo and desktop file
Drop all patches (all upstreamed)
Resolves: rhbz#2341567
Resolves: rhbz#2385740

.gitignore

@@ -1,2 +1,13 @@
 xfig.3.2.5b.full.tar.gz
 /xfig-icons.tar.gz
+/xfig.3.2.5c.full.tar.gz
+/xfig_3.2.5.c-8.debian.tar.xz
+/xfig-full-3.2.6.tar.xz
+/xfig-3.2.6.tar.xz
+/xfig-3.2.6a.tar.xz
+/xfig-3.2.7a.tar.xz
+/xfig-3.2.7b.tar.xz
+/xfig-3.2.8a.tar.xz
+/xfig-3.2.8b.tar.xz
+/xfig-3.2.9.tar.xz
+/mcj-xfig-ce9782a404b6a527393839369aac13dcfb66ff16.zip

31_spelling.patch

@@ -1,12 +0,0 @@
-From: Roland Rosenfeld <roland@debian.org>
-Subject: Fix spelling errors in binary.
-
---- a/f_load.c
-+++ b/f_load.c
-@@ -373,5 +373,5 @@
- 	/* Format error; relevant error message is already delivered */
- 	;
-     else
--	file_msg("File \"%s\" is not accessable; %s.", file, strerror(err));
-+	file_msg("File \"%s\" is not accessible; %s.", file, strerror(err));
- }

33_pdfimport_mediabox.patch

@@ -1,33 +0,0 @@
-From: jsoula@univ-lille2.fr
-Subject: Fix reading "/MediaBox" when importing PDF (Closes: #530898).
-Bug-Debian: http://bugs.debian.org/530898
-
---- a/f_readeps.c
-+++ b/f_readeps.c
-@@ -77,11 +77,13 @@
- 
- 	/* 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(s, '[');
-+		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 @@
- 			     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) */

38_formatstring.patch

@@ -1,14 +0,0 @@
-From: Roland Rosenfeld <roland@debian.org>
-Subject: Fix format string error with hardening.
-
---- a/w_msgpanel.c
-+++ b/w_msgpanel.c
-@@ -588,7 +588,7 @@
- 
-     strcat(tmpstr,"\n");
-     if (update_figs) {
--	fprintf(stderr,tmpstr);
-+       fprintf(stderr, "%s", tmpstr);
-     } else {
- 	/* append this message to the file message widget string */
- 	block.firstPos = 0;

40_fix_dash_list_for_different_styles.patch

@@ -1,34 +0,0 @@
---- xfig.3.2.5c/w_drawprim.c	2012-10-17 00:14:09.000000000 +0200
-+++ xfig.3.2.5c/w_drawprim.c	2013-11-29 02:45:36.950448714 +0100
-@@ -1292,14 +1292,23 @@ void set_fill_gc(int fill_style, int op,
- }
- 
- 
--static unsigned char dash_list[16][2] = {{255, 255}, {255, 255},
--					{255, 255}, {255, 255},
--					{255, 255}, {255, 255},
--					{255, 255}, {255, 255},
--					{255, 255}, {255, 255},
--					{255, 255}, {255, 255},
--					{255, 255}, {255, 255},
--					{255, 255}, {255, 255}};
-+static unsigned char dash_list[16][8] = {
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255},
-+		    {255, 255, 255, 255, 255, 255, 255, 255}};
- 
- static int join_styles[3] = { JoinMiter, JoinRound, JoinBevel };
- static int cap_styles[3] = { CapButt, CapRound, CapProjecting };

sources

@@ -1,2 +1,2 @@
-210851330fa4bb3581bec1f8448a4db8  xfig.3.2.5c.full.tar.gz
-f58e3bde288d623c826e1784ebb45de0  xfig-icons.tar.gz
+SHA512 (mcj-xfig-ce9782a404b6a527393839369aac13dcfb66ff16.zip) = a0d483d77edb16d869596a53f89783efd232832b4447089227f34ff552836209f595e5cc9f179242386e85f6f8378607433913720aab29b9d69a2a4007404b47
+SHA512 (xfig-icons.tar.gz) = f7d9b314d57994d479712740dcac4a2c924ddacea028db1c6cdeef36fb7d846885c45d21499f7453c750c265eeb5877e4b032454911ce91667ccc550cb2112e5

xfig-3.2.5-Imakefile.patch

@@ -1,31 +0,0 @@
-diff -up xfig.3.2.5b/Imakefile.fed xfig.3.2.5b/Imakefile
---- xfig.3.2.5b/Imakefile.fed	2012-08-12 16:54:00.102765148 +0200
-+++ xfig.3.2.5b/Imakefile	2012-08-12 16:57:32.883846828 +0200
-@@ -45,7 +45,7 @@ XCOMM Don't set the DESTDIR variable unl
- XCOMM different tree than the "correct" tree that your X system expects. The usual
- XCOMM purpose of DESTDIR is to test an install process by installing in a benign area.
- 
--XCOMM XAPPLOADDIR = /home/user/xfig
-+XAPPLOADDIR = /usr/share/X11/app-defaults
- 
- XCOMM Comment out the following definition for XAW3D if you don't to want to use
- XCOMM the 3d Athena Widget Set
-@@ -169,15 +169,14 @@ XCOMM be sure to comment out the second
- XCOMM XFIGLIBDIR = $(LIBDIR)
- 
- XCOMM use this if you want the multi-key data base file in the standard X11 tree
--XFIGLIBDIR = $(LIBDIR)/xfig
-+XFIGLIBDIR = /usr/share/xfig
- 
- XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
--XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
--XFIGDOCDIR = /usr/local/xfig/doc
-+XFIGDOCDIR = /usr/share/doc/xfig
- 
- XCOMM MANDIR tells where the standard man pages should go (no need to change it
- XCOMM if you want the man pages installed in the standard place on your system
--MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
-+MANDIR = /usr/share/man/man1
- XCOMM MANDIR = /usr/local/xfig/man
- 
- XCOMM If your system doesn't have strstr undefine the following definition

xfig-3.2.5-disable-Xaw3d.patch

@@ -1,21 +0,0 @@
-diff -up xfig.3.2.5a/Imakefile.with-Xaw3d xfig.3.2.5a/Imakefile
---- xfig.3.2.5c/Imakefile.with-Xaw3d	2013-11-27 22:24:46.000000000 +0100
-+++ xfig.3.2.5c/Imakefile	2013-11-27 22:24:06.000000000 +0100
-@@ -50,7 +50,7 @@ XAPPLOADDIR = /usr/share/X11/app-default
- XCOMM Comment out the following definition for XAW3D if you don't to want to use
- XCOMM the 3d Athena Widget Set
- 
--#define XAW3D
-+XCOMM #define XAW3D
- 
- #ifdef XAW3D
- XAWLIB = -lXaw3d
-@@ -60,7 +60,7 @@ XCOMM Uncomment the following if you hav
- XCOMM some new features, including "Tips", which replace xfig's "help balloons"
- XCOMM NOTE: This is the default for many X systems now.
- 
--#define XAW3D1_5E
-+XCOMM #define XAW3D1_5E
- 
- #ifdef XAW3D1_5E
-     DUSEXAW3D = -DXAW3D -DXAW3D1_5E

xfig-3.2.5-libpng16.patch

@@ -1,13 +0,0 @@
---- a/f_readpng.c	2014-09-15 13:25:26.290813563 +0200
-+++ a/f_readpng.c	2014-09-15 14:04:10.241297027 +0200
-@@ -90,8 +90,8 @@ 
-     png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
- 	&interlace_type, &compression_type, &filter_type);
- 
--    png_fixed_point gamma = 0.45;
--    png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
-+    double gamma = 0.45455;
-+    png_get_gAMA(png_ptr,info_ptr,&gamma);
-     png_set_gamma(png_ptr, 2.2, gamma);
- 
-     if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {

xfig-3.2.5-rhbz1046102.patch

@@ -1,12 +0,0 @@
-diff -up xfig.3.2.5c/w_indpanel.c~ xfig.3.2.5c/w_indpanel.c
---- xfig.3.2.5c/w_indpanel.c~	2011-09-30 21:27:36.000000000 +0200
-+++ xfig.3.2.5c/w_indpanel.c	2014-06-18 16:39:38.783389253 +0200
-@@ -1266,7 +1266,7 @@ static void
- set_arrow_size_state(Widget w, XtPointer closure, XtPointer call_data)
- {
-     Boolean	    state;
--    int		    which;
-+    intptr_t	    which;
-     Pixel	    bg1, bg2, fg1, fg2;
- 
-     /* check state of the toggle and set/remove checkmark */

xfig-3.2.5-urwfonts.patch

@@ -1,79 +0,0 @@
---- xfig.3.2.4/u_fonts.c	2002-09-09 13:36:58.000000000 -0400
-+++ new-xfig-3.2.4/u_fonts.c	2006-10-11 00:29:07.000000000 -0400
-@@ -22,41 +22,41 @@
- /* X11 font names */
- 
- struct _xfstruct x_fontinfo[NUM_FONTS] = {
--    {"-*-times-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-times-medium-i-normal--", (struct xfont*) NULL},
--    {"-*-times-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-times-bold-i-normal--", (struct xfont*) NULL},
--    {"-*-avantgarde-book-r-normal--", (struct xfont*) NULL},
--    {"-*-avantgarde-book-o-normal--", (struct xfont*) NULL},
--    {"-*-avantgarde-demi-r-normal--", (struct xfont*) NULL},
--    {"-*-avantgarde-demi-o-normal--", (struct xfont*) NULL},
--    {"-*-bookman-light-r-normal--", (struct xfont*) NULL},
--    {"-*-bookman-light-i-normal--", (struct xfont*) NULL},
--    {"-*-bookman-demi-r-normal--", (struct xfont*) NULL},
--    {"-*-bookman-demi-i-normal--", (struct xfont*) NULL},
--    {"-*-courier-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-courier-medium-o-normal--", (struct xfont*) NULL},
--    {"-*-courier-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-courier-bold-o-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-medium-o-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-bold-o-normal--", (struct xfont*) NULL},
--    {"-*-helvetica-medium-r-narrow--", (struct xfont*) NULL},
--    {"-*-helvetica-medium-o-narrow--", (struct xfont*) NULL},
--    {"-*-helvetica-bold-r-narrow--", (struct xfont*) NULL},
--    {"-*-helvetica-bold-o-narrow--", (struct xfont*) NULL},
--    {"-*-new century schoolbook-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-new century schoolbook-medium-i-normal--", (struct xfont*) NULL},
--    {"-*-new century schoolbook-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-new century schoolbook-bold-i-normal--", (struct xfont*) NULL},
--    {"-*-palatino-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-palatino-medium-i-normal--", (struct xfont*) NULL},
--    {"-*-palatino-bold-r-normal--", (struct xfont*) NULL},
--    {"-*-palatino-bold-i-normal--", (struct xfont*) NULL},
--    {"-*-symbol-medium-r-normal--", (struct xfont*) NULL},
--    {"-*-itc zapf chancery-medium-i-normal--", (struct xfont*) NULL},
--    {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL},
-+    {"-urw-nimbus roman no9 l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus roman no9 l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus roman no9 l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus roman no9 l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-urw gothic l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw gothic l-medium-o-normal--", (struct xfont*) NULL},
-+    {"-urw-urw gothic l-semibold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw gothic l-semibold-o-normal--", (struct xfont*) NULL},
-+    {"-urw-urw bookman l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw bookman l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-urw bookman l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw bookman l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus mono l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus mono l-medium-o-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus mono l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus mono l-bold-o-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l condensed-medium-r-condensed--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l condensed-medium-i-condensed--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l condensed-bold-r-condensed--", (struct xfont*) NULL},
-+    {"-urw-nimbus sans l condensed-bold-i-condensed--", (struct xfont*) NULL},
-+    {"-urw-century schoolbook l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-century schoolbook l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-century schoolbook l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-century schoolbook l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-urw palladio l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw palladio l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-urw palladio l-bold-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw palladio l-bold-i-normal--", (struct xfont*) NULL},
-+    {"-urw-standard symbols l-medium-r-normal--", (struct xfont*) NULL},
-+    {"-urw-urw chancery l-medium-i-normal--", (struct xfont*) NULL},
-+    {"-urw-dingbats-medium-r-normal--", (struct xfont*) NULL},
- };
- 
- /* Use the following font names for any font that doesn't exist in the table above.

xfig-3.2.5a-default-apps.patch

@@ -1,36 +0,0 @@
-diff -up xfig.3.2.5a/Fig.ad~ xfig.3.2.5a/Fig.ad
---- xfig.3.2.5a/Fig.ad~	2007-04-14 04:17:24.000000000 +0200
-+++ xfig.3.2.5a/Fig.ad	2009-03-27 15:15:27.000000000 +0100
-@@ -5,6 +5,10 @@
- 
- ! some sample settings you may want to change
- 
-+! If the following resource is set to false, xfig will use metric units
-+! by default.
-+Fig.inches:     false
-+
- ! The following fixes a problem that some window managers have
- ! with xfig continually resizing itself
- 
-@@ -23,18 +27,16 @@
- 
- ! Browser - put your favorite browser here.  
- ! 		This is for viewing the xfig html reference.
--! For firefox, this command will open the help pages in a running firefox,
--!     or start a new netscape if one isn't already running
--Fig.browser:	firefox -remote 'openFile(%f)' || firefox %f
-+Fig.browser:			xdg-open %f
- 
- ! pdfviewer - put your favorite pdf viewer here.  
- !		This is for viewing the xfig how-to guide and man pages
--Fig.pdfviewer:			xpdf %f
-+Fig.pdfviewer:			xdg-open %f
- 
- ! Spell check program - put your favorite spelling check program here.
- !		It must write the misspelled words to standard output.
- 
--Fig.spellcheckcommand:	spell %f
-+Fig.spellcheckcommand:		enchant -l %f
- 
- ! delay before spinner automatically counts when pressed (milliseconds)
- Fig.spinner_delay:		1000

xfig.desktop

@@ -1,47 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Categories=Graphics;
-MimeType=image/fig;image/x-xfig;
-Exec=xfig
-Icon=xfig
-Type=Application
-Name=Xfig
-Name[eo]=XDesegno
-Name[et]=Ffig
-Name[ja]=xfig
-Name[no]=X-figur
-Comment=Xfig drawing application
-Comment[bg]=Xfig ïðîãðàìà çà ðèñóâàíå
-Comment[ca]=Aplicació de dibuix Xfig
-Comment[cs]=Aplikace pro kreslení vektorových obrázků
-Comment[da]=Xfig tegneprogram
-Comment[de]=Xfig-Zeichenprogramm
-Comment[el]=Xfig
-Comment[eo]=Desegnilo "Xfig"
-Comment[es]=Aplicación de diseño vectorial (objetos)
-Comment[et]=XFig joonistusprogramm
-Comment[fi]=Xfig vektoripiirto-ohjelma
-Comment[fr]=Programme de dessin objet Xfig
-Comment[gl]=Aplicación de debuxo (obxectos)
-Comment[he]=Xfig רויצה םושיי
-Comment[hr]=Program za crtanje
-Comment[hu]=Rajzolóprogram
-Comment[is]=Hlutbundið teikniforrit
-Comment[it]=Applicazione di disegno Xfig
-Comment[lt]=Xfig braižymo programa
-Comment[mk]=Едноставна апликација за векторско цртање
-Comment[nl]=Xfig-tekenprogramma
-Comment[no]=Xfig-tegneprogram
-Comment[no_NY]=Teikneprogrammet Xfig
-Comment[pl]=Aplikacja do kreślenia
-Comment[pt]=Aplicação de desenho
-Comment[ro]=Program de desenare vectorială
-Comment[ru]=Приложения для рисования векторной графики
-Comment[sk]=Xfig aplikácia pre kreslenie vektorových obrázkov
-Comment[sl]=Program za risanje Xfig
-Comment[sr]=Xfig prgram za vektorsko crtanje
-Comment[sv]=Xfig ritprogram
-Comment[ta]=Xfig Ũþø ÀÂýÀ¡Î
-Comment[tr]=Xfig çizim uygulaması
-Comment[uk]=Xfig
-Comment[zh_CN.GB2312]=Xfig 绘图应用程序

xfig.rpmlintrc

@@ -0,0 +1,5 @@
+addFilter("W: invalid-url Source1")
+addFilter("W: no-%check-section")
+addFilter("W: files-duplicate /usr/share/")
+addFilter("E: non-executable-script /usr/share/xfig/Libraries/Maps/")
+addFilter("E: spelling-error")

xfig.sh

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [ -x /usr/bin/xfig-Xaw3d ]; then
-    exec xfig-Xaw3d "$@"
-else
-    exec xfig-plain "$@"
-fi

xfig.spec

@@ -1,37 +1,27 @@
-%global app_defaults_dir %{_datadir}/X11/app-defaults
+%global commit ce9782a404b6a527393839369aac13dcfb66ff16
+%global commitdate 20250317
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Summary: An X Window System tool for drawing basic vector graphics
 Name: xfig
-Version: 3.2.5
-Release: 45.c%{?dist}
+Version: 3.2.9a
+Release: 3.%{commitdate}git%{shortcommit}%{?dist}
 License: MIT
-Group: Applications/Multimedia
-URL: http://www.xfig.org/
-Source0: http://downloads.sourceforge.net/mcj/xfig.%{version}c.full.tar.gz
+URL:     https://en.wikipedia.org/wiki/Xfig
+#Source0: http://downloads.sourceforge.net/mcj/xfig-%%{version}.tar.xz
+Source0: https://sourceforge.net/code-snapshots/git/m/mc/mcj/xfig.git/mcj-xfig-%{commit}.zip
 Source1: xfig-icons.tar.gz
-Source2: xfig.desktop
-Source3: xfig.sh
-
-Patch0: xfig-3.2.5a-default-apps.patch
-Patch1: xfig-3.2.5-Imakefile.patch
-Patch2: xfig-3.2.5-disable-Xaw3d.patch
-Patch3: xfig-3.2.5-urwfonts.patch
-Patch4: 31_spelling.patch
-Patch5: 33_pdfimport_mediabox.patch
-# xfig_man.html is not in 3.2.5c tarball from some reason,
-# but makefile still tries to install it
-Patch6: 38_formatstring.patch
-Patch7: 39_add_xfig_man_html.patch
-Patch8: 40_fix_dash_list_for_different_styles.patch
-Patch9: xfig-3.2.5-rhbz1046102.patch
-patch10: xfig-3.2.5-libpng16.patch
 
+BuildRequires: make
+BuildRequires: gcc libtool
+BuildRequires: transfig
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
-BuildRequires: imake
+BuildRequires: libtiff-devel
 BuildRequires: libICE-devel
 BuildRequires: libSM-devel
 BuildRequires: libX11-devel
+BuildRequires: libXft-devel
 BuildRequires: libXaw-devel
 BuildRequires: libXext-devel
 BuildRequires: libXi-devel
@@ -39,13 +29,22 @@ BuildRequires: libXmu-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXt-devel
 BuildRequires: Xaw3d-devel
-BuildRequires: desktop-file-utils
+BuildRequires: man2html-core ImageMagick
+# For eps preview generation
+Requires: ghostscript
+Requires: transfig
+# Used in the UI
+Requires: xorg-x11-fonts-misc
+# For scalable fonts, inc. Bookman, New Century Schoolbook and Palatino
+Requires: urw-base35-fonts-legacy
 
-Requires: %{name}-common = %{version}-%{release}
-Provides: %{name}-executable = %{version}-%{release}
-# Xaw3d used to be the one in a subpackage, now the plain Xaw version is
-Obsoletes: %{name}-Xaw3d <= 3.2.5-7.fc8
-Provides: %{name}-Xaw3d = %{version}-%{release}
+# We used to have seperate Xaw3d and non Xaw3d pkgs, now we only have Xaw3d
+Obsoletes: %{name}-common < %{version}-%{release}
+Provides:  %{name}-common = %{version}-%{release}
+Obsoletes: %{name}-plain < %{version}-%{release}
+Provides:  %{name}-plain = %{version}-%{release}
+Obsoletes: %{name}-Xaw3d < %{version}-%{release}
+Provides:  %{name}-Xaw3d = %{version}-%{release}
 
 %description
 Xfig is an X Window System tool for creating basic vector graphics,
@@ -58,516 +57,201 @@ You should install xfig if you need a simple program to create vector
 graphics.
 
 
-%package plain
-Summary:        Plain Xaw version of xfig
-Group:          Applications/Multimedia
-Requires:       %{name}-common = %{version}-%{release}
-Provides:       %{name}-executable = %{version}-%{release}
-
-%description plain
-Plain Xaw version of xfig, an X Window System tool for creating basic vector
-graphics, including bezier curves, lines, rulers and more. The normal xfig
-package uses the more modern / prettier looking Xaw3d toolkit, whereas this
-version uses the very basic Xaw toolkit. Unless you really know you want this
-version you probably don't want this version.
-
-
-%package common
-Summary:        Common xfig files
-Group:          Applications/Multimedia
-Requires:       transfig >= 1:3.2.5, xdg-utils, enchant, urw-fonts
-Requires:       hicolor-icon-theme
-Requires:       xorg-x11-fonts-base
-# So that this will get uninstalled together with xfig / xfig-Xaw3d
-Requires:       %{name}-executable = %{version}-%{release}
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-
-%description common
-Files common to both the plain Xaw and the Xaw3d version of xfig.
-
-
 %prep
-%setup -q -n xfig.%{version}c -a 1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1 -b .with-Xaw3d
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-
-iconv -f ISO-8859-1 -t UTF8 CHANGES > tmp; touch -r CHANGES tmp; mv tmp CHANGES
-rm Doc/html/images/sav1a0.tmp
-chmod -x `find -type f`
+%autosetup -p1 -a 1 -n mcj-xfig-%{commit}
+for i in doc/html/japanese/button_frame.fig doc/html/japanese/japanese.ps \
+         doc/html/animate.js; do
+  sed -i.orig 's/\r//' $i; touch -r $i.orig $i; rm $i.orig
+done
+autoreconf -i
 
 
 %build
-# First build the normal Xaw version
-xmkmf
-# make sure cmdline option parsing still works despite us renaming the binary
-sed -i 's/"xfig"/"xfig-plain"/' main.c
-make CDEBUGFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_DEFAULT_SOURCE -fno-strength-reduce -fno-strict-aliasing"
-mv xfig xfig-plain
-make distclean
-
-# And then build the Xaw3d version
-mv Imakefile.with-Xaw3d Imakefile
-xmkmf
-# make sure cmdline option parsing still works despite us renaming the binary
-sed -i 's/"xfig-plain"/"xfig-Xaw3d"/' main.c
-make CDEBUGFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_DEFAULT_SOURCE -fno-strength-reduce -fno-strict-aliasing"
+# Fedora's Xaw3d is built with -DXAW_ARROW_SCROLLBARS
+export CFLAGS="-DXAW_ARROW_SCROLLBARS $RPM_OPT_FLAGS -fno-strength-reduce -fno-strict-aliasing"
+%configure
+%make_build
 
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install.all
-install -p -m 644 CHANGES README LATEX.AND.XFIG* FIGAPPS \
-  $RPM_BUILD_ROOT%{_docdir}/%{name}
+%make_install INSTALL="install -p"
+cp -p README CHANGES FIGAPPS $RPM_BUILD_ROOT%{_docdir}/%{name}
 
-# remove the map generation scripts, these are for xfig developers only
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/Libraries/Maps/{USA,Canada}/assemble
-# remove app-defaults symlink which gets installed
-rm $RPM_BUILD_ROOT%{_prefix}/lib*/X11/app-defaults
-
-# install both Xaw and Xaw3d versions and the wrapper for the .desktop file
-mv $RPM_BUILD_ROOT%{_bindir}/%{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-Xaw3d
-install -p -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}
-install -m 755 %{name}-plain $RPM_BUILD_ROOT%{_bindir}
-
-install -D -p -m 644 %{name}16x16.xpm \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.xpm
-install -D -p -m 644 %{name}32x32.xpm \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
-install -D -p -m 644 %{name}64x64.xpm \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install          \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
-
-
-%post common
-update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun common
-update-desktop-database &> /dev/null || :
-if [ $1 -eq 0 ] ; then
-    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans common
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+rm -r $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,64x64}/apps
+convert %{name}16x16.xpm \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+convert %{name}32x32.xpm \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+convert %{name}64x64.xpm \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 
 %files
-%{_bindir}/%{name}-Xaw3d
-
-%files plain
-%{_bindir}/%{name}-plain
-
-%files common
 %doc %{_docdir}/%{name}
 %{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_mandir}/*/*
-%{app_defaults_dir}/*
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/??x??/apps/%{name}.xpm
+%{_mandir}/man1/%{name}.1*
+%{_datadir}/X11/app-defaults/Fig
+%{_datadir}/metainfo/org.xfig.xfig.metainfo.xml
+%{_datadir}/applications/org.xfig.xfig.desktop
+%{_datadir}/icons/hicolor/??x??/apps/%{name}.png
 
 
 %changelog
-* Thu Oct  9 2014 Hans de Goede <hdegoede@redhat.com> - 3.2.5-45.c
-- Fix png reading (rhbz#1150330)
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9a-3.20250317gitce9782a
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
 
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-44.c
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9a-2.20250317gitce9782a
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 
-* Wed Jun 18 2014 Hans de Goede <hdegoede@redhat.com> - 3.2.5-43.c
-- Fix crash when changing arrow size on x86_64 (rhbz#1046102)
+* Wed Aug 6 2025 Hans de Goede <hans@hansg.org> - 3.2.9a-1.20250317gitce9782a
+- Update to 3.2.9a + latest git changes to fix build with -std=c11
+- Switch to upstream appdata/metainfo and desktop file
+- Drop all patches (all upstreamed)
+- Resolves: rhbz#2341567
+- Resolves: rhbz#2385740
 
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-42.c
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 
-* Mon Jan 06 2014 Michal Srb <msrb@redhat.com> - 3.2.5-41.c
-- Name binaries correctly
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 
-* Mon Jan 06 2014 Michal Srb <msrb@redhat.com> - 3.2.5-40.c
-- Use fprintf in safe manner
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 
-* Fri Jan 03 2014 David Kaufmann <astra AT ionic DOT at> - 3.2.5-39.c
-- Version bump to 3.2.5-39c
+* Mon Feb 26 2024 Hans de Goede <hdegoede@redhat.com> - 3.2.9-4
+- Fix missing Dingbats and Symbol glyphs
+- Resolves: rhbz#2260359
 
-* Fri Jan 03 2014 Michal Srb <msrb@redhat.com> - 3.2.5-38.b
-- Fix crash when creating lines with linestyle 3
-- Resolves: rhbz#1023744 (Thanks to Maurizio Paolini and David Kaufmann)
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-37.b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+* Thu Jan 18 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.2.9-2
+- Backport upstream patches for upstream 2 issues
+  - Fix exporting only active layers
+  - Sanitize a call to realloc (redhat #2252679)
 
-* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 3.2.5-36.b
-- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
+* Sat Aug 26 2023 Ranjan Maitra <aarem@fedoraproject.org> - 3.2.9-1
+- New upstream release 3.2.9
 
-* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 3.2.5-35.b
-- rebuild due to "jpeg8-ABI" feature drop
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8b-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
-* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 3.2.5-34.b
-- rebuild against new libjpeg
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8b-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Sun Aug 12 2012 Hans de Goede <hdegoede@redhat.com> - 3.2.5-33.b
-- Re-organize / consolidate patches
-- Add a bunch of patches (minor bug-fixes) from the Debian package
-- Add better icons from the Debian package
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8b-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Sun Aug 12 2012 Hans de Goede <hdegoede@redhat.com> - 3.2.5-32.b
-- Fix a stack overflow when importing 1.3 files (CVE-2009-4227) (rhbz#543905)
+* Mon Oct 11 2021 Hans de Goede <hdegoede@redhat.com> - 3.2.8b-1
+- New upstream release 3.2.8b
 
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-31.b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8a-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Sun Feb 26 2012 Orion Poplawski <orion@cora.nwra.com> - 3.2.5-30.b
-- Rebuild with Xaw3d 1.6.1
+* Sat May 29 2021 Hans de Goede <hdegoede@redhat.com> - 3.2.8a-1
+- New upstream release 3.2.8a
 
-* Tue Feb 14 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 3.2.5-29.b
-- Add patch from Debian for libpng 1.5
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7b-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-28.b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7b-4
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 3.2.5-27.b
-- Rebuild for new libpng
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7b-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-26.b
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7b-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
-* Mon Dec  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.2.5-25.b
-- Fix buffer overflow when opening malicious fig files
+* Thu Jan 16 2020 Hans de Goede <hdegoede@redhat.com> - 3.2.7b-1
+- New upstream release 3.2.7b
 
-* Thu Nov 25 2010 Hans de Goede <hdegoede@redhat.com> 3.2.5-24.b
-- Fix importing of eps files (#657290)
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7a-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
-* Wed Sep 30 2009 Hans de Goede <hdegoede@redhat.com> 3.2.5-23.b
-- New upstream 3.2.5b release
-- Drop many merged patches
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7a-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-22.a
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Jan 11 2019 Hans de Goede <hdegoede@redhat.com> - 3.2.7a-2
+- Fix spline drawing (rhbz#1665237)
 
-* Sun Jun 28 2009 Caolán McNamara <caolanm@redhat.com> 3.2.5-21.a
-- Resolves: rhbz#506791 make xfig spellchecking work
+* Mon Oct 29 2018 Hans de Goede <hdegoede@redhat.com> - 3.2.7a-1
+- New upstream release 3.2.7a
+- Add Requires: transfig to make sure esp export works (rhbz#1642033)
+- Switch back to URW fonts so that Bookman, New Century Schoolbook and
+  Palatino work again. This uses the old version of the URW fonts which are
+  now packaged as urw-base35-fonts-legacy (rhbz#1523624, rhbz#1551219)
+- Trim the changelog
 
-* Wed Jun  3 2009 Hans de Goede <hdegoede@redhat.com> 3.2.5-20.a
-- Fix eps preview (#503911)
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6a-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
-* Wed Apr  8 2009 Hans de Goede <hdegoede@redhat.com> 3.2.5-19.a
-- Fix crash when printing (#494193), thanks to Ian Dall for the patch
+* Sat Mar 03 2018 Hans de Goede <hdegoede@redhat.com> - 3.2.6a-7
+- Fix font issues take 2 (rhbz#1523624) :
+ - It turns out the new urw fonts are completely unusuable as X11 core fonts,
+   stop using them for now (see bug rhbz#1551219)
+ - Add a patch to use the fallback fonts for non-scalable fonts too, so that
+   we at least show something somewhat reasonable for Bookman, New Century
+   Schoolbook and Palatino
+ - This means that display of Zapf Chancery and Zapf Dingbats currently
+   falls back to the "fixed" font, which is completely wrong for Dingbats
 
-* Fri Mar 27 2009 Hans de Goede <hdegoede@redhat.com> 3.2.5-18.a
-- Rebase to new upstream 3.2.5a release, this was made available to me by
-  the Debian maintainer who is in contact with upstream, which appearantly
-  is still somewhat alive (but not alive enough to put the tarbal on the
-  homepage ??)
+* Thu Mar 01 2018 Hans de Goede <hdegoede@redhat.com> - 3.2.6a-6
+- Fix font issues (rhbz#1523624) :
+ - Adjust xfig-3.2.5-urwfonts.patch for new font names in urw-base35-fonts
+ - Except for the symbols font, use the old un-scalable Adobe PCF Symbol font
+   for now as StandardSymbolsPS.otf from urw-base35-fonts is currently broken
+ - Add a patch to deal with some fonts being scalable, while Symbol is not
+ - Note the dingbats font is also broken in urw-base35-fonts, but there is no
+   replacement for it, so that font is still broken, see rhbz#1534206
+- ghostscript-core no longer exists, instead require ghostscript (rhbz#1536581)
+- Remove obsolete icon-cache and desktop-database scriptlets
+- Add a patch from Debian fixing some issues with arrows
 
-* Sun Mar 15 2009 Hans de Goede <hdegoede@redhat.com> 3.2.5-17
-- Add various patches from Debian (doc updates, new figures in the lib,
-  better fix for modepanel resizing)
-- Do not crash when inserting a character from the charmap into a text string
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6a-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
-* Sun Mar 15 2009 Hans de Goede <hdegoede@redhat.com> 3.2.5-16
-- Fix Text size field inserts characters on left instead of right (#490257)
-- Fix xfig-Xaw3d does not display messages in message panel (#490259)
+* Tue Nov 07 2017 Adam Jackson <ajax@redhat.com> - 3.2.6a-4
+- Drop unneeded BuildRequires: imake
 
-* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6a-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
-* Sun Feb 22 2009 Hans de Goede <hdegoede@redhat.com> 3.2.5-14
-- Add missing Requires: xorg-x11-fonts-base (#486701)
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6a-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
-* Mon Nov 10 2008 Stepan Kasal <skasal@redhat.com> - 3.2.5-13
-- fix the Obsoletes tag to <= 3.2.5-7.fc8, which is the last
-  release with Xaw3d subpackage
+* Mon Feb 13 2017 Hans de Goede <hdegoede@redhat.com> - 3.2.6a-1
+- New upstream release 3.2.6a
 
-* Tue Nov  4 2008 Hans de Goede <hdegoede@redhat.com> 3.2.5-12
-- Various small specfile cleanups from merge review
+* Sun Feb 12 2017 Hans de Goede <hdegoede@redhat.com> - 3.2.6-5
+- Build with -DGSBIT to fix eps file preview generation (rhbz#1418560)
+- Fix broken screenshot links in appdata
 
-* Mon Jul 14 2008 Ian Hutchinson <ihutch@mit.edu> 3.2.5-11
-- Fix incorrect height of modepanel.
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
-* Thu Apr  3 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 3.2.5-10
-- Fix missing prototype compiler warnings
+* Fri Aug 12 2016 Hans de Goede <hdegoede@redhat.com> - 3.2.6-3
+- Switch to non -full (smaller) version of upstream sources,
+  we package transfig seperately so we do not need the -full version
 
-* Thu Feb 28 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 3.2.5-9
-- Fix cmdline parsing (broken by renaming the binary) (bz 435097)
+* Thu Aug 11 2016 Hans de Goede <hdegoede@redhat.com> - 3.2.6-2
+- Make using metric units the default again
 
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 3.2.5-8
-- Autorebuild for GCC 4.3
-
-* Wed Dec 12 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 3.2.5-7
-- Fix xfig crashing when zooming in a lot (bz 420411)
-
-* Sat Nov 17 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 3.2.5-6
-- Put the Xaw3d version in the main xfig package, put the plain Xaw version
-  in a -plain subpackage
-
-* Fri Nov 16 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 3.2.5-5
-- Also compile a version against Xaw3d instead of plain Xaw, available in the
-  new xfig-Xaw3d package
-- Various specfile cleanups for packaging guidelines compliance
-- Remove spurious executable permissions on various files (bz 247424)
-- Apply patch fixing problems with xfig not finding fonts (bz 210278)
-
-* Thu Nov 15 2007 Than Ngo <than@redhat.com> 3.2.5-4
-- fix #201992, xfig crashes in the edit function
-
-* Thu Nov 15 2007 Than Ngo <than@redhat.com> 3.2.5-3
-- fix #201992, xfig crashes in the edit function
-
-* Fri Oct 05 2007 Than Ngo <than@redhat.com> - 3.2.5-2
-- rh#313321, use xdg-open
-
-* Mon Apr 16 2007 Than Ngo <than@redhat.com> - 3.2.5-1.fc7
-- 3.2.5
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 3.2.4-21.1
-- rebuild
-
-* Tue May 16 2006 Than Ngo <than@redhat.com> 3.2.4-21
-- fix #191816, Xaw3d build problem
-
-* Fri May 05 2006 Than Ngo <than@redhat.com> 3.2.4-20
-- fix #169330, wrong docdir
-- fix #187902, no parameter negotiation for xfig
-- fix #182451, switch xfig's pdf viewer to evince
-
-* Tue Apr 25 2006 Adam Jackson <ajackson@redhat.com> 3.2.4-19
-- Rebuild for updated imake build rules
-
-* Tue Apr 04 2006 Than Ngo <than@redhat.com> 3.2.4-18
-- no parameter negotiation for xfig, fix #187902
-
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 3.2.4-17.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 3.2.4-17.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Wed Dec 21 2005 Than Ngo <than@redhat.com> 3.2.4-17
-- workaround for utf8
-
-* Sun Dec 18 2005 Than Ngo <than@redhat.com> 3.2.4-16
-- add correct app-defaults directory
-
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
-- rebuilt
-
-* Tue Nov 15 2005 Than Ngo <than@redhat.com> 3.2.4-15
-- fix for modular X
-
-* Mon Oct 24 2005 Than Ngo <than@redhat.com> 3.2.4-14
-- enable xpm support #158422
-
-* Tue Jul 19 2005 Than Ngo <than@redhat.com> 3.2.4-13
-- buildrequires on xorg-x11-devel
-
-* Mon Jul 18 2005 Than Ngo <than@redhat.com> 3.2.4-12
-- fix another buffer overflow #163413
-
-* Thu May 19 2005 Than Ngo <than@redhat.com> 3.2.4-11
-- apply patch to fix buffer overflow #158088
-
-* Mon Mar 21 2005 Than Ngo <than@redhat.com> 3.2.4-10
-- fix font warning #116542
-
-* Mon Mar 07 2005 Than Ngo <than@redhat.com> 3.2.4-9
-- cleanup
-
-* Sat Mar 05 2005 Than Ngo <than@redhat.com> 3.2.4-8
-- rebuilt
-
-* Wed Feb 09 2005 Than Ngo <than@redhat.com> 3.2.4-7
-- rebuilt
-
-* Sat Sep 25 2004 Than Ngo <than@redhat.com> 3.2.4-6
-- add mimetype spec #131629
-
-* Mon Sep 13 2004 Than Ngo <than@redhat.com> 3.2.4-5
-- fix desktop file #131983
-
-* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Tue Jun  3 2003 Jeff Johnson <jbj@redhat.com>
-- add explicit epoch's where needed.
-
-* Tue May  6 2003 Than Ngo <than@redhat.com> 3.2.4-1
-- 3.2.4
-
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
-- rebuilt
-
-* Thu Nov  7 2002 Than Ngo <than@redhat.com> 3.2.3d-11
-- rebuild in new enviroment
-
-* Thu Aug 22 2002 Than Ngo <than@redhat.com> 3.2.3d-10
-- close should get fd, not filename
-
-* Wed Jul 31 2002 Than Ngo <than@redhat.com> 3.2.3d-9
-- Fixed typo bug (bug #70347)
-
-* Wed Jul 24 2002 Than Ngo <than@redhat.com> 3.2.3d-8
-- desktop file issue (bug #69543)
-
-* Tue Jun 25 2002 Than Ngo <than@redhat.com> 3.2.3d-7
-- add patch file using mkstemp (bug #67351)
-
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Thu May 23 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Fri Jul 13 2001 Than Ngo <than@redhhat.com> 3.2.3d-3
-- fix build dependencies (bug #48910)
-
-* Tue Jul 03 2001 Than Ngo <than@redhat.com>
-- fix export to eps when i18n set (bug #45114)
-- requires transfig-3.2.3d
-
-* Fri Jun 15 2001 Than Ngo <than@redhat.com>
-- update to 3.2.3d release
-
-* Tue Jun 12 2001 Than Ngo <than@redhat.com>
-- fix to build against XFree86-4.1.0
-
-* Tue May 29 2001 Than Ngo <than@redhat.com>
-- update to 3.2.3d beta2 fixes (Bug #42597, #42556)
-- fix bug when LANG is set, launching help gives a spurious error (Bug #42596)
-- fix bug in resource setting (Bug #42595)
-- remove some patches, which are included in 3.2.3d beta2
-- fix wrong version number
-- use make install.all
-- fix fhs problem
-
-* Wed May  9 2001 Bernhard Rosenkraenzer <bero@redhat.com>
-- Don't require Netscape at all - use htmlview (which automatically launches
-  Netscape, Mozilla or Konqueror depending on what is installed/running).
-  No need to depend on proprietary stuff...
-
-* Thu Apr 26 2001 Florian La Roche <Florian.LaRoche@redhat.de>
-- do the same for s390x
-
-* Sat Jan 06 2001 Florian La Roche <Florian.LaRoche@redhat.de>
-- only require /usr/bin/netscape if not on S390
-
-* Wed Dec 20 2000 Yukihiro Nakai <ynakai@redhat.com>
-- Delete enable_japanese macro and set i18n default.
-- Fix Japanese translation in .desktop file
-
-* Mon Nov 20 2000 Than Ngo <than@redhat.com>
-- rebuilt to fix bad dir perms
-
-* Thu Nov 9 2000 Than Ngo <than@redhat.com>
-- fixed f_read, which made xfig stop reading the file after
-  removing such bad objects.
-
-* Fri Oct 13 2000 Preston Brown <pbrown@redhat.com>
-- improved .desktop entry
-
-* Thu Aug 24 2000 Yukihiro Nakai <ynakai@redhat.com>
-- Add Japanese patch
-
-* Tue Aug 08 2000 Than Ngo <than@redhat.de>
-- fixed dependency problem
-- fixed starting xpdf
-
-* Mon Aug 07 2000 Than Ngo <than@redhat.de>
-- fixed for using xpdf instead acroreader (Bug #15621)
-- add requires: netscape, display
-
-* Sat Aug 05 2000 Than Ngo <than@redhat.de>
-- update to 3.2.3c (bugs fixed released)
-- fix parse_printcap broken (Bug #11147)
-
-* Thu Jul 13 2000 Prospector <bugzilla@redhat.com>
-- automatic rebuild
-
-* Fri Jun 23 2000 Than Ngo <than@redhat.de>
-- xfig crash, if a menu item was clicked (Bug #12855)
-
-* Sun Jun 18 2000 Than Ngo <than@redhat.de>
-- rebuilt in the new build environment
-- enable optimization
-
-* Sat Jun 03 2000 Than Ngo <than@redhat.de>
-- fix requires, xfig-3.2.3a requires transfig-2.2.3 or newer
-- disable optimization -O2 (gcc-2.96 Bug) on i386
-
-* Thu May 18 2000 Preston Brown <pbrown@redhat.com>
-- fix buildroot issue in Imakefile
-
-* Mon May  8 2000 Bernhard Rosenkraenzer <bero@redhat.com>
-- rebuild with current libXaw3d
-- update to 3.2.3a
-
-* Mon Feb 07 2000 Preston Brown <pbrown@redhat.com>
-- rebuild to gzip man pages
-
-* Fri Jan 14 2000 Preston Brown <pbrown@redhat.com>
-- upgrade to beta1 of 2.2.3.  Hopefully this fixes outstanding issues.
-- no need for vararg fix, commented out
-
-* Thu Sep 23 1999 Preston Brown <pbrown@redhat.com>
-- add icon
-- don't compile with optimization on alpha
-
-* Mon Aug 30 1999 Preston Brown <pbrown@redhat.com>
-- converted to use a .desktop file
-
-* Fri Mar 26 1999 Michael Maher <mike@redhat.com>
-- added files that were missing.
-
-* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com>
-- auto rebuild in the new build environment (release 4)
-- varargs fix
-
-* Thu Feb 18 1999 Jeff Johnson <jbj@redhat.com>
-- correct DESTDIRR typo (#962)
-
-* Wed Dec 30 1998 Cristian Gafton <gafton@redhat.com>
-- build for glibc 2.1
-
-* Tue Jul  7 1998 Jeff Johnson <jbj@redhat.com>
-- updated to 3.2.2.
-
-* Wed Jun 10 1998 Prospector System <bugs@redhat.com>
-- translations modified for de
-
-* Fri May 08 1998 Prospector System <bugs@redhat.com>
-- translations modified for de, fr, tr
-
-* Sat Apr 11 1998 Cristian Gafton <gafton@redhat.com>
-- updated for manhattan
-- buildroot
-
-* Thu Oct 23 1997 Marc Ewing <marc@redhat.com>
-- new version
-- messed with config for 5.0
-- updated Requires and Copyright
-- added wmconfig
-
-* Mon Jul 21 1997 Erik Troan <ewt@redhat.com>
-- built against glibc
+* Thu Aug 11 2016 Hans de Goede <hdegoede@redhat.com> - 3.2.6-1
+- New upstream release 3.2.6
+- Drop all patches, all fixes are upstream now
+- Drop -plain subpackage, only build Xaw3d version
+- Update appdata screenshots for xfig.org being gone
+  (point to http://epb.lbl.gov/xfig/ for now)
+
+* Sun Feb 28 2016 Hans de Goede <hdegoede@redhat.com> - 3.2.5-48.c
+- Bring in various bugfixes from Debian
+- Convert icons to png
+- Add appdata
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.5-47.c
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild