Rebase to 3.73 upstream version

Add automake call to regenerate Makefile, as libpstoedit.so was not generated at the right time.
This commit is contained in:
Sebastian Kisela 2018-07-04 13:12:47 +02:00
parent 7f84643560
commit f7947a6fdc

View File

@ -1,6 +1,6 @@
Name: pstoedit Name: pstoedit
Version: 3.70 Version: 3.73
Release: 11%{?dist} Release: 1%{?dist}
Summary: Translates PostScript and PDF graphics into other vector formats Summary: Translates PostScript and PDF graphics into other vector formats
Group: Applications/Productivity Group: Applications/Productivity
@ -8,14 +8,16 @@ License: GPLv2+
URL: http://www.pstoedit.net/ URL: http://www.pstoedit.net/
Source0: http://downloads.sourceforge.net/pstoedit/pstoedit-%{version}.tar.gz Source0: http://downloads.sourceforge.net/pstoedit/pstoedit-%{version}.tar.gz
Patch0: pstoedit-pkglibdir.patch
Patch1: remove-libpng-ldflags.patch
Requires: ghostscript Requires: ghostscript
BuildRequires: texlive-latex2man
BuildRequires: texlive-latex
BuildRequires: texlive-collection-langeuropean
BuildRequires: texlive-collection-latex
BuildRequires: gd-devel BuildRequires: gd-devel
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: ghostscript BuildRequires: ghostscript
BuildRequires: plotutils-devel BuildRequires: plotutils-devel
BuildRequires: automake
%ifnarch ia64 %ifnarch ia64
BuildRequires: libEMF-devel BuildRequires: libEMF-devel
%endif %endif
@ -40,12 +42,10 @@ applications
%prep %prep
%setup -q %setup -q
# correctly load plugins (#1247187)
%patch0 -p1 -b .pkglibdir
%patch1 -p1
dos2unix doc/*.htm doc/readme.txt dos2unix doc/*.htm doc/readme.txt
aclocal
automake
%build %build
# Buildling without ImageMagick support, to work around bug 507035 # Buildling without ImageMagick support, to work around bug 507035
@ -57,7 +57,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
@ -72,14 +71,13 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%files %files
%doc copying doc/readme.txt doc/pstoedit.htm %doc copying doc/readme.txt doc/pstoedit.htm doc/changelog.htm doc/pstoedit.pdf
%{_datadir}/pstoedit %{_datadir}/pstoedit
%{_mandir}/man1/* %{_mandir}/man1/*
%{_bindir}/pstoedit %{_bindir}/pstoedit
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_libdir}/pstoedit %{_libdir}/pstoedit
%files devel %files devel
%doc doc/changelog.htm %doc doc/changelog.htm
%{_includedir}/pstoedit %{_includedir}/pstoedit
@ -89,6 +87,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
%changelog %changelog
* Mon Jul 09 2018 Sebastian Kisela <skisela@redhat.com> - 3.73-1
- Rebase to 3.73.
- Add automake call to regenerate Makefile, as libpstoedit.so was not generated at the right time.
* Mon Apr 16 2018 Sebastian Kisela <skisela@redhat.com> - 3.70-11 * Mon Apr 16 2018 Sebastian Kisela <skisela@redhat.com> - 3.70-11
- Revert back due to unnoticed ABI changes - Revert back due to unnoticed ABI changes