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

@@ -4,3 +4,10 @@ xfig.3.2.5b.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

sources

@@ -1,2 +1,2 @@
-087a53173d4c092b65b471c99debc6b2  xfig-3.2.6.tar.xz
-f58e3bde288d623c826e1784ebb45de0  xfig-icons.tar.gz
+SHA512 (mcj-xfig-ce9782a404b6a527393839369aac13dcfb66ff16.zip) = a0d483d77edb16d869596a53f89783efd232832b4447089227f34ff552836209f595e5cc9f179242386e85f6f8378607433913720aab29b9d69a2a4007404b47
+SHA512 (xfig-icons.tar.gz) = f7d9b314d57994d479712740dcac4a2c924ddacea028db1c6cdeef36fb7d846885c45d21499f7453c750c265eeb5877e4b032454911ce91667ccc550cb2112e5

xfig-3.2.5-urwfonts.patch

@@ -1,79 +0,0 @@
---- xfig.3.2.4/src/u_fonts.c	2002-09-09 13:36:58.000000000 -0400
-+++ xfig-3.2.4/src/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,23 +0,0 @@
-diff -up xfig-3.2.6/app-defaults/Fig.in~ xfig-3.2.6/app-defaults/Fig.in
---- xfig-3.2.6/app-defaults/Fig.in~	2016-07-23 23:12:46.000000000 +0200
-+++ xfig-3.2.6/app-defaults/Fig.in	2016-08-11 12:36:56.550555744 +0200
-@@ -10,6 +10,10 @@ Fig.version:			@VERSION@
- 
- ! 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
- 
-@@ -38,7 +38,7 @@ 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.appdata.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component type="desktop">
-  <id>xfig.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>MIT</project_license>
-  <name>Xfig</name>
-  <summary>Xfig drawing application</summary>
-  <description>
-    <p>
-      Xfig is an X Window System tool for creating basic vector graphics,
-      including bezier curves, lines, rulers and more.  The resulting
-      graphics can be saved, printed on PostScript printers or converted to
-      a variety of other formats (e.g., X11 bitmaps, Encapsulated
-      PostScript, LaTeX).
-    </p>
-    <p>
-      You should install xfig if you need a simple program to create vector
-      graphics.
-    </p>
-  </description>
-  <url type="homepage">https://en.wikipedia.org/wiki/Xfig</url>
-  <url type="help">http://epb.lbl.gov/xfig/</url>
-  <screenshots>
-    <screenshot type="default">http://mcj.sourceforge.net/images/screen-image.png</screenshot>
-    <screenshot>http://mcj.sourceforge.net/images/library-icon-view.png</screenshot>
-    <screenshot>http://mcj.sourceforge.net/images/file-panel.png</screenshot>
-    <screenshot>http://mcj.sourceforge.net/images/color-panel.png</screenshot>
-    <screenshot>http://mcj.sourceforge.net/images/dimline-panel.png</screenshot>
-  </screenshots>
-  <updatecontact>jwrdegoede_at_fedoraproject.org</updatecontact>
-</component>

xfig.desktop

@@ -1,49 +0,0 @@
-[Desktop Entry]
-Categories=Graphics;
-MimeType=image/fig;image/x-xfig;
-Exec=/usr/bin/xfig %f
-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 绘图应用程序
-Terminal=false
-StartupNotify=false
-Keywords=vector;graphics;figure;drawing;

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.spec

@@ -1,25 +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.6
-Release: 5%{?dist}
+Version: 3.2.9a
+Release: 3.%{commitdate}git%{shortcommit}%{?dist}
 License: MIT
 URL:     https://en.wikipedia.org/wiki/Xfig
-Source0: http://downloads.sourceforge.net/mcj/xfig-%{version}.tar.xz
+#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.appdata.xml
-
-Patch0: xfig-3.2.5a-default-apps.patch
-Patch1: xfig-3.2.5-urwfonts.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
@@ -28,9 +30,13 @@ BuildRequires: libXpm-devel
 BuildRequires: libXt-devel
 BuildRequires: Xaw3d-devel
 BuildRequires: man2html-core ImageMagick
-BuildRequires: desktop-file-utils libappstream-glib
 # For eps preview generation
-Requires: ghostscript-core
+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
 
 # We used to have seperate Xaw3d and non Xaw3d pkgs, now we only have Xaw3d
 Obsoletes: %{name}-common < %{version}-%{release}
@@ -52,21 +58,19 @@ graphics.
 
 
 %prep
-%setup -q -a 1
-%patch0 -p1
-%patch1 -p1
+%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
 # Fedora's Xaw3d is built with -DXAW_ARROW_SCROLLBARS
-# Add -DGSBIT to make eps image previews work
-export CFLAGS="-DXAW_ARROW_SCROLLBARS -DGSBIT $RPM_OPT_FLAGS -fno-strength-reduce -fno-strict-aliasing"
-%configure --enable-xpm-splash
-make %{?_smp_mflags}
+export CFLAGS="-DXAW_ARROW_SCROLLBARS $RPM_OPT_FLAGS -fno-strength-reduce -fno-strict-aliasing"
+%configure
+%make_build
 
 
 %install
@@ -82,41 +86,147 @@ convert %{name}32x32.xpm \
 convert %{name}64x64.xpm \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/appdata
-appstream-util validate-relax --nonet \
-  $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
-
-
-%post
-update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-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
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
 
 %files
 %doc %{_docdir}/%{name}
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_mandir}/man1/%{name}.1*
-%{app_defaults_dir}/Fig
-%{_datadir}/appdata/%{name}.appdata.xml
-%{_datadir}/applications/%{name}.desktop
+%{_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
+* 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
+
+* 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 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
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Feb 26 2024 Hans de Goede <hdegoede@redhat.com> - 3.2.9-4
+- Fix missing Dingbats and Symbol glyphs
+- Resolves: rhbz#2260359
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_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)
+
+* Sat Aug 26 2023 Ranjan Maitra <aarem@fedoraproject.org> - 3.2.9-1
+- New upstream release 3.2.9
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8b-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8b-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8b-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Oct 11 2021 Hans de Goede <hdegoede@redhat.com> - 3.2.8b-1
+- New upstream release 3.2.8b
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.8a-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat May 29 2021 Hans de Goede <hdegoede@redhat.com> - 3.2.8a-1
+- New upstream release 3.2.8a
+
+* 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 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
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7b-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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
+
+* Thu Jan 16 2020 Hans de Goede <hdegoede@redhat.com> - 3.2.7b-1
+- New upstream release 3.2.7b
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7a-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7a-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jan 11 2019 Hans de Goede <hdegoede@redhat.com> - 3.2.7a-2
+- Fix spline drawing (rhbz#1665237)
+
+* 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
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6a-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* 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
+
+* 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
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.6a-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Nov 07 2017 Adam Jackson <ajax@redhat.com> - 3.2.6a-4
+- Drop unneeded BuildRequires: imake
+
+* 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
+
+* 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 Feb 13 2017 Hans de Goede <hdegoede@redhat.com> - 3.2.6a-1
+- New upstream release 3.2.6a
+
 * 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
@@ -145,396 +255,3 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 * 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
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.5-46.c
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Oct  9 2014 Hans de Goede <hdegoede@redhat.com> - 3.2.5-45.c
-- Fix png reading (rhbz#1150330)
-
-* 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
-
-* 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)
-
-* 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
-
-* Mon Jan 06 2014 Michal Srb <msrb@redhat.com> - 3.2.5-41.c
-- Name binaries correctly
-
-* Mon Jan 06 2014 Michal Srb <msrb@redhat.com> - 3.2.5-40.c
-- Use fprintf in safe manner
-
-* Fri Jan 03 2014 David Kaufmann <astra AT ionic DOT at> - 3.2.5-39.c
-- Version bump to 3.2.5-39c
-
-* 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)
-
-* 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
-
-* 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
-
-* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 3.2.5-35.b
-- rebuild due to "jpeg8-ABI" feature drop
-
-* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 3.2.5-34.b
-- rebuild against new libjpeg
-
-* 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
-
-* 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)
-
-* 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
-
-* Sun Feb 26 2012 Orion Poplawski <orion@cora.nwra.com> - 3.2.5-30.b
-- Rebuild with Xaw3d 1.6.1
-
-* Tue Feb 14 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 3.2.5-29.b
-- Add patch from Debian for libpng 1.5
-
-* 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
-
-* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 3.2.5-27.b
-- Rebuild for new libpng
-
-* 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
-
-* Mon Dec  6 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.2.5-25.b
-- Fix buffer overflow when opening malicious fig files
-
-* Thu Nov 25 2010 Hans de Goede <hdegoede@redhat.com> 3.2.5-24.b
-- Fix importing of eps files (#657290)
-
-* 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
-
-* 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
-
-* Sun Jun 28 2009 Caolán McNamara <caolanm@redhat.com> 3.2.5-21.a
-- Resolves: rhbz#506791 make xfig spellchecking work
-
-* Wed Jun  3 2009 Hans de Goede <hdegoede@redhat.com> 3.2.5-20.a
-- Fix eps preview (#503911)
-
-* 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
-
-* 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 ??)
-
-* 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
-
-* 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)
-
-* 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
-
-* Sun Feb 22 2009 Hans de Goede <hdegoede@redhat.com> 3.2.5-14
-- Add missing Requires: xorg-x11-fonts-base (#486701)
-
-* 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
-
-* Tue Nov  4 2008 Hans de Goede <hdegoede@redhat.com> 3.2.5-12
-- Various small specfile cleanups from merge review
-
-* Mon Jul 14 2008 Ian Hutchinson <ihutch@mit.edu> 3.2.5-11
-- Fix incorrect height of modepanel.
-
-* Thu Apr  3 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 3.2.5-10
-- Fix missing prototype compiler warnings
-
-* 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)
-
-* 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