Hello community, here is the log from the commit of package djvulibre-djview4 for openSUSE:Factory checked in at 2015-03-19 21:25:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/djvulibre-djview4 (Old) and /work/SRC/openSUSE:Factory/.djvulibre-djview4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "djvulibre-djview4" Changes: -------- --- /work/SRC/openSUSE:Factory/djvulibre-djview4/djvulibre-djview4.changes 2013-09-13 14:45:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.djvulibre-djview4.new/djvulibre-djview4.changes 2015-03-19 21:25:24.000000000 +0100 @@ -1,0 +2,17 @@ +Thu Mar 19 08:09:54 UTC 2015 - mplus...@suse.com + +- Cleanup spec file with spec-cleaner +- Use url for source +- Build qt5 version +- Remove no longer needed patches + * djview4-nsplugin_manpage.patch + * djview4-nsplugin_dir.patch +- Update to 4.10 + * Bug fixes: layout, usability, preferences, locale selection + * Works with both Qt4 and Qt5 + * Build uses automake/qmake hybrid (instead of autoconf/qmake). + * Layout annotations are honored in multipage mode + * Experimental OpenGL rendering + * Slideshow mode + +------------------------------------------------------------------- Old: ---- djview-4.9.tar.bz2 djview4-nsplugin_dir.patch djview4-nsplugin_manpage.patch New: ---- djview-4.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ djvulibre-djview4.spec ++++++ --- /var/tmp/diff_new_pack.EY1IG7/_old 2015-03-19 21:25:25.000000000 +0100 +++ /var/tmp/diff_new_pack.EY1IG7/_new 2015-03-19 21:25:25.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package djvulibre-djview4 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,28 +17,34 @@ Name: djvulibre-djview4 -BuildRequires: gcc-c++ -BuildRequires: glibc-devel -BuildRequires: libdjvulibre-devel -BuildRequires: libjpeg-devel -BuildRequires: libqt4-devel >= 4.1 -BuildRequires: libtiff-devel -BuildRequires: update-desktop-files -BuildRequires: xorg-x11-devel -Version: 4.9 +Version: 4.10 Release: 0 -Url: http://djvu.sourceforge.net/djview4.html Summary: Portable DjVu Qt4 Based Viewer and Browser Plugin License: GPL-2.0+ Group: Productivity/Graphics/Other -Source: djview-%{version}.tar.bz2 -# This patch is Suse specific. -Patch1: djview4-nsplugin_manpage.patch -# This patch is Suse specific. -Patch2: djview4-nsplugin_dir.patch +Url: http://djvu.sourceforge.net/djview4.html +Source: http://downloads.sourceforge.net/djvu/djview-%{version}.tar.gz # PATCH-FIX-UPSTREAM Add support for AArch64 in npsdk Patch3: npsdk-aarch64-support.patch +BuildRequires: gcc-c++ +BuildRequires: libjpeg-devel +BuildRequires: libqt5-linguist +BuildRequires: pkg-config +BuildRequires: rsvg-view +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Gui) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(ddjvuapi) +BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xt) Requires: djvulibre >= 3.5.18 +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils Conflicts: djvulibre-djview3 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,41 +53,35 @@ DjVuLibre-3.5 library and the Qt4 toolkit. %prep -%setup -n djview4-%{version} -%patch1 -%patch2 +%setup -q -n djview-%{version} %patch3 -p1 +sed -i 's|PLUGINSDIR|%{_libdir}/browser-plugins|g' nsdejavu/nsdejavu.1.in %build -#export NSDEJAVU_CFLAGS="$RPM_OPT_FLAGS" %configure -# --x-includes=/usr/include/ \ -# --x-libraries=/usr/%{_lib}/ \ -make NSDEJAVU_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} +make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT -#mkdir -p $RPM_BUILD_ROOT/%{_libdir}/browser-plugins/ -#mv $RPM_BUILD_ROOT/%{_libdir}/netscape/plugins/nsdejavu.so $RPM_BUILD_ROOT/%{_libdir}/browser-plugins/nsdejavu.so -#rm -rf $RPM_BUILD_ROOT/%{_libdir}/netscape/ -# Installing desktop file and icons in this section is more sane -# then in %post section as author intended because of SuSE translation -# process and little less pain with getting those scripts working -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps -install -m 644 desktopfiles/hi32-djview4.png $RPM_BUILD_ROOT/usr/share/pixmaps/djvulibre-djview4.png +make DESTDIR=%{buildroot} pluginsdir=%{_libdir}/browser-plugins install %{?_smp_mflags} +ln -s %{_bindir}/djview %{buildroot}%{_bindir}/djview4 %suse_update_desktop_file -i djvulibre-djview4 Qt Graphics Viewer +%post +%desktop_database_post + +%postun +%desktop_database_postun + %files %defattr(-,root,root) %doc COPYING COPYRIGHT NEWS README README_translations %doc %{_mandir}/man1/* %{_bindir}/djview4 %{_bindir}/djview +%{_libdir}/browser-plugins %{_datadir}/djvu/djview4/ -%{_libdir}/browser-plugins/nsdejavu.so -%{_datadir}/pixmaps/djvulibre-djview4.png -%{_prefix}/share/applications/djvulibre-djview4.desktop +%{_datadir}/applications/djvulibre-djview4.desktop +%{_datadir}/icons/hicolor %dir %{_datadir}/djvu/ -#%{_prefix}/share/icons/hicolor/48x48/mimetypes/djvu.png %changelog ++++++ npsdk-aarch64-support.patch ++++++ --- /var/tmp/diff_new_pack.EY1IG7/_old 2015-03-19 21:25:25.000000000 +0100 +++ /var/tmp/diff_new_pack.EY1IG7/_new 2015-03-19 21:25:25.000000000 +0100 @@ -1,8 +1,8 @@ -Index: djview4-4.9/nsdejavu/npsdk/prcpucfg.h +Index: djview-4.10/nsdejavu/npsdk/prcpucfg.h =================================================================== ---- djview4-4.9.orig/nsdejavu/npsdk/prcpucfg.h -+++ djview4-4.9/nsdejavu/npsdk/prcpucfg.h -@@ -695,6 +695,57 @@ +--- djview-4.10.orig/nsdejavu/npsdk/prcpucfg.h ++++ djview-4.10/nsdejavu/npsdk/prcpucfg.h +@@ -746,6 +746,57 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
