From 4873e6258e7dad0adc4f74a9f16a8d36bca324f6 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Mon, 23 Oct 2023 15:07:01 +0200 Subject: [PATCH] rebase to upstream version 3.2.9 --- .gitignore | 1 + ...ypo-causing-incorrect-eps-import-137.patch | 25 ------------------- sources | 2 +- transfig.spec | 9 ++++--- 4 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 0001-Correct-a-typo-causing-incorrect-eps-import-137.patch diff --git a/.gitignore b/.gitignore index f7bd59e..aff677e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ transfig.3.2.5c.tar.gz /fig2dev-3.2.7b.tar.xz /fig2dev-3.2.8a.tar.xz /fig2dev-3.2.8b.tar.xz +/fig2dev-3.2.9.tar.xz diff --git a/0001-Correct-a-typo-causing-incorrect-eps-import-137.patch b/0001-Correct-a-typo-causing-incorrect-eps-import-137.patch deleted file mode 100644 index b021844..0000000 --- a/0001-Correct-a-typo-causing-incorrect-eps-import-137.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1b09a885a8f0309bf1170ddcf07673801c79f895 Mon Sep 17 00:00:00 2001 -From: Thomas Loimer -Date: Tue, 28 Sep 2021 21:58:41 +0200 -Subject: [PATCH] Correct a typo causing incorrect eps import, #137 - ---- - fig2dev/dev/readeps.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fig2dev/dev/readeps.c b/fig2dev/dev/readeps.c -index a7d6008..efeb33e 100644 ---- a/fig2dev/dev/readeps.c -+++ b/fig2dev/dev/readeps.c -@@ -346,7 +346,7 @@ read_eps(F_pic *pic, struct xfig_stream *restrict pic_stream, int *llx,int *lly) - } - *llx = floor(rllx); - *lly = floor(rlly); -- pic->bit_size.x = (int)(rurx - rlly); -+ pic->bit_size.x = (int)(rurx - rllx); - pic->bit_size.y = (int)(rury - rlly); - break; - } --- -2.31.1 - diff --git a/sources b/sources index 70b657c..cd718c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fig2dev-3.2.8b.tar.xz) = b1f083db6c38d84e1df82c430fabda5ad13413e4d42eb20b6fd06fae5626911413c93846b7935873687b82f601e0674c3f3e1d36441dcfa1da6626bafc9d2139 +SHA512 (fig2dev-3.2.9.tar.xz) = 4a92539d79027c73cd9fa53d7e960db40ae5616d3197023a98346de4727cd70b28cd7d64ba33063dbe3dcacada7e97bb0e0c595547781a4244aea8c75d43f406 diff --git a/transfig.spec b/transfig.spec index f4e9151..74d6c0b 100644 --- a/transfig.spec +++ b/transfig.spec @@ -1,12 +1,11 @@ Name: transfig -Version: 3.2.8b -Release: 8%{?dist} +Version: 3.2.9 +Release: 1%{?dist} Epoch: 1 Summary: Utility for converting FIG files (made by xfig) to other formats License: Xfig URL: https://sourceforge.net/projects/mcj/ Source0: http://downloads.sourceforge.net/mcj/fig2dev-%{version}.tar.xz -Patch1: 0001-Correct-a-typo-causing-incorrect-eps-import-137.patch Requires: ghostscript Requires: bc @@ -58,6 +57,10 @@ mv fig2dev.1.in.new man/fig2dev.1.in %changelog +* Mon Oct 23 2023 Zuzana Miklankova - 1:3.2.9-1 +- Updated to version 3.2.9 +- Remove Patch1, this is now fixed upstream + * Sat Jul 22 2023 Fedora Release Engineering - 1:3.2.8b-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild