From f0a600a6e803bd6f21df41002a533bba892d9aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 6 May 2009 21:03:43 +0000 Subject: [PATCH] - Get rid of csh dependency, add missing one on bc (#435993). - Build with $RPM_OPT_FLAGS (#329831). - Convert specfile to UTF-8. - Add URL, fix source URL. - Escape macros in changelog. - Improve summary. --- transfig-3.2.5-optflags.patch | 12 ++++++++++++ transfig.spec | 32 +++++++++++++++++++++----------- 2 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 transfig-3.2.5-optflags.patch diff --git a/transfig-3.2.5-optflags.patch b/transfig-3.2.5-optflags.patch new file mode 100644 index 0000000..c8a9c90 --- /dev/null +++ b/transfig-3.2.5-optflags.patch @@ -0,0 +1,12 @@ +diff -up transfig.3.2.5/Imakefile~ transfig.3.2.5/Imakefile +--- transfig.3.2.5/Imakefile~ 2003-03-25 22:48:02.000000000 +0200 ++++ transfig.3.2.5/Imakefile 2009-05-04 22:12:20.000000000 +0300 +@@ -22,7 +22,7 @@ XCOMM to make transfig and fig2dev: + XCOMM type "xmkmf", "make Makefiles", "make" then "make install" + + #define IHaveSubdirs +-#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' ++#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS) $(RPM_OPT_FLAGS)' + + DEPLIBS = + SUBDIRS = fig2dev transfig diff --git a/transfig.spec b/transfig.spec index c647e5b..7d37abc 100644 --- a/transfig.spec +++ b/transfig.spec @@ -1,16 +1,19 @@ -Summary: A utility for converting FIG files (made by xfig) to other formats. +Summary: Utility for converting FIG files (made by xfig) to other formats Name: transfig Version: 3.2.5 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 License: MIT +URL: http://www.xfig.org/ Group: Applications/Multimedia -Source: ftp://www-epb.lbl.gov/xfig/%{name}.%{version}.tar.gz +Source0: http://downloads.sourceforge.net/mcj/%{name}.%{version}.tar.gz +Patch0: transfig-3.2.5-optflags.patch Patch5: transfig-3.2.5-modularX.patch Patch6: transfig-3.2.5-bitmap.patch Requires: ghostscript +Requires: bc BuildRequires: libpng-devel BuildRequires: libjpeg-devel @@ -32,6 +35,7 @@ figures into certain graphics languages. %prep %setup -q -n %{name}.%{version} +%patch0 -p1 -b .optflags %patch5 -p1 -b .modularX %patch6 -p1 -b .bitmap # fix source permissions @@ -47,11 +51,9 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install install.man -# Dunno why these are not installed -for i in fig2ps2tex fig2ps2tex.sh pic2tpic -do - install -c -m 755 fig2dev/$i.script %{buildroot}%{_bindir}/$i -done +# fig2ps2tex{,.sh} are equivalent, use the sh one +mv %{buildroot}%{_bindir}/fig2ps2tex.sh %{buildroot}%{_bindir}/fig2ps2tex +ln -s fig2ps2tex %{buildroot}%{_bindir}/fig2ps2tex.sh %clean rm -rf %{buildroot} @@ -69,6 +71,14 @@ rm -rf %{buildroot} %{_datadir}/fig2dev %changelog +* Tue May 5 2009 Ville Skyttä - 1:3.2.5-7 +- Get rid of csh dependency, add missing one on bc (#435993). +- Build with $RPM_OPT_FLAGS (#329831). +- Convert specfile to UTF-8. +- Add URL, fix source URL. +- Escape macros in changelog. +- Improve summary. + * Wed Feb 25 2009 Fedora Release Engineering - 1:3.2.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild @@ -193,7 +203,7 @@ rm -rf %{buildroot} * Wed Jul 12 2000 Prospector - automatic rebuild -* Tue Jun 13 2000 Trond Eivind Glomsrød +* Tue Jun 13 2000 Trond Eivind Glomsrød - make it build as nobody. Imake sucks. - include LATEX.AND.XFIG - use %%{_tmppath} @@ -202,7 +212,7 @@ rm -rf %{buildroot} - add enable_japanese option, disable it for now. * Sun Apr 16 2000 Bryan C. Andregg -- new version to support -b and -g which xfig uses +- new version to support -b and -g which xfig uses * Mon Feb 7 2000 Bill Nottingham - handle compressed manpages @@ -217,7 +227,7 @@ rm -rf %{buildroot} - update to 3.2.1. * Sat Jun 27 1998 Jeff Johnson -- add %clean. +- add %%clean. * Mon Apr 27 1998 Prospector System - translations modified for de, fr, tr