update to 4.02 [release 4.02-1mamba;Thu May 14 2020]

xpdf-xpdf_desktop

@@ -76,10 +76,9 @@ GenericName[zh_CN]=PDF 查看器
 GenericName[zh_TW]=PDF 檢視程式
 GenericName[zu]=Umbukisi we-PDF
 Exec=xpdf
-Icon=kpdf
+Icon=xpdf
 Categories=Application;Office;Viewer;
 TerminalOptions=
 Path=
 Type=Application
 Terminal=false
-X-KDE-StartupNotify=false

xpdf.spec

@@ -3,7 +3,7 @@
 %define        majver %(echo %version | cut -dp -f1)
 %define        minver  %(echo %{version}p | cut -dp -f2)
 Name:          xpdf
-Version:       3.04
+Version:       4.02
 Release:       1mamba
 Summary:       An open source viewer for Portable Document Format (PDF) files
 Group:         Graphical Desktop/Applications/Publishing
@@ -11,18 +11,18 @@ Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.foolabs.com/xpdf/index.html
-Source0:       ftp://ftp.foolabs.com/pub/xpdf/%{name}-%{majver}.tar.gz
+Source0:       https://xpdfreader-dl.s3.amazonaws.com/xpdf-%{version}.tar.gz
-Source1:       ftp://ftp.foolabs.com/pub/xpdf/%{name}-arabic.tar.gz
+Source1:       https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
-Source2:       ftp://ftp.foolabs.com/pub/xpdf/%{name}-chinese-simplified.tar.gz
+Source2:       https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
-Source3:       ftp://ftp.foolabs.com/pub/xpdf/%{name}-chinese-traditional.tar.gz
+Source3:       https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
-Source4:       ftp://ftp.foolabs.com/pub/xpdf/%{name}-cyrillic.tar.gz
+Source4:       https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
-Source5:       ftp://ftp.foolabs.com/pub/xpdf/%{name}-greek.tar.gz
+Source5:       https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
-Source6:       ftp://ftp.foolabs.com/pub/xpdf/%{name}-hebrew.tar.gz
+Source6:       https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
-Source7:       ftp://ftp.foolabs.com/pub/xpdf/%{name}-japanese.tar.gz
+Source7:       https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
-Source8:       ftp://ftp.foolabs.com/pub/xpdf/%{name}-korean.tar.gz
+Source8:       https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
-Source9:       ftp://ftp.foolabs.com/pub/xpdf/%{name}-latin2.tar.gz
+Source9:       https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
-Source10:      ftp://ftp.foolabs.com/pub/xpdf/%{name}-thai.tar.gz
+Source10:      https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
-Source11:      ftp://ftp.foolabs.com/pub/xpdf/%{name}-turkish.tar.gz
+Source11:      https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
 Source12:      xpdf-xpdf_desktop
 #%if "%{minver}" != ""
 #Source13:      ftp://ftp.foolabs.com/pub/xpdf/%{name}-%{majver}pl1.patch
@@ -40,21 +40,15 @@ Patch9:        %{name}-3.01-cve_2006_0301.patch
 Patch10:       %{name}-3.03-libXpm-3.5.10.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
-BuildRequires: ghostscript-fonts
 BuildRequires: glibc-devel
+BuildRequires: ldconfig
+BuildRequires: libcups-devel
+BuildRequires: libfontconfig-devel
 BuildRequires: libfreetype-devel
 BuildRequires: libgcc
-BuildRequires: libICE-devel
-BuildRequires: liblesstif-devel
 BuildRequires: libpaper-devel
-BuildRequires: libSM-devel
+BuildRequires: libqt5-devel
 BuildRequires: libstdc++6-devel
-BuildRequires: libt1-devel
-BuildRequires: libX11-devel
-BuildRequires: libXext-devel
-BuildRequires: libXp-devel
-BuildRequires: libXpm-devel
-BuildRequires: libXt-devel
 ## AUTOBUILDREQ-END
 Requires:      ghostscript-fonts >= 6.0
 Requires:      libpoppler-tools
@@ -65,22 +59,18 @@ Xpdf is an open source viewer for Portable Document Format (PDF) files.
 (These are also sometimes also called 'Acrobat' files, from the name of Adobe's PDF software.)
 The Xpdf project also includes a PDF text extractor, PDF-to-PostScript converter, and various other utilities.
 
+%debug_package
+
 %prep
 %setup -q -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -n %{name}-%{majver}
-%patch0 -p1 -b .fonts
+#%patch0 -p1 -b .fonts
-#%patch1 -p1 -b .gcc4
+#%patch2 -p1 -b .xpdfrc
-%patch2 -p1 -b .xpdfrc
 %if "%{minver}" != ""
 patch -p1 < %{SOURCE13}
 patch -p1 < %{SOURCE14}
 %endif
-#%patch4 -p1 -b .crash
-#%patch5 -p1 -b .can_2005_2006
 %patch6 -p1 -b .can_2005_2097
-#%patch7 -p1 -b .can_2005_3191_2_3
+#%patch10 -p1
-#%patch8 -p1 -b .can_2005_3624_5_6_7
-#%patch9 -p1 -b .cve_2006_0301
-%patch10 -p1
 
 languages='
    arabic
@@ -100,15 +90,13 @@ for lang in $languages; do echo "$lang" >> languages.lst; done
 %build
 # FIXME: -D__STRICT_ANSI__ needed as long as gcc provides a fixed header
 #        for paper.h
-%configure \
+%cmake -d build \
-   --sysconfdir=%{_sysconfdir}/X11/xpdf \
+  -DMULTITHREADED=ON \
-   --enable-freetype2 \
+  -DOPI_SUPPORT=ON \
-   --with-freetype2-includes=%{_includedir}/freetype2 \
+  -DXPDFWIDGET_PRINTING=ON \
-   --with-appdef-dir=%{_datadir}/X11/app-defaults \
+  -DSYSTEM_XPDFRC=%{_sysconfdir}/xpdfrc \
-   --enable-a4-paper \
+  -DCMAKE_C_FLAGS="%{optflags} -fPIC" \
-   --enable-opi \
+  -DCMAKE_CXX_FLAGS="%{optflags} -fPIC" \
-   CXXFLAGS="-g -O2 -D__STRICT_ANSI__"
-#  --enable-wordlist
 
 %make
 
@@ -124,7 +112,7 @@ done
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall
+%makeinstall -C build
 
 for lang in `cat languages.lst`; do
    install -d %{buildroot}%{_datadir}/%{name}/$lang
@@ -133,13 +121,18 @@ done
 
 # fix wrong paths
 find %{buildroot}/%{_mandir}/man? -type f -name "*.[15]" \
-   -exec sed -i 's,/usr/local/etc/xpdfrc,/etc/X11/xpdf/xpdfrc,g' {} \;
+   -exec sed -i 's,/usr/local/etc/xpdfrc,/etc/xpdfrc,g' {} \;
 sed -i 's,/usr/local/share/,/usr/share/,g' \
    %{buildroot}/%{_mandir}/man5/xpdfrc.5
 
+install -D -m644 doc/sample-xpdfrc %{buildroot}%{_sysconfdir}/xpdfrc
+
 install -D -m644 %{SOURCE12} \
    %{buildroot}%{_datadir}/applications/xpdf.desktop
 
+install -D -m644 xpdf-qt/xpdf-icon.svg %{buildroot}%{_datadir}/pixmaps/xpdf.svg
+
+# remove stuff provided by poppler
 rm -f %{buildroot}%{_bindir}/pdf*
 rm -f %{buildroot}%{_mandir}/man1/pdf*.1*
 
@@ -148,18 +141,21 @@ rm -f %{buildroot}%{_mandir}/man1/pdf*.1*
 
 %files
 %defattr(-,root,root)
-%dir %{_sysconfdir}/X11/xpdf
+%config %{_sysconfdir}/xpdfrc
-%config %{_sysconfdir}/X11/xpdf/xpdfrc
 %{_bindir}/xpdf
 %dir %{_datadir}/xpdf
 %{_datadir}/xpdf/*
 %{_datadir}/applications/xpdf.desktop
-%{_mandir}/man1/xpdf.1.gz
+%{_datadir}/pixmaps/xpdf.svg
-%{_mandir}/man5/xpdfrc.5.gz
+%{_mandir}/man1/xpdf.1*
+%{_mandir}/man5/xpdfrc.5*
 %doc COPYING
 #%doc ANNOUNCE CHANGES COPYING README
 
 %changelog
+* Thu May 14 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 4.02-1mamba
+- update to 4.02
+
 * Sun Dec 13 2015 Automatic Build System <autodist@mambasoft.it> 3.04-1mamba
 - automatic update by autodist