From f2dd12b66698738ec0de16199d15e03267f8a835 Mon Sep 17 00:00:00 2001 From: Aleksei Nikiforov Date: Mon, 2 Oct 2017 12:51:25 +0300 Subject: [PATCH] 190088: FlightCrew-0.9.2-alt1 +1 more - Updated to upstream version 0.9.2. sigil-0.9.8-alt1 - Updated to upstream version 0.9.8. --- F/FlightCrew/FlightCrew.spec | 77 +++++++++++++++++++----------------- s/sigil/sigil.spec | 62 ++++++++++++++++++++--------- 2 files changed, 84 insertions(+), 55 deletions(-) diff --git a/F/FlightCrew/FlightCrew.spec b/F/FlightCrew/FlightCrew.spec index 384cab1f04a..aae4808f867 100644 --- a/F/FlightCrew/FlightCrew.spec +++ b/F/FlightCrew/FlightCrew.spec @@ -1,32 +1,33 @@ Name: FlightCrew -Version: 0.7.2 -Release: alt2.qa3 +Version: 0.9.2 +Release: alt1 Summary: EPUB validation tool Group: File tools License: LGPLv3+ -URL: http://code.google.com/p/flightcrew/ -Packager: ALT QA Team +URL: https://github.com/Sigil-Ebook/flightcrew + +# https://github.com/Sigil-Ebook/flightcrew.git Source: %name-%version.tar -Patch1: %name-0.7.2-fc18-soname.patch -Patch2: %name-0.7.2-fc18-as_shared.patch -Patch3: %name-0.7.2-fc18-use_system_zlib.patch -Patch4: %name-0.7.2-fc18-use_system_boost.patch -Patch5: %name-0.7.2-fc18-boost_1.48.patch -Patch6: %name-0.7.2-fc18-use_system_xerces-c.patch -Patch7: %name-0.7.2-fc18-headers.patch -Patch8: %name-0.7.2-fc18-without_googlemock.patch -Patch9: %name-0.7.2-fc18-FindFlightCrew.cmake.patch -Patch10: %name-0.7.2-fc18-shared_XercesExtensions.patch -Patch11: %name-0.7.2-fc18-shared_zipios.patch +Patch1: %name-%version-fedora-system-zlib.patch +Patch2: %name-%version-fedora-system-boost.patch +Patch3: %name-%version-fedora-system-xercec-c.patch +Patch4: %name-%version-fedora-dont-build-gmock.patch +Patch5: %name-%version-fedora-move-zipextraction.patch +Patch6: %name-%version-fedora-system-zipios.patch +Patch7: %name-%version-fedora-fix-installed-plugins.patch +Patch8: %name-%version-fedora-use-random-tmp-path.patch +Patch9: %name-%version-alt-build.patch BuildPreReq: rpm-macros-cmake BuildRequires: cmake gcc-c++ BuildRequires: zlib-devel BuildRequires: boost-devel boost-filesystem-devel boost-program_options-devel boost-datetime-devel boost-regex-devel boost-thread-devel boost-system-devel BuildRequires: xerces-c-devel >= 3.1 -BuildRequires: libqt4-devel +BuildRequires: python3-dev +BuildRequires: qt5-base-devel + Requires: lib%name = %version-%release %description @@ -47,17 +48,16 @@ Requires: lib%name = %version-%release %description gui FlightCrew is a C++, cross-platform, native code epub validator. -%package -n lib%name-devel -Summary: Development files for %name -Group: Development/C++ -Requires: lib%name = %version-%release +%package sigil-plugin +Summary: Sigil FlightCrew epub validator plugin +Group: File tools +Requires: sigil -%description -n lib%name-devel -The %name-devel package contains libraries and header files for -developing applications that use %name. +%description sigil-plugin +Sigil FlightCrew epub validator plugin. %prep -%setup -q +%setup %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -67,8 +67,6 @@ developing applications that use %name. %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 -#%patch11 -p1 # Fix EOL encoding for %%doc for i in INSTALL.txt README.txt ChangeLog.txt; do @@ -84,16 +82,21 @@ rm -rf src/googlemock # fix permissions chmod a-x src/utf8-cpp/utf8/*.h - %build -%cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_SHARED_FC=1 -DBUILD_SHARED_XE=1 -DNO_TEST_EXE=1 -DINCLUDE_INSTALL_DIR=%_includedir -cd BUILD -%make_build +%cmake -DBUILD_SHARED_FC:BOOL=ON -DNO_TEST_EXE=1 +pushd BUILD +%make_build +popd %install -cd BUILD +pushd BUILD %makeinstall_std +popd + +mkdir -p %buildroot%_datadir/sigil/plugins/%name +install -p -m 755 src/FlightCrew-plugin/plugin.py %buildroot%_datadir/sigil/plugins/%name +install -p -m 644 src/FlightCrew-plugin/plugin.xml %buildroot%_datadir/sigil/plugins/%name %files %doc INSTALL.txt README.txt ChangeLog.txt @@ -103,16 +106,16 @@ cd BUILD %_bindir/*-gui %files -n lib%name -%_libdir/*.so.* - -%files -n lib%name-devel -%_includedir/%name/ -%_includedir/XercesExtensions/ %_libdir/*.so -%_libdir/cmake/* +%files sigil-plugin +%_bindir/*-plugin +%_datadir/sigil/plugins/%name %changelog +* Fri Sep 29 2017 Aleksei Nikiforov 0.9.2-alt1 +- Updated to upstream version 0.9.2. + * Thu Apr 07 2016 Dmitry V. Levin (QA) 0.7.2-alt2.qa3 - NMU: rebuilt with boost 1.57.0 -> 1.58.0. diff --git a/s/sigil/sigil.spec b/s/sigil/sigil.spec index 81e7c4468df..3e7ea4eab3e 100644 --- a/s/sigil/sigil.spec +++ b/s/sigil/sigil.spec @@ -1,54 +1,80 @@ Name: sigil -Version: 0.6.1 -Release: alt1.qa1 +Version: 0.9.8 +Release: alt1 + +%set_verify_elf_method unresolved=relaxed Summary: Sigil is a free, open source, multi-platform WYSIWYG ebook editor -Summary(ru_RU.UTF-8): Сигиль есть свободный, открытый, многоплатформенный Вицивиговый книгоправщик +Summary(ru_RU.UTF-8): Sigil это свободный, открытый, многоплатформенный редактор типа WYSIWYG для электронных книг License: GPLv3 Group: Editors -Url: http://code.google.com/p/sigil/ -Packager: ALT QA Team +Url: https://sigil-ebook.com/ + +# skip dependencies which are actually provided (but files are located at non-standard location) +%add_python3_req_skip opf_newparser quickparser sigil_bs4 sigil_bs4.builder._lxml + +# https://github.com/Sigil-Ebook/Sigil.git +Source: %name-%version.tar -Source: %name-%version.tar.bz2 +Patch1: %name-%version-fedora-pluginrunner.patch +Patch2: %name-%version-fedora-system-dicts.patch +Patch3: %name-%version-alt-build.patch +Patch4: %name-%version-alt-dont-check-for-updates.patch +Patch5: %name-%version-alt-fix-version.patch + +BuildRequires(pre): rpm-macros-cmake rpm-build-python3 +BuildRequires: cmake gcc-c++ zlib-devel libhunspell-devel libpcre-devel +BuildRequires: qt5-base-devel qt5-webkit-devel qt5-svg-devel qt5-tools-devel qt5-xmlpatterns-devel +BuildRequires: boost-devel boost-filesystem-devel boost-program_options-devel boost-datetime-devel boost-regex-devel boost-thread-devel boost-system-devel +BuildRequires: python3-dev libminizip-devel -BuildPreReq: rpm-macros-cmake -BuildRequires: cmake >= 2.8.0 libqt4-devel >= 4.8 gcc-c++ libFlightCrew-devel zlib-devel libhunspell-devel libpcre-devel -BuildRequires: boost-devel boost-filesystem-devel boost-program_options-devel boost-datetime-devel boost-regex-devel boost-thread-devel boost-system-devel %description Sigil is a free, open source, multi-platform WYSIWYG ebook editor. -It is designed to edit books in ePub format. The version of the package -can be found in the ChangeLog.txt file. +It is designed to edit books in ePub format. %description -l ru_RU.UTF-8 -Сигиль есть свободный, открытый, многоплатформенный Вицивиговый -книгоправщик. Он разработан для правки книг в формате ePub. Версия же -набора может быть обретена в файле ChangeLog.txt. +Sigil это свободный, открытый, многоплатформенный редактор +типа WYSIWYG для электронных книг. +Он разработан для правки книг в формате ePub. %prep %setup +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build -%cmake -cd BUILD +%cmake \ + -DUSE_SYSTEM_LIBS:BOOL=ON \ + -DSYSTEM_LIBS_REQUIRED:BOOL=ON + +pushd BUILD %make_build +popd %install pushd BUILD %makeinstall_std popd -%find_lang %name + mkdir -p %buildroot%_liconsdir mv %buildroot%_pixmapsdir/*.png %buildroot%_liconsdir/ %files -%doc INSTALL.txt README.txt ChangeLog.txt +%doc README.md ChangeLog.txt %_bindir/* +%_libdir/%name %_desktopdir/*.desktop %_liconsdir/*.png %dir %_datadir/%name %_datadir/%name/* %changelog +* Fri Sep 29 2017 Aleksei Nikiforov 0.9.8-alt1 +- Updated to upstream version 0.9.8. + * Thu Apr 07 2016 Dmitry V. Levin (QA) 0.6.1-alt1.qa1 - NMU: rebuilt with rebuilt libFlightCrew.so.0.7.