diff --git a/pstoedit-3.73.tar.gz b/pstoedit-3.73.tar.gz deleted file mode 100644 index 0dbe0e1..0000000 Binary files a/pstoedit-3.73.tar.gz and /dev/null differ diff --git a/pstoedit-3.78.tar.gz b/pstoedit-3.78.tar.gz new file mode 100644 index 0000000..fd22460 Binary files /dev/null and b/pstoedit-3.78.tar.gz differ diff --git a/pstoedit-pkglibdir.patch b/pstoedit-pkglibdir.patch new file mode 100644 index 0000000..9ccccc2 --- /dev/null +++ b/pstoedit-pkglibdir.patch @@ -0,0 +1,17 @@ +--- a/config/pstoedit.pc.orig.in 2018-04-16 14:26:28.000000000 +0200 ++++ b/config/pstoedit.pc.in 2020-10-05 14:37:16.750980762 +0200 +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@includedir@ ++includedir=@includedir@/pstoedit + + Name: pstoedit + Description: converts PostScript(TM) and PDF files to other vector graphic formats +@@ -8,4 +8,4 @@ + Version: @VERSION@.0 + Requires: + Libs: -L@libdir@ -lpstoedit @CXX_STD_LIB@ @CXX_RUNTIME_LIB@ @LIBLD_LDFLAGS@ +-Cflags: -I@includedir@ ++Cflags: -I@includedir@/pstoedit diff --git a/pstoedit.spec b/pstoedit.spec index fce375c..b6d7662 100644 --- a/pstoedit.spec +++ b/pstoedit.spec @@ -1,13 +1,13 @@ Name: pstoedit -Version: 3.73 -Release: 4 +Version: 3.78 +Release: 1 Summary: Translates PostScript and PDF graphics into other vector formats License: GPLv2+ URL: http://www.pstoedit.net/ -Source0: http://downloads.sourceforge.net/pstoedit/pstoedit-%{version}.tar.gz +Source0: https://sourceforge.net/projects/pstoedit/files/pstoedit/%{version}/pstoedit-%{version}.tar.gz +Patch0: pstoedit-pkglibdir.patch Requires: ghostscript -BuildRequires: texlive-latex2man texlive-latex texlive-collection-langeuropean -BuildRequires: texlive-collection-latex gd-devel dos2unix ghostscript +BuildRequires: gd-devel dos2unix ghostscript libzip-devel BuildRequires: plotutils-devel automake gcc-c++ libEMF-devel %description @@ -29,14 +29,11 @@ The package contains man information for pstoedit. %prep %autosetup -p1 -aclocal -automake + +dos2unix doc/*.htm doc/readme.txt %build -%configure --disable-static --with-emf --without-swf --without-magick - -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%configure --disable-static --with-emf --without-swf --without-magick --with-libzip-include=%{_includedir} %make_build @@ -69,6 +66,9 @@ install -D doc/pstoedit.1 $RPM_BUILD_ROOT%{_mandir}/man1/ %{_mandir}/man1/* %changelog +* Tue Jan 10 2023 yaoxin - 3.78-1 +- Update to 3.78 + * Thu Dec 12 2019 lijin Yang - 3.73-4 - init package