2014-10-11 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* transfig, xfig: update
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9003 ec354946-7b23-47d6-9f5a-488ba84defc7

t/transfig/transfig-vl.spec

@@ -1,21 +1,24 @@
-%define ver 3.2.5
+%define ver 3.2.5e
 
 Summary: A utility for converting FIG files (made by xfig) to other formats.
-Summary(ja): xfig で作った FIG ファイル変換ユーティリティ
+Summary(ja): Xfig で作った FIG ファイル変換ユーティリティ
 Name: transfig
 Version: %{ver}
 Release: 1%{?_dist_release}
-License: distributable
+License: MIT
 Group: Applications/Graphics
-Source: ftp://ftp.x.org/contrib/applications/drawing_tools/transfig/transfig.%{version}.tar.gz
+URL: http://www.xfig.org/
+
+Source: http://downloads.sourceforge.net/mcj/%{name}.%{ver}.tar.gz
 Patch0: transfig-3.2.5-optflags.patch
 Patch5: transfig-3.2.5-modularX.patch
 Patch6: transfig-3.2.5-bitmap.patch
 Patch10: transfig-3.2.5-buildfix.patch
+Patch11: transfig-3.2.5d-bz1037365.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libXpm-devel
 BuildRequires: libpng-devel >= 1.2.5
-BuildRequires: libjpeg-devel
 BuildRequires: imake
 %{?nosrc:NoSource:     0}
 
@@ -34,6 +37,13 @@ variety of environments.
 %patch5 -p1 -b .modularX
 %patch6 -p1 -b .bitmap
 %patch10 -p1 -b .buildfix
+%patch11 -p1
+
+# fix source permissions
+find -type f -exec chmod -x {} \;
+
+# remove garbage
+rm -f doc/manual/Makefile.orig doc/fig2dev.1.orig
 
 %build
 xmkmf
@@ -69,6 +79,12 @@ ln -s fig2ps2tex %{buildroot}%{_bindir}/fig2ps2tex.sh
 %{_datadir}/fig2dev
 
 %changelog
+* Tue Oct  7 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.2.5e-1
+- updated to 3.2.5e
+- added Patch11 from Fedora
+  - make it compile with -Werror=format-security (#1037365)
+- built with libpng-1.6.12
+
 * Sat Aug 29 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 3.2.5-1
 - spec in utf-8, new versioning policy
 - build for modular X

x/xfig/xfig-vl.spec

@@ -3,44 +3,48 @@
 
 Summary: An X Window System tool for drawing basic vector graphics.
 Name: xfig
-Version: 3.2.5b
+Version: 3.2.5c
 Release: 1%{?_dist_release}
-License: Freeware
+License: MIT
 Group: Applications/Graphics
-Url: http://www.xfig.org/
+URL: http://www.xfig.org/
 Source0: http://www.xfig.org/xfigdist/xfig.%{version}.full.tar.gz
-Source1: xfig.png
+Source1: xfig-icons.tar.gz
 Source2: xfig.desktop
 Source3: xfig.sh
 Source4: Fig.ad.ja
 
 Patch0: xfig-3.2.5a-default-apps.patch
-Patch1: xfig-3.2.5-fhs.patch
-Patch7: xfig.3.2.5-modularX.patch
-Patch9: xfig.3.2.5-Xaw3d.patch
-Patch10: xfig-3.2.5-enable-Xaw3d.patch
-Patch13: xfig-3.2.5-urwfonts.patch
-Patch19: xfig-3.2.5-debian.patch
-
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
+Patch1: xfig-3.2.5-Imakefile.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
+
+Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: desktop-file-utils
+BuildRequires: freetype2-devel
 BuildRequires: imake
 BuildRequires: libICE-devel
 BuildRequires: libSM-devel
 BuildRequires: libX11-devel
-BuildRequires: libXaw-devel
-BuildRequires: libXext-devel
-BuildRequires: libXi-devel
+BuildRequires: libXaw3dXft-devel
 BuildRequires: libXmu-devel
 BuildRequires: libXpm-devel
 BuildRequires: libXt-devel
-BuildRequires: Xaw3d-devel
-BuildRequires: desktop-file-utils
+BuildRequires: libjpeg-devel
+BuildRequires: libpng-devel
+BuildRequires: zlib-devel
 
-Buildroot: %{_tmppath}/%{name}-root
-Requires: transfig >= 3.2.5
-Requires: xdg-utils, enchant, urw-fonts
 Requires: hicolor-icon-theme
+Requires: transfig >= 3.2.5
+Requires: urw-fonts
+Requires: xdg-utils
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -53,19 +57,35 @@ a variety of other formats (e.g., X11 bitmaps, Encapsulated
 PostScript, LaTeX).
 
 %prep
-%setup -q -n xfig.%{version}
+%setup -q -n xfig.%{version} -a 1 
 %patch0 -p1 -b .redhat
-%patch1 -p1 -b .fhs
-%patch7 -p1 -b .modularX
-%patch9 -p1 -b .Xaw3d
-%patch10 -p1 -b .no-Xaw3d
-%patch13 -p1 -b .urw
-%patch19 -p1
+%patch1 -p1 -b .Imakefile
+#patch7 -p1 -b .modularX
+#patch9 -p1 -b .Xaw3d
+#patch10 -p1 -b .no-Xaw3d
+#patch13 -p1 -b .urw
+#patch19 -p1
+%patch3 -p1 -b .urw
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -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`
+
+# fix for building libXaw3dXft
+sed -i 's/X11\/Xaw3d\//X11\/Xaw3dxft\//' *.h *.c
+sed -i 's/-lXaw3d/-lXaw3dxft/' Imakefile
+
 
 %build
 xmkmf
 make XFIGDOCDIR=%{_docdir}/%{name}-%{version} \
+     INCLUDES=`pkg-config --cflags freetype2`  \
      CDEBUGFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strength-reduce -fno-strict-aliasing"
 
 %install
@@ -78,18 +98,19 @@ install -p -m 644 CHANGES README LATEX.AND.XFIG* FIGAPPS \
 
 # remove the map generation scripts, these are for xfig developers only
 rm %{buildroot}%{_datadir}/%{name}/Libraries/Maps/{USA,Canada}/assemble
+# remove app-defaults symlink which gets installed
+rm $RPM_BUILD_ROOT%{_prefix}/lib*/X11/app-defaults
 
-mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps \
-         %{buildroot}%{_datadir}/applications
-
-install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps
-
-desktop-file-install --vendor ""         \
-  --dir %{buildroot}%{_datadir}/applications \
-  %{SOURCE2}
+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
 
-# remove app-defaults symlink which gets installed
-rm %{buildroot}%{_prefix}/lib*/X11/app-defaults
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install          \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
 
 
 %clean
@@ -118,10 +139,16 @@ fi
 %{_mandir}/*/*
 %{_datadir}/X11/app-defaults/*
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/??x??/apps/%{name}.xpm
 
 
 %changelog
+* Sat Oct 11 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.2.5c-1
+- updated to 3.2.5c
+- updated Source1
+- added Patch 4-9 from Fedora and dropt Patch7, 9, 10 and 19
+- build with libXaw3dXft
+
 * Thu Sep 03 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 3.2.5-1
 - new usptream release
 - build with modular X