[packages/transfig] - updated to 3.2.6a (released under fig2dev name - moved fig2dev to separate package, transfig is op

qboosh qboosh at pld-linux.org
Sun Jul 30 13:40:16 CEST 2017 

commit c01a43797a4653f9cb6ba17cf4af306c3d9b8330
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Jul 30 13:42:12 2017 +0200

    - updated to 3.2.6a (released under fig2dev name - moved fig2dev to separate package, transfig is optional now)
    - updated broken patch
    - removed obsolete config,maxfontsize,format_string patches

 transfig-3.2.5c-maxfontsize.patch |  44 --------------
 transfig-broken.patch             |  26 ++++----
 transfig-config.patch             |  63 -------------------
 transfig-format_string.patch      |  54 -----------------
 transfig.spec                     | 123 +++++++++++++++++++-------------------
 5 files changed, 75 insertions(+), 235 deletions(-)
---
diff --git a/transfig.spec b/transfig.spec
index 6ae1aae..0338281 100644
--- a/transfig.spec
+++ b/transfig.spec
@@ -1,3 +1,6 @@
+# NOTE: since 3.2.6 official package name is "fig2dev" and transfig considered obsolete.
+# TODO: Fork fig2dev.spec from transfig.spec when they stop shipping transfig with fig2dev
+#       (and keep the last version of transfig here).
 Summary:	Converts .fig files (such as those from xfig) to other formats
 Summary(de.UTF-8):	Konvertiert .fig-Dateien (z.B. aus xfig) in andere Formate
 Summary(es.UTF-8):	Convierte archivos .fig (como los del xfig) para otros formatos
@@ -8,29 +11,20 @@ Summary(ru.UTF-8):	Конвертор файлов .fig (формат прогр
 Summary(tr.UTF-8):	fig dosyalarını başka biçimlere dönüştürür
 Summary(uk.UTF-8):	Конвертор файлів .fig (формат програми xfig) в інші формати
 Name:		transfig
-Version:	3.2.5e
-Release:	3
+Version:	3.2.6a
+Release:	1
 Epoch:		1
 License:	distributable
 Group:		X11/Applications/Graphics
-#Source0Download: http://xfig.org/art15.html
-# Source0:	http://xfig.org/software/xfig/%{version}/%{name}.%{version}.tar.gz
-Source0:	http://downloads.sourceforge.net/mcj/%{name}.%{version}.tar.gz
-# Source0-md5:	f547c67a93422c72039204f159f53ea9
-Patch0:		%{name}-config.patch
-Patch1:		%{name}-broken.patch
-Patch2:		%{name}-3.2.5c-maxfontsize.patch
-Patch3:		%{name}-format_string.patch
-URL:		http://xfig.org/
+Source0:	http://downloads.sourceforge.net/mcj/fig2dev-%{version}.tar.xz
+# Source0-md5:	f795a492cd9fa6d9abe0e11e581946f9
+Patch0:		%{name}-broken.patch
+URL:		http://mcj.sourceforge.net/
 BuildRequires:	libpng-devel
-BuildRequires:	rman
-BuildRequires:	xorg-cf-files
-BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	xorg-lib-libXpm-devel
-BuildRequires:	xorg-util-gccmakedep
-BuildRequires:	xorg-util-imake
-Requires:	fonts-Type1-urw
-Requires:	ghostscript
+BuildRequires:	xz
+Requires:	fig2dev = %{version}-%{release}
 Conflicts:	netpbm-progs < 9.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -83,66 +77,73 @@ програмою xfig) чи PIC у задану графічну мову си
 TeX документів, які є портабельними (тобто, можуть бути надруковані на
 різноманітних платформах).
 
+%package -n fig2dev
+Summary:	Tools for creating portable TeX documents with graphics
+Summary(pl.UTF-8):	Narzędzia do tworzenia przenośnych dokumentów TeXa z grafiką
+Epoch:		0
+Group:		Applications/Graphics
+Requires:	fonts-Type1-urw
+Requires:	ghostscript
+
+%description -n fig2dev
+Fig2dev is a set of tools for creating TeX documents with graphics
+which are portable, in the sense that they can be printed in a wide
+variety of environments.
+
+%description -n fig2dev -l pl.UTF-8
+Fig2dev to zbiór narzędzi do tworzenia dokumentów TeXa z grafiką,
+które są przenośne - w takim sensie, że mogą być drukowane w wielu
+różnych środowiskach.
+
 %prep
-%setup -q -n %{name}.%{version}
+%setup -q -n fig2dev-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
-xmkmf
-make Makefiles LIBDIR=%{_libdir}/X11
-
-%{__make} \
-%ifarch alpha
-	EXTRA_DEFINES="-Dcfree=free" \
-%endif
-	CC="%{__cc}" \
-	CDEBUGFLAGS="%{rpmcflags}" \
-	DOCDIR=%{_docdir} \
-	LOCAL_LDFLAGS="%{rpmldflags}" \
-	BINDIR=%{_bindir} \
-	MANPATH=%{_mandir} \
-	XFIGLIBDIR=%{_datadir}/xfig \
-	FIG2DEV_LIBDIR=%{_datadir}/fig2dev
+%configure \
+	--enable-transfig
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install install.man \
-	DESTDIR=$RPM_BUILD_ROOT \
-	BINDIR=%{_bindir} \
-	DOCDIR=%{_docdir} \
-	MANPATH=%{_mandir} \
-	XFIGLIBDIR=%{_datadir}/xfig \
-	FIG2DEV_LIBDIR=%{_datadir}/fig2dev
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/transfig
+%{_mandir}/man1/transfig.1*
+
+%files -n fig2dev
+%defattr(644,root,root,755)
 %doc CHANGES NOTES README
 %attr(755,root,root) %{_bindir}/fig2dev
 %attr(755,root,root) %{_bindir}/fig2ps2tex
-%attr(755,root,root) %{_bindir}/fig2ps2tex.sh
 %attr(755,root,root) %{_bindir}/pic2tpic
-%attr(755,root,root) %{_bindir}/transfig
 %dir %{_datadir}/fig2dev
+%{_datadir}/fig2dev/rgb.txt
+%{_datadir}/fig2dev/bitmaps
+%dir %{_datadir}/fig2dev/i18n
 # other latin-2 files are symlinks to cs_CZ.ps
-%lang(cs,hr,hu,pl,ro,sk,sl) %{_datadir}/fig2dev/cs*.ps
-%lang(hr) %{_datadir}/fig2dev/hr*.ps
-%lang(hu) %{_datadir}/fig2dev/hu*.ps
-%lang(ja) %{_datadir}/fig2dev/ja*.ps
-%lang(ko) %{_datadir}/fig2dev/ko*.ps
-%lang(pl) %{_datadir}/fig2dev/pl*.ps
-%lang(ro) %{_datadir}/fig2dev/ro*.ps
-%lang(sk) %{_datadir}/fig2dev/sk*.ps
-%lang(sl) %{_datadir}/fig2dev/sl*.ps
-%dir %{_datadir}/xfig
-%{_datadir}/xfig/*.bmp
-%{_mandir}/man1/fig2dev.1x*
-%{_mandir}/man1/fig2ps2tex.1x*
-%{_mandir}/man1/pic2tpic.1x*
-%{_mandir}/man1/transfig.1x*
+%lang(cs,hr,hu,pl,ro,sk,sl) %{_datadir}/fig2dev/i18n/cs_CZ.ps
+%lang(hr) %{_datadir}/fig2dev/i18n/hr_HR.ps
+%lang(hu) %{_datadir}/fig2dev/i18n/hu_HU.ps
+%lang(ja) %{_datadir}/fig2dev/i18n/japanese.ps
+%lang(ja) %{_datadir}/fig2dev/i18n/ja.ps
+%lang(ja) %{_datadir}/fig2dev/i18n/ja_JP*.ps
+%lang(ko) %{_datadir}/fig2dev/i18n/korean.ps
+%lang(ko) %{_datadir}/fig2dev/i18n/ko.ps
+%lang(ko) %{_datadir}/fig2dev/i18n/ko_KR*.ps
+%lang(pl) %{_datadir}/fig2dev/i18n/pl_PL.ps
+%lang(ro) %{_datadir}/fig2dev/i18n/ro_RO.ps
+%lang(ru) %{_datadir}/fig2dev/i18n/ru_RU*.ps
+%lang(sk) %{_datadir}/fig2dev/i18n/sk_SK.ps
+%lang(sl) %{_datadir}/fig2dev/i18n/sl_SI.ps
+%{_mandir}/man1/fig2dev.1*
+%{_mandir}/man1/fig2ps2tex.1*
+%{_mandir}/man1/pic2tpic.1*
diff --git a/transfig-3.2.5c-maxfontsize.patch b/transfig-3.2.5c-maxfontsize.patch
deleted file mode 100644
index 9ce105f..0000000
--- a/transfig-3.2.5c-maxfontsize.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_maxfontsize.dpatch by Roland Rosenfeld <roland at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: For fonts >=42pt use the given font size in TeX instead of
-## DP: restricting this to 42pt. This allows to create posters using
-## DP: \usepackage{type1cm}. See
-## DP: http://linuxgazette.vlsm.org/issue96/artime.html and Bug#343139
-
- at DPATCH@
-diff -urNad transfig~/LATEX.AND.XFIG transfig/LATEX.AND.XFIG
---- transfig~/LATEX.AND.XFIG
-+++ transfig/LATEX.AND.XFIG
-@@ -55,7 +55,7 @@
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% LaTeX Preamble %%%%%%%%%%%%%%%%%%%%%%%%%
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-  
--\documentstyle[12pt,bezier,amstex]{article}  % include bezier curves
-+\documentclass[12pt,bezier,amstex]{article}  % include bezier curves
- \renewcommand\baselinestretch{1.0}           % single space
- \pagestyle{empty}                            % no headers and page numbers
- \oddsidemargin -10 true pt      % Left margin on odd-numbered pages.
-@@ -72,7 +72,9 @@
- \usepackage{epsfig}
- 
- \usepackage{graphicx}           % Graphics package
-- 
-+
-+\usepackage{type1cm}            % Necessary for fonts bigger than 42pt
-+
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Document Beginning %%%%%%%%%%%%%%%%%%%%%
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-diff -urNad transfig~/fig2dev/dev/texfonts.h transfig/fig2dev/dev/texfonts.h
---- transfig~/fig2dev/dev/texfonts.h
-+++ transfig/fig2dev/dev/texfonts.h
-@@ -86,6 +86,7 @@
- 
- #define TEXFONTSIZE(S)	(texfontsizes[((S) <= MAXFONTSIZE) ? (int)(round(S))\
- 				      				: (MAXFONTSIZE-1)])
-+#define TEXFONTSIZE(S)	(((S) <= MAXFONTSIZE) ? texfontsizes[(int)(round(S))] : (S))
- #define TEXFONTMAG(T)	TEXFONTSIZE(T->size*(rigid_text(T) ? 1.0 : fontmag))
- 
- void setfigfont( F_text *text );		/* genepic.c */
diff --git a/transfig-broken.patch b/transfig-broken.patch
index c1c4fbb..8070673 100644
--- a/transfig-broken.patch
+++ b/transfig-broken.patch
@@ -1,6 +1,6 @@
---- transfig.3.2.5_alpha7/fig2dev/dev/genemf.c.orig	2004-02-10 17:32:02.000000000 +0100
-+++ transfig.3.2.5_alpha7/fig2dev/dev/genemf.c	2006-10-28 00:20:55.363664750 +0200
-@@ -683,7 +683,7 @@
+--- fig2dev-3.2.6a/fig2dev/dev/genemf.c.orig	2017-01-07 23:07:15.000000000 +0100
++++ fig2dev-3.2.6a/fig2dev/dev/genemf.c	2017-07-29 18:19:49.027329674 +0200
+@@ -696,7 +696,7 @@
  static void shape();
  static void shape_interior();
  static void textunicode();
@@ -8,17 +8,17 @@
 +static void textfunc();
  static void textcolr();
  static void textalign();
- #if defined(I18N) && defined(USE_ICONV)
-@@ -3000,7 +3000,7 @@
- }/* end textunicode */
+ #if defined(I18N) && defined(HAVE_ICONV)
+@@ -3020,7 +3020,7 @@
  
  
--static void text(x, y, bbx, str)
-+static void textfunc(x, y, bbx, str)
-     int     x, y;		/* reference point */
-     RECTL  *bbx;		/* bounding box */
-     char   *str;
-@@ -3482,7 +3482,7 @@
+ static void
+-text(
++textfunc(
+ 	int x,
+ 	int y,		/* reference point */
+ 	RECTL *bbx,	/* bounding box */
+@@ -3506,7 +3506,7 @@
  		bak = *s1;
  		*s1 = '\0';
  
@@ -27,7 +27,7 @@
  
  		*s1 = bak;
  	    }
-@@ -3508,7 +3508,7 @@
+@@ -3532,7 +3532,7 @@
      }
  
      textfont(font, t->size, round(t->angle * RAD_01DEG));
diff --git a/transfig-config.patch b/transfig-config.patch
deleted file mode 100644
index 7306b31..0000000
--- a/transfig-config.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- transfig.3.2.5_alpha7/fig2dev/Imakefile.orig	2005-10-27 18:56:02.000000000 +0200
-+++ transfig.3.2.5_alpha7/fig2dev/Imakefile	2006-10-28 00:17:31.890948500 +0200
-@@ -34,7 +34,7 @@
- XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled
- XCOMM and installed xfig.
- 
--XFIGLIBDIR =	/usr/local/lib/X11/xfig
-+XFIGLIBDIR =	/usr/share/xfig
- 
- XCOMM ******
- XCOMM If your system doesn't have the strerror() function (has sys_errlist) then
-@@ -62,7 +62,7 @@
- XCOMM the full name (rgb.txt) now.
- XCOMM
- 
--RGB = $(LIBDIR)/rgb.txt
-+RGB = /usr/share/X11/rgb.txt
- 
- XCOMM Comment out the following #define USEPNG if you don't want PNG support
- XCOMM Uncomment the #define for USEPNG if you want to be able to import
-@@ -76,7 +76,7 @@
- #ifdef USEPNG
- PNGLIBDIR = $(USRLIBDIR)
- ZLIBDIR = $(USRLIBDIR)
--PNGINC = -I/usr/include/X11
-+PNGINC =
- #endif
- 
- XCOMM ****************
-@@ -141,7 +141,7 @@
- 
- #ifdef I18N
- I18N_DEFS = -DI18N 
--FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
-+FIG2DEV_LIBDIR = /usr/share/fig2dev
- I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR) -DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\"
- 
- #endif /* I18N */
-@@ -150,7 +150,7 @@
- XCOMM *** You shouldn't have to change anything below this point ***
- XCOMM **************************************************************
- 
--DIR_DEFS=	-DBITMAPDIR=\\\"$(DESTDIR)$(XFIGLIBDIR)/bitmaps\\\"
-+DIR_DEFS=	-DBITMAPDIR=\\\"$(DESTDIR)$(XFIGLIBDIR)\\\"
- 
- #ifdef USEPNG
- DUSEPNG = -DUSE_PNG
-@@ -225,11 +225,11 @@
- XCOMM Install the tk bitmaps here
- install::
- 	@(cd bitmaps ; \
--	if [ -d $(DESTDIR)$(XFIGLIBDIR)/bitmaps ]; then set +x; \
--	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/bitmaps ); fi ; \
--	echo Copying bitmap files for tk to $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \
-+	if [ -d $(DESTDIR)$(XFIGLIBDIR) ]; then set +x; \
-+	else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR) ); fi ; \
-+	echo Copying bitmap files for tk to $(DESTDIR)$(XFIGLIBDIR) ; \
- 	for f in * ; do \
--	      $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \
-+	      $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR) ; \
- 	done) ; 
- 
- install.all::
diff --git a/transfig-format_string.patch b/transfig-format_string.patch
deleted file mode 100644
index 66edac5..0000000
--- a/transfig-format_string.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -dur transfig.3.2.5e.orig/fig2dev/dev/gencgm.c transfig.3.2.5e/fig2dev/dev/gencgm.c
---- transfig.3.2.5e.orig/fig2dev/dev/gencgm.c	2003-09-20 01:03:48.000000000 +0200
-+++ transfig.3.2.5e/fig2dev/dev/gencgm.c	2013-10-05 19:08:48.115907807 +0200
-@@ -139,7 +139,7 @@
-   
-   if (from) {
- 	figname = malloc(strlen(from)+1);
--	sprintf(figname, from);
-+	sprintf(figname, "%s", from);
- 	p = strrchr(figname, '/');
- 	if (p) 
- 	    figname = p+1;		/* remove path from name for comment in file */
-diff -dur transfig.3.2.5e.orig/fig2dev/dev/genmp.c transfig.3.2.5e/fig2dev/dev/genmp.c
---- transfig.3.2.5e.orig/fig2dev/dev/genmp.c	2007-04-02 23:45:34.000000000 +0200
-+++ transfig.3.2.5e/fig2dev/dev/genmp.c	2013-10-05 19:09:24.866177569 +0200
-@@ -1150,7 +1150,7 @@
- 	    }
- 	} else {
- 	    /* special text in latex mode: just write the text. */
--	    fprintf(tfp, t->cstring);
-+	    fprintf(tfp, "%s", t->cstring);
- 	}
- 	fprintf(tfp," etex;\n");
- 
-@@ -1164,7 +1164,7 @@
- 
- 	fprintf(tfp,"  picture q;\n");
- 	fprintf(tfp,"  q=thelabel.urt(\"");
--        fprintf(tfp, t->cstring);
-+        fprintf(tfp, "%s", t->cstring);
- 	fprintf(tfp, "\" infont ");
- 	if (t->font<0) {
- 	    fprintf(tfp, "defaultfont");
-diff -dur transfig.3.2.5e.orig/fig2dev/trans_spline.c transfig.3.2.5e/fig2dev/trans_spline.c
---- transfig.3.2.5e.orig/fig2dev/trans_spline.c	2004-03-29 20:54:40.000000000 +0200
-+++ transfig.3.2.5e/fig2dev/trans_spline.c	2013-10-05 19:08:48.115907807 +0200
-@@ -648,7 +648,7 @@
-     F_control	   *cp;
- 
-     if ((cp = (F_control *) malloc(CONTROL_SIZE)) == NULL)
--	fprintf(stderr,Err_mem);
-+	fprintf(stderr,"%s",Err_mem);
-     return cp;
- }
- 
-@@ -659,7 +659,7 @@
-     F_line	   *l;
- 
-     if ((l = (F_line *) malloc(LINOBJ_SIZE)) == NULL)
--	fprintf(stderr,Err_mem);
-+	fprintf(stderr,"%s",Err_mem);
-     l->pic = NULL;
-     l->next = NULL;
-     l->for_arrow = NULL;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/transfig.git/commitdiff/c01a43797a4653f9cb6ba17cf4af306c3d9b8330

More information about the pld-cvs-commit mailing list