diff --git a/.cvsignore b/.cvsignore index 9de7ff7..82c97f1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -transfig.3.2.4.tar.gz -transfig.3.2.5.tar.gz +transfig.3.2.5c.tar.gz diff --git a/sources b/sources index ed83e2d..8215a78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b2cffdd25529ae5877e305f29aae6d1 transfig.3.2.5.tar.gz +0cc55ed6b4ae67a3e610e501acd694f9 transfig.3.2.5c.tar.gz diff --git a/transfig-3.2.5-bitmap.patch b/transfig-3.2.5-bitmap.patch index 125d01d..2948abb 100644 --- a/transfig-3.2.5-bitmap.patch +++ b/transfig-3.2.5-bitmap.patch @@ -1,7 +1,8 @@ -diff -Naur transfig.3.2.5-modularX/fig2dev/Imakefile transfig.3.2.5/fig2dev/Imakefile ---- transfig.3.2.5-modularX/fig2dev/Imakefile 2008-11-26 10:02:04.000000000 +0100 -+++ transfig.3.2.5/fig2dev/Imakefile 2008-11-26 10:02:55.000000000 +0100 -@@ -229,7 +229,7 @@ +diff --git a/fig2dev/Imakefile b/fig2dev/Imakefile +index 2f76e0b..7e07c39 100755 +--- a/fig2dev/Imakefile ++++ b/fig2dev/Imakefile +@@ -229,7 +229,7 @@ install:: else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/bitmaps ); fi ; \ echo Copying bitmap files for tk to $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \ for f in * ; do \ diff --git a/transfig-3.2.5-dsc3.0.patch b/transfig-3.2.5-dsc3.0.patch new file mode 100644 index 0000000..20a60a1 --- /dev/null +++ b/transfig-3.2.5-dsc3.0.patch @@ -0,0 +1,57 @@ +diff --git a/fig2dev/dev/genps.c b/fig2dev/dev/genps.c +index c7c9e62..00065f2 100644 +--- a/fig2dev/dev/genps.c ++++ b/fig2dev/dev/genps.c +@@ -594,9 +594,9 @@ F_compound *objects; + } + + if (epsflag) +- fprintf(tfp, "%%!PS-Adobe-2.0 EPSF-2.0\n"); /* Encapsulated PostScript */ ++ fprintf(tfp, "%%!PS-Adobe-3.0 EPSF-3.0\n"); /* Encapsulated PostScript */ + else +- fprintf(tfp, "%%!PS-Adobe-2.0\n"); /* PostScript magic strings */ ++ fprintf(tfp, "%%!PS-Adobe-3.0\n"); /* PostScript magic strings */ + + if (gethostname(host, sizeof(host)) == -1) + (void)strcpy(host, "unknown-host!?!?"); +@@ -674,6 +674,22 @@ F_compound *objects; + for (i=strlen(psize)-1; i>=0; i--) + psize[i] = tolower(psize[i]); + fprintf(tfp, "%%%%DocumentPaperSizes: %s\n",psize); ++ } else if (pdfflag) { ++ /* set the page size for PDF to the figure size */ ++ fprintf(tfp, "<< /PageSize [%d %d] >> setpagedevice\n", ++ clipux-cliplx,clipuy-cliply); ++ } ++ ++ /* put in the magnification for information purposes */ ++ fprintf(tfp, "%%Magnification: %.4f\n",metric? mag*76.2/80.0 : mag); ++ fprintf(tfp, "%%%%EndComments\n"); ++ ++ /* This %%BeginSetup .. %%EndSetup has to occur after ++ * %%EndComments even though it includes comments, they are ++ * not header comments. The header comment block must be ++ * contiguous, with no non-comment lines in it. ++ */ ++ if (!epsflag && !pdfflag) { + fprintf(tfp, "%%%%BeginSetup\n"); + fprintf(tfp, "[{\n"); + fprintf(tfp, "%%%%BeginFeature: *PageRegion %s\n", papersize); +@@ -684,17 +700,8 @@ F_compound *objects; + fprintf(tfp, "%%%%EndFeature\n"); + fprintf(tfp, "} stopped cleartomark\n"); + fprintf(tfp, "%%%%EndSetup\n"); +- } else if (pdfflag) { +- /* set the page size for PDF to the figure size */ +- fprintf(tfp, "<< /PageSize [%d %d] >> setpagedevice\n", +- clipux-cliplx,clipuy-cliply); + } + +- +- /* put in the magnification for information purposes */ +- fprintf(tfp, "%%Magnification: %.4f\n",metric? mag*76.2/80.0 : mag); +- fprintf(tfp, "%%%%EndComments\n"); +- + /* if the user wants an ASCII preview, route the rest of the eps to a temp file */ + if (asciipreview) { + saveofile = tfp; diff --git a/transfig-3.2.5-modularX.patch b/transfig-3.2.5-modularX.patch index a17ddb8..a9552fb 100644 --- a/transfig-3.2.5-modularX.patch +++ b/transfig-3.2.5-modularX.patch @@ -1,6 +1,8 @@ ---- transfig.3.2.5/fig2dev/Imakefile.modularx 2007-04-16 14:49:29.000000000 +0200 -+++ transfig.3.2.5/fig2dev/Imakefile 2007-04-16 14:51:15.000000000 +0200 -@@ -34,7 +34,7 @@ +diff --git a/fig2dev/Imakefile b/fig2dev/Imakefile +index 90d67ca..2f76e0b 100755 +--- a/fig2dev/Imakefile ++++ b/fig2dev/Imakefile +@@ -34,7 +34,7 @@ XCOMM ****** XCOMM You should point XFIGLIBDIR to the same directory you did when you compiled XCOMM and installed xfig. @@ -9,7 +11,7 @@ XCOMM ****** XCOMM If your system doesn't have the strerror() function (has sys_errlist) then -@@ -62,7 +62,7 @@ +@@ -62,7 +62,7 @@ XCOMM Note that this changed slightly from the previous versions - you need XCOMM the full name (rgb.txt) now. XCOMM @@ -18,7 +20,7 @@ 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 -@@ -141,7 +141,7 @@ +@@ -141,7 +141,7 @@ XCOMM Comment out the next line if you have any problems with locale not being f #ifdef I18N I18N_DEFS = -DI18N diff --git a/transfig-3.2.5-optflags.patch b/transfig-3.2.5-optflags.patch index c8a9c90..8127f42 100644 --- a/transfig-3.2.5-optflags.patch +++ b/transfig-3.2.5-optflags.patch @@ -1,6 +1,7 @@ -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 +diff --git a/Imakefile b/Imakefile +index 5e44c8a..2f7fc4d 100755 +--- a/Imakefile ++++ b/Imakefile @@ -22,7 +22,7 @@ XCOMM to make transfig and fig2dev: XCOMM type "xmkmf", "make Makefiles", "make" then "make install" diff --git a/transfig.spec b/transfig.spec index a64e277..eeed480 100644 --- a/transfig.spec +++ b/transfig.spec @@ -1,7 +1,7 @@ Summary: Utility for converting FIG files (made by xfig) to other formats Name: transfig -Version: 3.2.5 -Release: 8%{?dist} +Version: 3.2.5c +Release: 1%{?dist} Epoch: 1 License: MIT URL: http://www.xfig.org/ @@ -9,8 +9,11 @@ Group: Applications/Multimedia 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 +Patch1: transfig-3.2.5-modularX.patch +Patch2: transfig-3.2.5-bitmap.patch + +# bz #558380 +Patch3: transfig-3.2.5-dsc3.0.patch Requires: ghostscript Requires: bc @@ -35,12 +38,17 @@ figures into certain graphics languages. %prep %setup -q -n %{name}.%{version} -%patch0 -p1 -b .optflags -%patch5 -p1 -b .modularX -%patch6 -p1 -b .bitmap +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + # fix source permissions find -type f -exec chmod -x {} \; +# remove garbage +rm -f doc/manual/Makefile.orig doc/fig2dev.1.orig + %build xmkmf make Makefiles @@ -71,6 +79,11 @@ rm -rf %{buildroot} %{_datadir}/fig2dev %changelog +* Wed Mar 03 2010 Kamil Dudka - 1:3.2.5c-1 +- new upstream release +- patch to generate comments compliant with DSC 3.0, thanks to Ian Dall + (#558380) + * Sun Jul 26 2009 Fedora Release Engineering - 1:3.2.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild