Hello community, here is the log from the commit of package fbreader for openSUSE:Factory checked in at 2016-07-21 08:19:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fbreader (Old) and /work/SRC/openSUSE:Factory/.fbreader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fbreader" Changes: -------- --- /work/SRC/openSUSE:Factory/fbreader/fbreader.changes 2012-11-06 16:05:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.fbreader.new/fbreader.changes 2016-07-21 08:19:58.000000000 +0200 @@ -1,0 +2,53 @@ +Thu Jun 23 17:33:29 UTC 2016 - dap.darkn...@gmail.com + +- Added fbreader-0.99.4-gcc6-Wno-narrowing.diff as a workaround + for https://github.com/geometer/FBReader/issues/289 +- Added %%description tag & noarch for zlibrary-data subpackage. + +------------------------------------------------------------------- +Sun Jun 19 19:57:17 UTC 2016 - dap.darkn...@gmail.com + +- Removed README.SuSE because there is only Qt GUI now. +- pkgconfig(). + +------------------------------------------------------------------- +Sun Jun 19 13:44:31 UTC 2016 - jeng...@inai.de + +- Fixup shared library packaging + +------------------------------------------------------------------- +Sun May 25 10:42:36 UTC 2014 - t...@gmx.com + +- Update to version 0.99.4 + * Fixed bug with freezing at start + * List of network libraries is updated now from fbreader.org + * Fixed working with secured connections (now authentification and books buying on LitRes.ru catalog works) + * Image support for Ms-Word doc format + * Esperanto interface localization has been added (by Katarína Nosková) + * Hyphenation patterns for Polish (by Tomasz Długosz) + * Polish interface localization (by Tomasz Długosz) + * Speed of library scanning has been increased + * Plugin for reading MsWord (*.doc) books + * Fixed zip reading for several ePub books (e.g. for "die Zeit" ePubs) + * Support for book series in ePubs with point format (e.g. "2.5") has been added + * Fixed image support in RTF books + * Encoding & language recognizing has been improved + * As from version 0.99.0 FBReader for Linux supports qt4 interface only + * Chinese text drawing optimization (thanks to You Sheng (SmartDevices) for idea) + * Mobipocket image processing has been fixed + * Standard file open dialog is now used instead of the old specially written for FBReader + * CSS processing for multi-xhtml epubs has been fixed (in 0.12.* the CSS loaded for the first xhtml was also applied for all other xhtmls) + * Chinese encodings detection has been improved + * Language/encoding detection for small files has been improved + * A problem with TOC in newest O'Reilly ePubs has been fixed + * A detection of book format by mime-type (not by file extension) has been partially implemented (in Gtk+ version only) + * Polish interface localization has been added (by Rafał Bakuła) +- Updated FBReader.desktop +- Cleaned spec file + * Removed GTK UI version build because it's broken an isn't supported anymore + See https://github.com/geometer/FBReader/issues/222 and the above changelog +- Dropped unneeded fbreader-0.12.10-c++.patch +- Added FBReader-0.99.4-fix-crash-with-fb2.zip-files.patch + * fixes crashes with fb2.zip files + +------------------------------------------------------------------- Old: ---- README.SuSE fbreader-0.12.10-c++.patch fbreader-0.12.10.tar.bz2 New: ---- FBReader-0.99.4-fix-crash-with-fb2.zip-files.patch fbreader-0.99.4-gcc6-Wno-narrowing.diff fbreader-sources-0.99.4.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fbreader.spec ++++++ --- /var/tmp/diff_new_pack.J6D99a/_old 2016-07-21 08:19:59.000000000 +0200 +++ /var/tmp/diff_new_pack.J6D99a/_new 2016-07-21 08:19:59.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package fbreader # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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,132 +16,107 @@ # +%define zl_sover 0_99 Name: fbreader -Version: 0.12.10 +Version: 0.99.4 Release: 0 Summary: E-book reader License: GPL-2.0+ Group: Productivity/Other Url: http://www.fbreader.org/ -Source0: fbreader-%{version}.tar.bz2 +Source0: %{name}-sources-%{version}.tgz Source1: FBReader.desktop -Source2: README.SuSE Source3: fbreader.xml -# PATCH-FIX-UPSTREAM fbreader-0.12.10-c++.patch http://www.fbreader.org/mantis/view.php?id=283 -- fix build with gcc 4.5 -Patch0: fbreader-0.12.10-c++.patch -Requires: zlibrary = %{version} -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif -BuildRequires: enca-devel +# PATCH-FIX-UPSTREAM to prevent crash with zipped fb2 files. +# See https://github.com/geometer/FBReader/issues/232 for more info +Patch0: FBReader-0.99.4-fix-crash-with-fb2.zip-files.patch +# PATCH-FIX-OPENSUSE to workaround for build issue via gcc6, +# see more at https://github.com/geometer/FBReader/issues/289 +Patch1: fbreader-0.99.4-gcc6-Wno-narrowing.diff BuildRequires: expat BuildRequires: fdupes -BuildRequires: fribidi-devel BuildRequires: gcc-c++ -BuildRequires: libbz2-devel -BuildRequires: libcurl-devel -BuildRequires: libexpat-devel -BuildRequires: liblinebreak-devel -BuildRequires: libqt4-devel -BuildRequires: sqlite3-devel -BuildRequires: zlib-devel -BuildRequires: pkgconfig(gtk+-2.0) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(enca) +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(fribidi) +BuildRequires: pkgconfig(libcurl) >= 7.17 +BuildRequires: pkgconfig(libunibreak) +BuildRequires: pkgconfig(sqlite3) +BuildRequires: pkgconfig(zlib) %description -FBReader is an e-book reader for various platforms. -Main features: - * Supported formats are - o fb2 e-book format (style attributes are not supported yet). - o HTML format (tables are not supported). - o CHM format (tables are not supported). - o plucker format (tables are not supported). - o Palmdoc (aportis doc). - o zTxt (Weasel format). - o TCR (psion text) format. - o RTF format (stylesheets and tables are not supported). - o OEB format (css and tables are not supported). - o OpenReader format (css and tables are not supported). - o Non-DRM'ed mobipocket format (tables are not supported). - o Plain text format. - * Direct reading from tar, zip, gzip and bzip2 archives. - (Multiple books in one archive are supported.) - * Automatic library building. - * Automatic encoding detection is supported. - * Automatically generated contents table. - * Embedded images support. - * Footnotes/hyperlinks support. - * Position indicator. - * Keeps the last open book and the last read positions for all opened - books between runs. - * List of last opened books. - * Automatic hyphenations. Liang's algorithm is used. The same algorithm is - used in TeX, and TeX hyphenation patterns are used in FBReader. Patterns - for Czech, English, Esperanto, French, German and Russian are included - in the current version. - * Text search. - * Full-screen mode. - * Screen rotation by 90, 180 and 270 degrees. +A multi-platform ebook reader which supports popular ebook formats: +ePub, fb2, mobi, rtf, html, plain text, and a lot of other formats. +It provides access to popular network libraries that contain a large +set of ebooks. Download books for free or for a fee. Add your own +catalog. Highly customizable. Choose colors, fonts, page turning +animations, dictionaries, bookmarks, etc. to make reading as +convenient as you want. -%package -n zlibrary +%package -n zlibrary%{zl_sover} Summary: Cross-platform GUI library -Group: Development/Libraries/C and C++ +Group: System/Libraries +Requires: zlibrary-data >= %{version} Requires: zlibrary-ui = %{version} -%description -n zlibrary +%description -n zlibrary%{zl_sover} ZLibrary is a cross-platform library to build applications running on desktop Linux, Windows, and different Linux-based PDAs. +%package -n zlibrary-data +Summary: Data files for Zlibrary +Group: Productivity/Other +BuildArch: noarch + +%description -n zlibrary-data +This package contains data files for Zlibrary. + %package -n zlibrary-devel Summary: Development files for zlibrary Group: Development/Libraries/C and C++ -Requires: zlibrary = %{version} +Requires: libzlui%{zl_sover} = %{version} +Requires: zlibrary%{zl_sover} = %{version} %description -n zlibrary-devel This package contains the libraries amd header files that are needed for writing applications with Zlibrary. -%package -n zlibrary-ui-gtk -Summary: GTK+ interface module for ZLibrary -Group: Development/Libraries/C and C++ -Provides: zlibrary-ui = %{version} - -%description -n zlibrary-ui-gtk -This package provides a GTK+-based UI for ZLibrary. - -%package -n zlibrary-ui-qt +%package -n libzlui%{zl_sover} Summary: Qt4 interface module for ZLibrary -Group: Development/Libraries/C and C++ +Group: System/Libraries Provides: zlibrary-ui = %{version} +Requires: zlibrary-data >= %{version} -%description -n zlibrary-ui-qt +%description -n libzlui%{zl_sover} This package provides a Qt4-based UI for ZLibrary. %prep %setup -q -%patch0 -cp %{SOURCE2} . +%patch0 -p1 +%if 0%{?suse_version} > 1320 +%patch1 -p0 +%endif %build -sed -i 's/moc-qt4/moc/' makefiles/arch/desktop.mk make %{?_smp_mflags} -C zlibrary/core TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=dummy +#TARGET_STATUS=debug make %{?_smp_mflags} -C zlibrary/text TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=dummy -make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=gtk make %{?_smp_mflags} -C zlibrary/ui TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=qt4 make %{?_smp_mflags} -C fbreader TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=dummy %install make -C zlibrary/core do_install do_install_dev DESTDIR=%{buildroot} TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=dummy make -C zlibrary/text do_install do_install_dev DESTDIR=%{buildroot} TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=dummy -make -C zlibrary/ui do_install DESTDIR=%{buildroot} TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=gtk make -C zlibrary/ui do_install DESTDIR=%{buildroot} TARGET_ARCH=desktop LIBDIR=%{_libdir} UI_TYPE=qt4 make -C fbreader do_install DESTDIR=%{buildroot} TARGET_ARCH=desktop UI_TYPE=dummy -touch %{buildroot}%{_libdir}/zlibrary/ui/zlui-active.so # desktop file mkdir -p %{buildroot}%{_datadir}/applications/ install -m644 %{SOURCE1} %{buildroot}%{_datadir}/applications/FBReader.desktop -%suse_update_desktop_file -i -n FBReader Office Viewer Literature # mime type mkdir -p %{buildroot}%{_datadir}/mime/packages/ @@ -154,50 +129,22 @@ %fdupes -s %{buildroot} %post -%if 0%{?suse_version} > 1130 %desktop_database_post -%endif %postun -%if 0%{?suse_version} > 1130 %desktop_database_postun -%endif -%post -n zlibrary -p /sbin/ldconfig +%post -n zlibrary%{zl_sover} -p /sbin/ldconfig -%postun -n zlibrary -p /sbin/ldconfig +%postun -n zlibrary%{zl_sover} -p /sbin/ldconfig -%post -n zlibrary-ui-gtk -%{_sbindir}/update-alternatives --install \ - %{_libdir}/zlibrary/ui/zlui-active.so \ - zlibrary-ui \ - %{_libdir}/zlibrary/ui/zlui-gtk.so \ - 2 - -%post -n zlibrary-ui-qt -%{_sbindir}/update-alternatives --install \ - %{_libdir}/zlibrary/ui/zlui-active.so \ - zlibrary-ui \ - %{_libdir}/zlibrary/ui/zlui-qt4.so \ - 1 - -%preun -n zlibrary-ui-gtk -if [ "$1" = 0 ] ; then - %{_sbindir}/update-alternatives --remove \ - zlibrary-ui \ - %{_libdir}/zlibrary/ui/zlui-gtk.so -fi - -%preun -n zlibrary-ui-qt -if [ "$1" = 0 ] ; then - %{_sbindir}/update-alternatives --remove \ - zlibrary-ui \ - %{_libdir}/zlibrary/ui/zlui-qt4.so -fi +%post -n libzlui%{zl_sover} -p /sbin/ldconfig + +%postun -n libzlui%{zl_sover} -p /sbin/ldconfig %files %defattr(-,root,root,-) -%doc fbreader/LICENSE README.SuSE +%doc fbreader/LICENSE ChangeLog %{_bindir}/FBReader %{_datadir}/FBReader %{_datadir}/applications/FBReader.desktop @@ -206,34 +153,25 @@ %{_datadir}/pixmaps/FBReader.png %{_mandir}/man1/FBReader.1.gz -%files -n zlibrary +%files -n zlibrary%{zl_sover} %defattr(-,root,root,-) %doc fbreader/LICENSE -%{_libdir}/lib*.so.* -%dir %{_libdir}/zlibrary -%dir %{_libdir}/zlibrary/ui -%exclude %{_datadir}/zlibrary/keynames-*.xml -%{_datadir}/zlibrary +%{_libdir}/libzlcore.so.* +%{_libdir}/libzltext.so.* -%files -n zlibrary-devel -%defattr(-,root,root,-) -%{_includedir}/* -%{_libdir}/lib*.so +%files -n zlibrary-data +%defattr(-,root,root) +%{_datadir}/zlibrary/ -%files -n zlibrary-ui-gtk +%files -n zlibrary-devel %defattr(-,root,root,-) -%dir %{_libdir}/zlibrary -%dir %{_libdir}/zlibrary/ui -%ghost %{_libdir}/zlibrary/ui/zlui-active.so -%{_libdir}/zlibrary/ui/zlui-gtk.so -%{_datadir}/zlibrary/keynames-gtk.xml +%{_includedir}/zlibrary/ +%{_libdir}/libzlcore.so +%{_libdir}/libzltext.so +%{_libdir}/libzlui.so -%files -n zlibrary-ui-qt +%files -n libzlui%{zl_sover} %defattr(-,root,root,-) -%dir %{_libdir}/zlibrary -%dir %{_libdir}/zlibrary/ui -%ghost %{_libdir}/zlibrary/ui/zlui-active.so -%{_libdir}/zlibrary/ui/zlui-qt4.so -%{_datadir}/zlibrary/keynames-qt4.xml +%{_libdir}/libzlui.so.* %changelog ++++++ FBReader-0.99.4-fix-crash-with-fb2.zip-files.patch ++++++ diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp --- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2012-11-30 19:41:25.000000000 +0700 +++ fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2013-02-21 13:30:31.000000000 +0700 @@ -49,3 +49,4 @@ path = replacement + path.substr(1); } + ZLUnixFSManager::normalizeRealPath(path); } ++++++ FBReader.desktop ++++++ --- /var/tmp/diff_new_pack.J6D99a/_old 2016-07-21 08:19:59.000000000 +0200 +++ /var/tmp/diff_new_pack.J6D99a/_new 2016-07-21 08:19:59.000000000 +0200 @@ -1,9 +1,19 @@ [Desktop Entry] Name=FBReader GenericName=E-book reader +GenericName[ar]=قارئ الكتب الإلكترونية +GenericName[es]=Lector de Libros +GenericName[hu]=E-könyv olvasó +GenericName[pl]=Czytnik e-książek GenericName[ru]=Чтение электронных книг +GenericName[zh_CN]=电子书阅读 Comment=E-book reader +Comment[ar]=قارئ الكتب الإلكترونية +Comment[es]=FBReader Lector de Libros Elecrónicos +Comment[hu]=FBReader, E-könyv olvasó program +Comment[pl]=FBReader, czytnik książek elektronicznych Comment[ru]=Чтение электронных книг +Comment[zh_CN]=FBReader 电子书阅读器 TryExec=FBReader Exec=FBReader %F StartupNotify=true ++++++ fbreader-0.99.4-gcc6-Wno-narrowing.diff ++++++ --- makefiles/config.mk.orig 2012-11-30 15:41:25.000000000 +0300 +++ makefiles/config.mk 2016-06-23 20:30:42.652441840 +0300 @@ -21,6 +21,7 @@ ARCHIVER_LIBS ?= -lz -lbz2 CFLAGS += -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\" +CFLAGS += -Wno-narrowing ifeq "$(ZLSHARED)" "yes" CFLAGS += -fPIC -DZLSHARED endif
