diff --git a/djvulibre-3.5.25.3.tar.gz b/djvulibre-3.5.25.3.tar.gz new file mode 100644 index 0000000..843a01e --- /dev/null +++ b/djvulibre-3.5.25.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0 +size 2543949 diff --git a/djvulibre-3.5.25.tar.bz2 b/djvulibre-3.5.25.tar.bz2 deleted file mode 100644 index bea343b..0000000 --- a/djvulibre-3.5.25.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:497e5823660139775780fa6339c57b33b46df8d606c815e4e6edae57d35e7f0c -size 2335628 diff --git a/djvulibre-not-existing-icons.patch b/djvulibre-not-existing-icons.patch new file mode 100644 index 0000000..7a9592f --- /dev/null +++ b/djvulibre-not-existing-icons.patch @@ -0,0 +1,13 @@ +Index: djvulibre-3.5.25/desktopfiles/Makefile.in +=================================================================== +--- djvulibre-3.5.25.orig/desktopfiles/Makefile.in ++++ djvulibre-3.5.25/desktopfiles/Makefile.in +@@ -58,7 +58,7 @@ ${PNGICONS}: djvu.svg + || ${CONVERT} -geometry $${s}x$${s} -depth 8 -background none $< $@ \ + || ${INKSCAPE} --without-gui --export-width=$${s} \ + --export-height=$${s} --export-png=$@ $< \ +- || cp ${srcdir}/prebuilt-$@ $@ ++ || if [ -e ${srcdir}/prebuilt-$@ ]; then cp ${srcdir}/prebuilt-$@ $@; fi + + hi-djvu.svgz: djvu.svg + cat $< | gzip >$@ diff --git a/djvulibre.changes b/djvulibre.changes index dcd3dc6..d3b6ba5 100644 --- a/djvulibre.changes +++ b/djvulibre.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Mar 27 06:33:47 UTC 2013 - pgajdos@suse.com + +- updated to 3.5.25.3: + * minor fixes + * call autoreconf + * do not cp not existing prebuilt icons + * not-existing-icons.patch + ------------------------------------------------------------------- Sun Mar 25 16:44:11 UTC 2012 - dimstar@opensuse.org diff --git a/djvulibre.spec b/djvulibre.spec index 26dc90b..73d3a47 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,7 +1,7 @@ # # spec file for package djvulibre # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products 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,20 +17,24 @@ Name: djvulibre +BuildRequires: autoconf BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libjpeg-devel BuildRequires: libtiff-devel +BuildRequires: libtool # pkg-config is required for pkgconfig() provides and requires. BuildRequires: pkgconfig -Version: 3.5.25 +Version: 3.5.25.3 Release: 0 Url: http://djvu.sourceforge.net Summary: An Open Source Implementation of DjVu License: GPL-2.0+ Group: Productivity/Graphics/Other -Source: %{name}-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.gz Patch0: %{name}-filepath.patch +# following reported upstream, should not be needed in future update +Patch1: %{name}-not-existing-icons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -70,12 +74,14 @@ Group: Productivity/Graphics/Other This package contains the documentation for the DjVu - djvulibre %prep -%setup +%setup -n %{name}-3.5.25 %patch0 +%patch1 -p1 %build -# specifying --x-libraries and -includes is needed due to new paths in X.org 7.x -# delete them if builds against X.org 6.9 or lower +# run autoreconf otherwise @INKSCAPE@ is undefined (not replaced by false); +# try to remove in the next update +autoreconf -fi CFLAGS="$RPM_OPT_FLAGS" \ CXXFLAGS="$RPM_OPT_FLAGS" \ ./configure \