Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2020-11-04 18:26:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new.11331 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "digikam" Wed Nov 4 18:26:48 2020 rev:192 rq:845791 version:7.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2020-09-09 18:11:08.911701141 +0200 +++ /work/SRC/openSUSE:Factory/.digikam.new.11331/digikam.changes 2020-11-04 18:31:50.692220528 +0100 @@ -1,0 +2,13 @@ +Tue Nov 3 16:33:35 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Use cmake() style BuildRequires when possible. + +------------------------------------------------------------------- +Tue Nov 3 14:24:06 UTC 2020 - Stefan Brüns <[email protected]> + +- Remove several unused build dependencies (doxygen, graphviz, + all of boost but libboost_graph). +- Remove __DATE_/__TIME__ mangling, handled by SOURCE_DATE_EPOCH. +- Bump disk constraints, TW needs 9.3 GB currently. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.VM6T7c/_old 2020-11-04 18:31:53.276214800 +0100 +++ /var/tmp/diff_new_pack.VM6T7c/_new 2020-11-04 18:31:53.280214790 +0100 @@ -18,6 +18,7 @@ %define soversion 7 %bcond_without lang +%bcond_with apidocs Name: digikam Version: 7.1.0 Release: 0 @@ -30,44 +31,46 @@ Patch0: 0001-Revert-Exiv2-is-now-released-with-exported-targets-u.patch BuildRequires: QtAV-devel >= 1.12 BuildRequires: bison -BuildRequires: boost-devel -BuildRequires: doxygen BuildRequires: fdupes BuildRequires: flex -BuildRequires: graphviz-devel BuildRequires: hicolor-icon-theme -BuildRequires: kconfig-devel -BuildRequires: kcoreaddons-devel -BuildRequires: kdoctools-devel -BuildRequires: kfilemetadata5-devel -BuildRequires: ki18n-devel -BuildRequires: kiconthemes-devel -BuildRequires: kio-devel -BuildRequires: knotifications-devel -BuildRequires: knotifyconfig-devel -BuildRequires: kservice-devel -BuildRequires: kwindowsystem-devel -BuildRequires: kxmlgui-devel BuildRequires: lensfun BuildRequires: lensfun-devel +BuildRequires: libboost_graph-devel BuildRequires: libeigen3-devel BuildRequires: libexiv2-devel >= 0.26 BuildRequires: libexpat-devel BuildRequires: libjpeg8-devel -BuildRequires: libksane-devel >= 15.12.0 BuildRequires: liblcms2-devel BuildRequires: liblqr-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: libxml2-devel BuildRequires: libxslt-devel -BuildRequires: marble-devel BuildRequires: opencv-devel BuildRequires: pkgconfig -BuildRequires: solid-devel -BuildRequires: threadweaver-devel >= 5.5.0 BuildRequires: update-desktop-files +%if %{with apidocs} +BuildRequires: doxygen +BuildRequires: graphviz-devel +BuildRequires: cmake(KF5DocTools) +%endif BuildRequires: cmake(KF5CalendarCore) +BuildRequires: cmake(KF5Config) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5FileMetaData) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5KIO) +BuildRequires: cmake(KF5Notifications) +BuildRequires: cmake(KF5NotifyConfig) +BuildRequires: cmake(KF5Sane) +BuildRequires: cmake(KF5Service) +BuildRequires: cmake(KF5Solid) +BuildRequires: cmake(KF5ThreadWeaver) >= 5.5.0 +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(KF5XmlGui) +BuildRequires: cmake(Marble) BuildRequires: cmake(Qt5Concurrent) BuildRequires: cmake(Qt5Core) >= 5.9.0 BuildRequires: cmake(Qt5DBus) @@ -76,7 +79,6 @@ BuildRequires: cmake(Qt5OpenGL) BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Sql) -BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5X11Extras) BuildRequires: cmake(Qt5Xml) @@ -111,7 +113,7 @@ Obsoletes: %{name}-doc < %{version} # QWebEngine is not available on ppc64 %ifarch %{ix86} x86_64 %{arm} aarch64 mips mips64 -BuildRequires: akonadi-contact-devel +BuildRequires: cmake(KF5AkonadiContact) BuildRequires: cmake(Qt5WebEngineWidgets) %else %global qwebengine -DENABLE_QWEBENGINE:BOOL=OFF @@ -174,16 +176,13 @@ sed -i 's/set(DNN_DETECTION TRUE)/set(DNN_DETECTION FALSE)/' core/libs/facesengine/CMakeLists.txt %endif -# Remove build time references so build-compare can do its work -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') -FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" core/app/utils/digikam_version.h.cmake.in -sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/g" core/libs/dimg/filters/greycstoration/cimg/CImg.h -sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/g" core/libs/dimg/filters/greycstoration/cimg/CImg.h - %build %cmake_kf5 -d build -- -DENABLE_APPSTYLES=ON -DENABLE_MEDIAPLAYER=ON %{?qwebengine} -%make_jobs VERBOSE=1 +%cmake_build + +%if %{with apidocs} +%cmake_build doc +%endif %install %kf5_makeinstall -C build ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.VM6T7c/_old 2020-11-04 18:31:53.312214719 +0100 +++ /var/tmp/diff_new_pack.VM6T7c/_new 2020-11-04 18:31:53.316214711 +0100 @@ -1,7 +1,7 @@ <constraints> <hardware> <disk> - <size unit="G">8</size> + <size unit="G">10</size> </disk> </hardware> </constraints>
