diff --git a/djvulibre-3.5.25.3.tar.gz b/djvulibre-3.5.25.3.tar.gz deleted file mode 100644 index 843a01e..0000000 --- a/djvulibre-3.5.25.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0 -size 2543949 diff --git a/djvulibre-3.5.27.tar.gz b/djvulibre-3.5.27.tar.gz new file mode 100644 index 0000000..d3d2adf --- /dev/null +++ b/djvulibre-3.5.27.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f +size 3648522 diff --git a/djvulibre-filepath.patch b/djvulibre-filepath.patch deleted file mode 100644 index 17497a1..0000000 --- a/djvulibre-filepath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/minilisp/README -+++ doc/minilisp/README -@@ -3,7 +3,7 @@ - ---------------- - - Files and in directory -- implement the basic data -+ implement the basic data - structure of a lisp interpreter: s-expressions. - - S-expressions can be viewed as a simple and powerful diff --git a/djvulibre-not-existing-icons.patch b/djvulibre-not-existing-icons.patch deleted file mode 100644 index 7a9592f..0000000 --- a/djvulibre-not-existing-icons.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 d3b6ba5..b6e9d3c 100644 --- a/djvulibre.changes +++ b/djvulibre.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Feb 27 21:35:01 UTC 2015 - mpluskal@suse.com + +- Remove obsolete patches + * djvulibre-filepath.patch + * djvulibre-not-existing-icons.patch +- Update to 3.5.27 + * simplified configuration scripts + * deadlock fixes + * miniexp under win32 uses tlsalloc instead of _thread vars (pb under xp) +- New in 3.5.26 + * Thread safe miniexp + * Now using the standard autotools approach (thanks to Vincent Torri). + * New windows installer (thanks to Konstantin Kravtsov). + * Fixed Russian code page issues in windows. + * General speedup thanks to lock-free smart pointers. + * ddjvu can produce one file per page. + * djvused can now set the default page orientation. + * Bug fixes all around. + ------------------------------------------------------------------- Wed Mar 27 06:33:47 UTC 2013 - pgajdos@suse.com diff --git a/djvulibre.spec b/djvulibre.spec index 73d3a47..03cc3f1 100644 --- a/djvulibre.spec +++ b/djvulibre.spec @@ -1,7 +1,7 @@ # # spec file for package djvulibre # -# 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 @@ -16,25 +16,23 @@ # +%define libname lib%{name}21 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.3 +Version: 3.5.27 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.gz -Patch0: %{name}-filepath.patch -# following reported upstream, should not be needed in future update -Patch1: %{name}-not-existing-icons.patch +Url: http://djvu.sourceforge.net +Source: http://downloads.sourceforge.net/djvu/%{name}-%{version}.tar.gz +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: libjpeg-devel +BuildRequires: pkg-config +BuildRequires: rsvg-view +BuildRequires: pkgconfig(libtiff-4) +Requires(post): shared-mime-info +Requires(postun): shared-mime-info BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,93 +48,111 @@ be smoothly zoomed and panned with no lengthy rerendering. DjVu is used by hundreds of academic, commercial, governmental, and noncommercial Web sites around the world. -%package -n libdjvulibre21 +%package -n %{libname} Summary: Libraries of Open Source Implementation of DjVu - djvulibre Group: Productivity/Graphics/Other -%description -n libdjvulibre21 -Libraries of Open Source Implementation of DjVu - djvulibre. +%description -n %{libname} +DjVu is a Web-centric format and software platform for distributing +documents and images. DjVuLibre is an open source (GPL) implementation +of DjVu, including viewers, browser plug-ins, decoders, simple +encoders, and utilities. DjVu can advantageously replace PDF, PS, TIFF, +JPEG, and GIF for distributing scanned documents, digital documents, or +high-resolution pictures. DjVu content downloads faster, displays and +renders faster, looks nicer on a screen, and consumes less client +resources than competing formats. DjVu images display instantly and can +be smoothly zoomed and panned with no lengthy rerendering. DjVu is used +by hundreds of academic, commercial, governmental, and noncommercial +Web sites around the world. + +This package contains shared libraries %package -n libdjvulibre-devel Summary: Libraries of Open Source Implementation of DjVu - djvulibre Group: Development/Libraries/Other -Requires: libdjvulibre21 = %{version} -Requires: libjpeg-devel +Requires: %{libname} = %{version} %description -n libdjvulibre-devel -Libraries of Open Source Implementation of DjVu - djvulibre. +DjVu is a Web-centric format and software platform for distributing +documents and images. DjVuLibre is an open source (GPL) implementation +of DjVu, including viewers, browser plug-ins, decoders, simple +encoders, and utilities. DjVu can advantageously replace PDF, PS, TIFF, +JPEG, and GIF for distributing scanned documents, digital documents, or +high-resolution pictures. DjVu content downloads faster, displays and +renders faster, looks nicer on a screen, and consumes less client +resources than competing formats. DjVu images display instantly and can +be smoothly zoomed and panned with no lengthy rerendering. DjVu is used +by hundreds of academic, commercial, governmental, and noncommercial +Web sites around the world. + +This package contains development files %package doc Summary: Documentation for the the DjVu - djvulibre Group: Productivity/Graphics/Other %description doc -This package contains the documentation for the DjVu - djvulibre +DjVu is a Web-centric format and software platform for distributing +documents and images. DjVuLibre is an open source (GPL) implementation +of DjVu, including viewers, browser plug-ins, decoders, simple +encoders, and utilities. DjVu can advantageously replace PDF, PS, TIFF, +JPEG, and GIF for distributing scanned documents, digital documents, or +high-resolution pictures. DjVu content downloads faster, displays and +renders faster, looks nicer on a screen, and consumes less client +resources than competing formats. DjVu images display instantly and can +be smoothly zoomed and panned with no lengthy rerendering. DjVu is used +by hundreds of academic, commercial, governmental, and noncommercial +Web sites around the world. + +This package contains documentation %prep -%setup -n %{name}-3.5.25 -%patch0 -%patch1 -p1 +%setup -q %build -# 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 \ - --prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --mandir=%{_mandir} -make OPTS="$RPM_OPT_FLAGS -DNO_DEBUG" %{?_smp_mflags} +%configure + +make %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT -# 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/icons/hicolor/22x22/mimetypes/ -mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/mimetypes/ -mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/mimetypes/ -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps -install -m 644 desktopfiles/hi22-djvu.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/22x22/mimetypes/djvu.png -install -m 644 desktopfiles/hi32-djvu.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/mimetypes/djvu.png -install -m 644 desktopfiles/hi48-djvu.png $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/mimetypes/djvu.png -%fdupes $RPM_BUILD_ROOT +make DESTDIR=%{buildroot} install %{?_smp_mflags} -%post -n libdjvulibre21 -p /sbin/ldconfig +# do not ship these +rm %{buildroot}%{_libdir}/libdjvulibre.la -%postun -n libdjvulibre21 -p /sbin/ldconfig +%fdupes %{buildroot} + +%post +%mime_database_post +%icon_theme_cache_post + +%post -n %{libname} -p /sbin/ldconfig + +%postun +%mime_database_postun +%icon_theme_cache_postun + +%postun -n %{libname} -p /sbin/ldconfig %files %defattr(-,root,root) -%doc COPYING COPYRIGHT INSTALL NEWS README +%doc COPYING COPYRIGHT NEWS README %doc %{_mandir}/man1/* %{_datadir}/djvu %{_bindir}/* -%dir %{_prefix}/share/icons/hicolor -%dir %{_prefix}/share/icons/hicolor/22x22 -%dir %{_prefix}/share/icons/hicolor/22x22/mimetypes -%dir %{_prefix}/share/icons/hicolor/32x32 -%dir %{_prefix}/share/icons/hicolor/32x32/mimetypes -%dir %{_prefix}/share/icons/hicolor/48x48 -%dir %{_prefix}/share/icons/hicolor/48x48/mimetypes -%{_prefix}/share/icons/hicolor/22x22/mimetypes/djvu.png -%{_prefix}/share/icons/hicolor/32x32/mimetypes/djvu.png -%{_prefix}/share/icons/hicolor/48x48/mimetypes/djvu.png +%{_datadir}/icons/hicolor/* +%{_datadir}/icons/hicolor/scalable/mimetypes/djvu.svgz +%{_datadir}/mime/packages/djvulibre-mime.xml -%files -n libdjvulibre21 +%files -n %{libname} %defattr(-,root,root) -%{_libdir}/libdjvulibre* -%exclude %{_libdir}/libdjvulibre.so -%exclude %{_libdir}/libdjvulibre.la +%{_libdir}/libdjvulibre.so.* %files -n libdjvulibre-devel %defattr(-,root,root) %{_libdir}/libdjvulibre.so -%{_libdir}/libdjvulibre.la -%dir %{_prefix}/include/libdjvu -%{_prefix}/include/libdjvu/*.h +%dir %{_includedir}/libdjvu +%{_includedir}/libdjvu/*.h %{_libdir}/pkgconfig/ddjvuapi.pc %files doc