Hello community, here is the log from the commit of package djvulibre for openSUSE:Factory checked in at 2012-03-22 13:45:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/djvulibre (Old) and /work/SRC/openSUSE:Factory/.djvulibre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "djvulibre", Maintainer is "pgaj...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/djvulibre/djvulibre.changes 2011-09-23 01:55:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.djvulibre.new/djvulibre.changes 2012-03-22 13:47:05.000000000 +0100 @@ -1,0 +2,21 @@ +Fri Mar 16 15:31:13 UTC 2012 - pgaj...@suse.com + +- updated to 3.5.25: + * Removed the deprecated djview3 code. + * Removed the deprecated cothreads code. + * Removed the unmaintained japanese man pages. + * Added ddjvu option to skip corrupted pages. + * Miniexp API is now reentrant. + * Bug fixes all around. + +------------------------------------------------------------------- +Thu Mar 15 19:59:47 UTC 2012 - dims...@opensuse.org + +- Add djvulibre-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- +Tue Mar 13 15:21:34 UTC 2012 - pgaj...@suse.com + +- fix build for factory (define $QTDIR) + +------------------------------------------------------------------- Old: ---- djvulibre-3.5.23-gcc46.patch djvulibre-3.5.24-filepath.patch djvulibre-3.5.24-nsdejavu.patch djvulibre-3.5.24.tar.bz2 New: ---- djvulibre-3.5.25.tar.bz2 djvulibre-filepath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ djvulibre.spec ++++++ --- /var/tmp/diff_new_pack.xLjnNB/_old 2012-03-22 13:47:14.000000000 +0100 +++ /var/tmp/diff_new_pack.xLjnNB/_new 2012-03-22 13:47:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package djvulibre # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -18,18 +18,18 @@ Name: djvulibre -BuildRequires: fdupes libdrm-devel libjpeg-devel libtiff-devel qt3-devel qt3-devel-tools update-desktop-files xorg-x11-devel -License: GPL-2.0+ -Group: Productivity/Graphics/Other -Version: 3.5.24 -Release: 5 +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: libjpeg-devel +BuildRequires: libtiff-devel +Version: 3.5.25 +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 -Patch1: %{name}-%{version}-nsdejavu.patch -Patch2: %{name}-%{version}-filepath.patch -# PATCH-FIX-UPSTREAM djvulibre-3.5.23-gcc46.patch idoen...@suse.de -- Fix gcc 4.6 compilation, upstream bug #3256513 -Patch3: djvulibre-3.5.23-gcc46.patch +Patch0: %{name}-filepath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,19 +45,7 @@ by hundreds of academic, commercial, governmental, and noncommercial Web sites around the world. -%package djview3 -License: GPL-2.0+ -Summary: DjView3 is a portable DjVu Qt3 based viewer and browser plugin -Group: Productivity/Graphics/Other -Requires: djvulibre = %{version} -Conflicts: djvulibre-djview4 - -%description djview3 -DjView3 is a viewer and browser plugin for DjVu documents, based on the -DjVuLibre-3.5 library and the Qt3 toolkit. - %package -n libdjvulibre21 -License: GPL-2.0+ Summary: Libraries of Open Source Implementation of DjVu - djvulibre Group: Productivity/Graphics/Other @@ -65,16 +53,15 @@ Libraries of Open Source Implementation of DjVu - djvulibre. %package -n libdjvulibre-devel -License: GPL-2.0+ Summary: Libraries of Open Source Implementation of DjVu - djvulibre Group: Development/Libraries/Other -Requires: libdjvulibre21 = %{version}, libjpeg-devel +Requires: libdjvulibre21 = %{version} +Requires: libjpeg-devel %description -n libdjvulibre-devel Libraries of Open Source Implementation of DjVu - djvulibre. %package doc -License: GPL-2.0+ Summary: Documentation for the the DjVu - djvulibre Group: Productivity/Graphics/Other @@ -83,27 +70,18 @@ %prep %setup -%patch1 -%patch2 -%patch3 -p1 -# removing cvsignore files in version 3.5.19 -rm -rf doc/minilisp/.cvsignore +%patch0 %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 -CFLAGS="$RPM_OPT_FLAGS -I$QTDIR/include -Wall" \ -CXXFLAGS="$RPM_OPT_FLAGS -I$QTDIR/include -Wall -fmessage-length=0 -fno-strict-aliasing" \ -QT_LIBS="-L/usr/%_lib/qt3/%{_lib} -lqt-mt" \ +CFLAGS="$RPM_OPT_FLAGS" \ +CXXFLAGS="$RPM_OPT_FLAGS" \ ./configure \ --prefix=%{_prefix} \ --libdir=%{_libdir} \ - --mandir=%{_mandir} \ - --x-includes=/usr/include/ \ - --x-libraries=/usr/%{_lib}/ \ - --with-qt=/usr/%_lib/qt3 \ - --enable-djview -make OPTS="$RPM_OPT_FLAGS -Wall -fmessage-length=0 -DNO_DEBUG" %{?_smp_mflags} + --mandir=%{_mandir} +make OPTS="$RPM_OPT_FLAGS -DNO_DEBUG" %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT @@ -117,12 +95,6 @@ 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 -install -m 644 desktopfiles/hi32-djview3.png $RPM_BUILD_ROOT/usr/share/pixmaps/djvulibre-djview3.png -#fix wrong permissions -%__chmod 644 desktopfiles/djvulibre-djview3.desktop -#delete shebank from desktop file -%__sed -i '/#!\/usr\/bin\/env xdg-open/d' desktopfiles/djvulibre-djview3.desktop -%suse_update_desktop_file -r -i djvulibre-djview3 Graphics Viewer %fdupes $RPM_BUILD_ROOT %post -n libdjvulibre21 -p /sbin/ldconfig @@ -131,9 +103,8 @@ %files %defattr(-,root,root) -%doc COPYING COPYRIGHT INSTALL NEWS README TODO +%doc COPYING COPYRIGHT INSTALL NEWS README %doc %{_mandir}/man1/* -%doc %{_mandir}/ja/* %{_datadir}/djvu %{_bindir}/* %dir %{_prefix}/share/icons/hicolor @@ -146,26 +117,6 @@ %{_prefix}/share/icons/hicolor/22x22/mimetypes/djvu.png %{_prefix}/share/icons/hicolor/32x32/mimetypes/djvu.png %{_prefix}/share/icons/hicolor/48x48/mimetypes/djvu.png -# these go to djview3 subpackage -%exclude %{_prefix}/share/pixmaps/djvulibre-djview3.png -%exclude %{_libdir}/browser-plugins/nsdejavu.so -%exclude %{_datadir}/djvu/djview3 -%exclude %{_bindir}/djview* -%exclude %doc %{_mandir}/man1/djview* -%exclude %doc %{_mandir}/ja/man1/djview* -%exclude %doc %{_mandir}/man1/nsdejavu* -%exclude %doc %{_mandir}/ja/man1/nsdejavu* - -%files djview3 -%defattr(-,root,root) -%doc %{_mandir}/man1/djview* -%doc %{_mandir}/ja/man1/djview* -%doc %{_mandir}/man1/nsdejavu* -%doc %{_mandir}/ja/man1/nsdejav* -%{_prefix}/share/pixmaps/djvulibre-djview3.png -%{_libdir}/browser-plugins/nsdejavu.so -%{_bindir}/djview* -%{_prefix}/share/applications/djvulibre-djview3.desktop %files -n libdjvulibre21 %defattr(-,root,root) ++++++ djvulibre-3.5.24.tar.bz2 -> djvulibre-3.5.25.tar.bz2 ++++++ ++++ 76334 lines of diff (skipped) ++++++ djvulibre-filepath.patch ++++++ --- doc/minilisp/README +++ doc/minilisp/README @@ -3,7 +3,7 @@ ---------------- Files <miniexp.h> and <miniexp.cpp> in directory -<djvulibre-3.5/libdjvu/miniexp.h> implement the basic data +</usr/include/libdjvu/miniexp.h> implement the basic data structure of a lisp interpreter: s-expressions. S-expressions can be viewed as a simple and powerful -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
