diff --git a/.gitignore b/.gitignore index de0b049..461082f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ djview4-4.5.tar.gz /djview-4.9.tar.gz /djview-4.10.5.tar.gz /djview-4.10.6.tar.gz +/djview-4.12.tar.gz diff --git a/djview-4.10.6-debug.patch b/djview-4.10.6-debug.patch deleted file mode 100644 index 92bab6c..0000000 --- a/djview-4.10.6-debug.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up djview-4.10.6/configure.debug djview-4.10.6/configure ---- djview-4.10.6/configure.debug 2016-02-29 06:00:36.000000000 -0600 -+++ djview-4.10.6/configure 2016-07-01 12:23:18.171003418 -0500 -@@ -6577,14 +6577,14 @@ fi - CFLAGS= - for opt in $saved_CXXFLAGS ; do - case $opt in -- -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;; -- -O*) ;; -+# -g*) test $ac_debug != no && OPTS="$OPTS $opt" ;; -+# -O*) ;; - *) CXXFLAGS="$CXXFLAGS $opt" ;; - esac - done - for opt in $saved_CFLAGS ; do - case $opt in -- -O*|-g*) ;; -+# -O*|-g*) ;; - *) CFLAGS="$CFLAGS $opt" ;; - esac - done diff --git a/djview-4.12-debug.patch b/djview-4.12-debug.patch new file mode 100644 index 0000000..c5eb1d2 --- /dev/null +++ b/djview-4.12-debug.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index 98c7270..52fc41e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -122,7 +122,6 @@ AC_SUBST(LIBTOOL_DEPS) + + # C++ + AC_LANG(C++) +-AC_CXX_OPTIMIZE + + # Only nsdejavu needs libtool. + # But some combinations of libtool and autoconf diff --git a/djview4.spec b/djview4.spec index 065cb8e..1f88111 100644 --- a/djview4.spec +++ b/djview4.spec @@ -1,24 +1,28 @@ Summary: DjVu viewer Name: djview4 -Version: 4.10.6 -Release: 7%{?dist} -License: GPLv2+ -Group: Applications/Publishing +Version: 4.12 +Release: 14%{?dist} +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://djvu.sourceforge.net/djview4.html -Source0: http://downloads.sourceforge.net/project/djvu/DjView/4.10/djview-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/djvu/djview-%{version}.tar.gz Source20: qmake-qt5.sh Patch1: djview-4.8-include.patch Patch2: djview4-aarch64.patch # don't strip -g flags even without --enable-debug -Patch3: djview-4.10.6-debug.patch +Patch3: djview-4.12-debug.patch Patch4: djview4-disable-workaround-qt55.patch -BuildRequires: qt5-linguist -BuildRequires: qt5-qtbase-devel +BuildRequires: autoconf +BuildRequires: automake BuildRequires: desktop-file-utils BuildRequires: djvulibre-devel >= 3.5.19 # For plugin, see #756950 BuildRequires: glib2-devel BuildRequires: libtiff-devel +BuildRequires: libtool +BuildRequires: make +BuildRequires: qt5-linguist +BuildRequires: qt5-qtbase-devel %description DjView4 is a DjVu document viewer with the following features: @@ -33,18 +37,13 @@ It is based on DjVuLibre and Qt5. %package plugin Summary: Browser plugin for DjVu viewer -Group: Applications/Publishing Requires: %{name} = %{version}-%{release} %description plugin This package provides a browser plugin for the DjVu document viewer. %prep -%setup -q -n djview-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -b .debug -%patch4 -p1 +%autosetup -p1 %build CFLAGS="%{optflags}"; export CFLAGS @@ -58,6 +57,7 @@ QTDIR= install -m755 -D %{SOURCE20} bin/qmake-qt5 PATH=`pwd`/bin:%{_qt5_bindir}:$PATH; export PATH +./autogen.sh %configure \ --enable-nsdejavu \ QMAKE="`pwd`/bin/qmake-qt5" @@ -73,22 +73,9 @@ make DESTDIR=%{buildroot} INSTALL="%{__install} -p" \ mv %{buildroot}%{_bindir}/djview %{buildroot}%{_bindir}/%{name} mv %{buildroot}%{_mandir}/man1/djview.1* %{buildroot}%{_mandir}/man1/%{name}.1* -%post -update-mime-database %{_datadir}/mime &> /dev/null || : -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -update-mime-database %{_datadir}/mime &> /dev/null || : -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files -%doc COPYRIGHT COPYING NEWS README +%license COPYING +%doc COPYRIGHT NEWS README %{_bindir}/%{name} %dir %{_datadir}/djvu %{_datadir}/djvu/%{name} @@ -103,6 +90,69 @@ fi %{_mandir}/man1/nsdejavu.1* %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 4.12-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 4.12-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 25 2024 Miroslav Suchý - 4.12-12 +- convert license to SPDX + +* Wed Jul 17 2024 Fedora Release Engineering - 4.12-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jul 01 2024 Terje Rosten - 4.12-10 +- Use autosetup macro + +* Wed Jan 24 2024 Fedora Release Engineering - 4.12-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 4.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 4.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 4.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 4.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 4.12-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 4.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 4.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 12 2021 Terje Rosten - 4.12-1 +- 4.12 + +* Mon Jul 27 2020 Fedora Release Engineering - 4.10.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 4.10.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 4.10.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 4.10.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 4.10.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Igor Gnatenko - 4.10.6-9 +- Escape macros in %%changelog + +* Wed Feb 07 2018 Fedora Release Engineering - 4.10.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 4.10.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild @@ -153,7 +203,7 @@ fi * Thu May 23 2013 François Cami - 4.9-1 - new upstream release -- drop "-n djview-%{version}" during setup, the new tarball expands to %{name}-%{version} +- drop "-n djview-%%{version}" during setup, the new tarball expands to %%{name}-%%{version} - remove djview-4.8-swap.patch - add a header to djvulibre-djview4.desktop diff --git a/sources b/sources index e5a2baa..71064be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f23205e9d04e4ee4c2324e1d0bae1d1f djview-4.10.6.tar.gz +SHA512 (djview-4.12.tar.gz) = 0314c409b5474bb5bbe81aa2dc44b24507dac6f7cfde8d275a9d3bb1c2046b6ce2173543618ab7cbb702dbe94d7b2d85d3e19df09fafea73bb8662ee2ba89a01