diff --git a/.gitignore b/.gitignore index 99a5cf2..d2ff6f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ transfig.3.2.5c.tar.gz /transfig.3.2.5d.tar.gz +/fig2dev-3.2.6.tar.xz diff --git a/sources b/sources index 9bd4683..bc1bbfd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9eac7f265668ecbfda6aaf7581989ad transfig-3.2.5d.tar.gz +a6b21df380087d32a0d126db64c02b24 fig2dev-3.2.6.tar.xz diff --git a/transfig.spec b/transfig.spec index e1be2d1..0c87430 100644 --- a/transfig.spec +++ b/transfig.spec @@ -1,21 +1,13 @@ Summary: Utility for converting FIG files (made by xfig) to other formats Name: transfig -Version: 3.2.5d -Release: 18%{?dist} +Version: 3.2.6 +Release: 1%{?dist} Epoch: 1 License: MIT URL: http://www.xfig.org/ Group: Applications/Multimedia -Source0: https://sourceforge.net/projects/kanapi/files/sources/RELEASES/2014/%{name}-%{version}.tar.gz - -Patch0: transfig-3.2.5-optflags.patch -Patch1: transfig-3.2.5-modularX.patch -Patch2: transfig-3.2.5-bitmap.patch -Patch3: transfig-3.2.5d-bz728825.patch -Patch4: transfig-3.2.5-libpng.patch -Patch5: transfig-3.2.5d-CVE-2009-4227.patch -Patch6: transfig-3.2.5d-bz1037365.patch -Patch7: transfig-3.2.5d-bz1282615.patch +#Source0: https://sourceforge.net/projects/mcj/files/fig2dev-3.2.6.tar.xz/download +Source0: http://downloads.sourceforge.net/mcj/fig2dev-%{version}.tar.xz Requires: ghostscript Requires: bc @@ -36,48 +28,34 @@ Install transfig if you need a utility for translating FIG or PIC figures into certain graphics languages. %prep -%setup -q -n %{name}.%{version} - -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -b .libpng -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 - -# fix source permissions -find -type f -exec chmod -x {} \; - -# remove garbage -rm -f doc/manual/Makefile.orig doc/fig2dev.1.orig +%setup -q -n fig2dev-%{version} %build -xmkmf -make Makefiles -make +#xmkmf +#make Makefiles +%configure --enable-transfig +make %{?_smp_mflags} + %install -make DESTDIR=%{buildroot} MANSUFFIX=1 install install.man - -# fig2ps2tex{,.sh} are equivalent, use the sh one -mv %{buildroot}%{_bindir}/fig2ps2tex.sh %{buildroot}%{_bindir}/fig2ps2tex -ln -s fig2ps2tex %{buildroot}%{_bindir}/fig2ps2tex.sh -ln -s fig2ps2tex.1 %{buildroot}%{_mandir}/man1/fig2ps2tex.sh.1 +%make_install %files -%doc CHANGES NOTES README LATEX.AND.XFIG %{_bindir}/transfig %{_bindir}/fig2dev %{_bindir}/fig2ps2tex -%{_bindir}/fig2ps2tex.sh %{_bindir}/pic2tpic -%{_mandir}/man1/* -%{_datadir}/xfig -%{_datadir}/fig2dev +%{_datadir}/fig2dev/bitmaps/*.bmp +%{_datadir}/fig2dev/i18n/*.ps +%{_datadir}/fig2dev/rgb.txt +%{_mandir}/man1/*.1.gz + %changelog +* Fri Aug 12 2016 Jozef Mlich - 1:3.2.6-1 +- Resolves #1366524 + rebase to fig2dev 3.2.6 + * Thu Mar 31 2016 Tomas Repik - 1:3.2.5d-18 - reading alpha channel of png files properly (#1282615)