Compare commits

..

No commits in common. 'i10ce' and 'i9ce' have entirely different histories.
i10ce ... i9ce

@ -1 +1 @@
51f14864b8d3fbf43282e945d2891c399c058438 SOURCES/dolphin-24.08.2.tar.xz 56aea0789e5d8d1c3d4357e771ab1a9d1e2435dd SOURCES/dolphin-23.08.5.tar.xz

2
.gitignore vendored

@ -1 +1 @@
SOURCES/dolphin-24.08.2.tar.xz SOURCES/dolphin-23.08.5.tar.xz

@ -1,82 +1,98 @@
%global tests 1 # uncomment to enable bootstrap mode
#global bootstrap 1
Name: dolphin %if !0%{?bootstrap}
Summary: KDE File Manager #global tests 1
Version: 24.08.2 %endif
Release: 1%{?dist}
## autostart 'dolphin --daemon' instead of relying on potentially unlreliable dbus-activation
## https://bugzilla.redhat.com/1394927
## https://bugzilla.redhat.com/1754395
#global dolphin_autostart 1
Name: dolphin
Summary: KDE File Manager
Version: 23.08.5
Release: 1%{?dist}
License: GPLv2+
URL: https://invent.kde.org/system/dolphin
%global revision %(echo %{version} | cut -d. -f3)
%global majmin_ver %(echo %{version} | cut -d. -f1,2)
%if %{revision} >= 50
%global stable unstable
%else
%global stable stable
%endif
Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-%{version}.tar.xz
License: BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.0-only AND LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-3.0-only AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) ## upstream patches (master)
URL: https://invent.kde.org/system/dolphin
Source0: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%{name}-%{version}.tar.xz
# for %%check
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib BuildRequires: libappstream-glib
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: extra-cmake-modules BuildRequires: extra-cmake-modules >= 5.71
BuildRequires: kf6-rpm-macros BuildRequires: kf5-rpm-macros
BuildRequires: cmake(KF5DocTools)
BuildRequires: cmake(KF6Baloo) BuildRequires: cmake(KF5KCMUtils)
BuildRequires: cmake(KF6BalooWidgets) BuildRequires: cmake(KF5NewStuff)
BuildRequires: cmake(KF6Bookmarks) BuildRequires: cmake(KF5CoreAddons)
BuildRequires: cmake(KF6Codecs) BuildRequires: cmake(KF5I18n)
BuildRequires: cmake(KF6Completion) BuildRequires: cmake(KF5DBusAddons)
BuildRequires: cmake(KF6Config) BuildRequires: cmake(KF5Bookmarks)
BuildRequires: cmake(KF6CoreAddons) BuildRequires: cmake(KF5Config)
BuildRequires: cmake(KF6Crash) BuildRequires: cmake(KF5KIO)
BuildRequires: cmake(KF6DBusAddons) BuildRequires: cmake(KF5Parts)
BuildRequires: cmake(KF6DocTools) BuildRequires: cmake(KF5Solid)
BuildRequires: cmake(KF6FileMetaData) BuildRequires: cmake(KF5IconThemes)
BuildRequires: cmake(KF6I18n) BuildRequires: cmake(KF5Completion)
BuildRequires: cmake(KF6IconThemes) BuildRequires: cmake(KF5TextWidgets)
BuildRequires: cmake(KF6KCMUtils) BuildRequires: cmake(KF5Notifications)
BuildRequires: cmake(KF6KIO) BuildRequires: cmake(KF5Crash)
BuildRequires: cmake(KF6NewStuff) BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(KF6Notifications)
BuildRequires: cmake(KF6Parts) BuildRequires: phonon-qt5-devel
BuildRequires: cmake(KF6Solid) BuildRequires: qt5-qtbase-devel
BuildRequires: cmake(KF6TextWidgets) BuildRequires: cmake(Qt5X11Extras)
BuildRequires: cmake(KF6UserFeedback)
BuildRequires: cmake(KF6WidgetsAddons) %if ! 0%{?bootstrap}
BuildRequires: cmake(KF6WindowSystem) BuildRequires: kf5-kactivities-devel
BuildRequires: kf5-baloo-devel
BuildRequires: cmake(PlasmaActivities) BuildRequires: kf5-kfilemetadata-devel
BuildRequires: baloo-widgets-devel
BuildRequires: cmake(Qt6Concurrent) %endif
BuildRequires: cmake(Qt6Core)
BuildRequires: cmake(Qt6DBus)
BuildRequires: cmake(Qt6Gui)
BuildRequires: cmake(Qt6Widgets)
BuildRequires: qt6-qtbase-private-devel
BuildRequires: cmake(packagekitqt6)
BuildRequires: cmake(Phonon4Qt6)
%if 0%{?tests} %if 0%{?tests}
BuildRequires: make
BuildRequires: xorg-x11-server-Xvfb BuildRequires: xorg-x11-server-Xvfb
BuildRequires: rubygem(test-unit) BuildRequires: rubygem(test-unit)
%endif %endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Recommends: konsole-part%{?_isa}
Recommends: kio-fuse%{?_isa} Recommends: kio-fuse%{?_isa}
Recommends: kio-extras%{?_isa} Recommends: kio-extras%{?_isa}
Recommends: %{name}-plugins Recommends: %{name}-plugins
# translations moved here
Conflicts: kde-l10n < 17.03
%description %description
%{summary}. %{summary}.
%package libs %package libs
Summary: Dolphin runtime libraries Summary: Dolphin runtime libraries
Requires: %{name} = %{version}-%{release}
%description libs %description libs
%{summary}. %{summary}.
%package devel %package devel
Summary: Developer files for %{name} Summary: Developer files for %{name}
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: qt6-qtbase-devel%{?_isa} Requires: qt5-qtbase-devel%{?_isa}
Requires: kf6-kio-devel%{?_isa} Requires: kf5-kio-devel%{?_isa}
%description devel %description devel
%{summary}. %{summary}.
@ -86,7 +102,7 @@ Requires: kf6-kio-devel%{?_isa}
%build %build
%cmake_kf6 \ %cmake_kf5 \
%{?flatpak:-DFLATPAK:BOOL=ON} \ %{?flatpak:-DFLATPAK:BOOL=ON} \
-DKDE_INSTALL_SYSTEMDUSERUNITDIR=%{_userunitdir} \ -DKDE_INSTALL_SYSTEMDUSERUNITDIR=%{_userunitdir} \
-DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
@ -99,120 +115,92 @@ Requires: kf6-kio-devel%{?_isa}
%find_lang dolphin --all-name --with-html %find_lang dolphin --all-name --with-html
%if 0%{?dolphin_autostart}
rm -fv %{buildroot}%{_datadir}/dbus-1/services/org.kde.dolphin.FileManager1.service
install -m644 -p -D \
%{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop \
%{buildroot}%{_kf5_sysconfdir}/xdg/autostart/org.kde.%{name}.desktop
desktop-file-edit \
--add-only-show-in=KDE \
--set-key=Exec --set-value="dolphin --daemon" \
%{buildroot}%{_kf5_sysconfdir}/xdg/autostart/org.kde.%{name}.desktop
%endif
%if 0%{?flatpak}
for i in 16 22 32 48 64 128; do
install -D -m0644 src/icons/${i}-system-file-manager.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/system-file-manager.png
done
install -D -m0644 src/icons/system-file-manager.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/system-file-manager.svg
%endif
%check %check
appstream-util validate-relax --nonet %{buildroot}%{_kf6_metainfodir}/org.kde.%{name}.appdata.xml appstream-util validate-relax --nonet %{buildroot}%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml ||:
desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.%{name}.desktop desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop ||:
%if 0%{?tests} %if 0%{?tests}
xvfb-run -a bash -c "%ctest" || : export CTEST_OUTPUT_ON_FAILURE=1
xvfb-run -a \
make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||:
%endif %endif
%files -f dolphin.lang %files -f dolphin.lang
%license LICENSES/* %license LICENSES/*
%doc README* %doc README*
%{_kf6_datadir}/qlogging-categories6/dolphin.* %{_kf5_datadir}/qlogging-categories5/dolphin.*
%{_kf6_bindir}/dolphin %{_kf5_bindir}/dolphin
%{_kf6_bindir}/servicemenuinstaller %{_kf5_bindir}/servicemenuinstaller
%{_kf6_datadir}/config.kcfg/dolphin_* %{_kf5_datadir}/config.kcfg/dolphin_*
%{_kf6_datadir}/knsrcfiles/* %{_kf5_datadir}/knsrcfiles/*
%if 0%{?dolphin_autostart}
%{_kf5_sysconfdir}/xdg/autostart/org.kde.%{name}.desktop
%else
%if 0%{?flatpak} %if 0%{?flatpak}
%{_datadir}/dbus-1/services/org.freedesktop.FileManager1.service %{_datadir}/dbus-1/services/org.freedesktop.FileManager1.service
%else %else
%{_datadir}/dbus-1/services/org.kde.dolphin.FileManager1.service %{_datadir}/dbus-1/services/org.kde.dolphin.FileManager1.service
%endif %endif
%{_userunitdir}/plasma-dolphin.service %endif
%{_kf6_metainfodir}/org.kde.%{name}.appdata.xml %{_userunitdir}/*
%{_kf6_datadir}/applications/org.kde.%{name}.desktop %{_kf5_metainfodir}/org.kde.%{name}.appdata.xml
%dir %{_kf6_datadir}/kglobalaccel/ %{_kf5_datadir}/applications/org.kde.%{name}.desktop
%{_kf6_datadir}/kglobalaccel/org.kde.dolphin.desktop %dir %{_kf5_datadir}/kglobalaccel/
%{_kf6_datadir}/kconf_update/dolphin_detailsmodesettings.upd %{_kf5_datadir}/kglobalaccel/org.kde.dolphin.desktop
%{_kf6_datadir}/kconf_update/dolphin_directorysizemode.py %lang(fi) %{_datadir}/locale/fi/LC_SCRIPTS/dolphin/
%{_kf6_datadir}/kconf_update/dolphin_directorysizemode.upd %{_kf5_datadir}/kconf_update/dolphin_detailsmodesettings.upd
%dir %{_kf6_datadir}/dolphin %dir %{_kf5_datadir}/dolphin
%{_kf6_datadir}/dolphin/dolphinpartactions.desktop %{_kf5_datadir}/dolphin/dolphinpartactions.desktop
%{_kf6_datadir}/zsh/site-functions/_dolphin %{_kf5_datadir}/zsh/site-functions/_dolphin
%{_kf6_datadir}/icons/hicolor/scalable/apps/org.kde.dolphin.svg %if 0%{?flatpak}
%{_datadir}/icons/hicolor/*/apps/system-file-manager.*
%endif
%files libs %files libs
%{_kf6_libdir}/libdolphinprivate.so.* %{_kf5_libdir}/libdolphinprivate.so.*
%{_kf6_libdir}/libdolphinvcs.so.* %{_kf5_libdir}/libdolphinvcs.so.*
%{_kf6_plugindir}/parts/dolphinpart.so %{_kf5_qtplugindir}/dolphin/
%{_kf6_qtplugindir}/dolphin/ %{_kf5_plugindir}/parts/dolphinpart.so
%{_kf6_qtplugindir}/kf6/kfileitemaction/movetonewfolderitemaction.so
%files devel %files devel
%{_includedir}/Dolphin/ %{_includedir}/Dolphin/
%{_includedir}/dolphin*_export.h %{_includedir}/dolphin*_export.h
%{_kf6_libdir}/cmake/DolphinVcs/ %{_kf5_libdir}/cmake/DolphinVcs/
%{_kf6_libdir}/libdolphinvcs.so %{_kf5_libdir}/libdolphinvcs.so
%{_datadir}/dbus-1/interfaces/org.freedesktop.FileManager1.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.FileManager1.xml
%changelog %changelog
* Wed Jan 15 2025 Arkady L. Shane <tigro@msvsphere-os.ru> - 24.08.2-1 * Mon Sep 02 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 23.08.5-1
- Rebuilt for MSVSphere 10 - Rebuilt for MSVSphere 9.4
* Tue Oct 08 2024 Steve Cossette <farchord@gmail.com> - 24.08.2-1
- 24.08.2
* Wed Sep 25 2024 Alessandro Astone <ales.astone@gmail.com> - 24.08.1-1
- 24.08.1
* Thu Aug 22 2024 Steve Cossette <farchord@gmail.com> - 24.08.0-1
- 24.08.0
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 24.05.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sun Jul 07 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 24.05.2-1
- 24.05.2
* Fri Jun 14 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 24.05.1-1
- 24.05.1
* Fri May 17 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 24.05.0-1
- 24.05.0
* Fri Apr 12 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 24.02.2-1
- 24.02.2
* Thu Apr 04 2024 Jan Grulich <jgrulich@redhat.com> - 24.02.1-2
- Rebuild (qt6)
* Fri Mar 29 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 24.02.1-1
- 24.02.1
* Wed Feb 21 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 24.02.0-1
- 24.02.0
* Fri Feb 16 2024 Jan Grulich <jgrulich@redhat.com> - 24.01.95-2
- Rebuild (qt6)
* Wed Jan 31 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 24.01.95-1
- 24.01.95
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 24.01.90-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 24.01.90-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jan 11 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 24.01.90-1
- 24.01.90
* Sat Dec 23 2023 ales.astone@gmail.com - 24.01.85-1
- 24.01.85
* Sun Dec 03 2023 Alessandro Astone <ales.astone@gmail.com> - 24.01.80-1 * Thu Feb 15 2024 Alessandro Astone <ales.astone@gmail.com> - 23.08.5-1
- Update to 24.01.80 - 23.08.5
* Wed Nov 29 2023 Jan Grulich <jgrulich@redhat.com> - 24.01.75-2 * Sun Dec 17 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.08.4-1
- Rebuild (qt6) - 23.08.4
* Sat Nov 25 2023 Alessandro Astone <ales.astone@gmail.com> - 24.01.75-1 * Tue Nov 14 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.08.3-1
- 24.01.75 - 23.08.3
- Requires konsole-part
* Thu Oct 12 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.08.2-1 * Thu Oct 12 2023 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 23.08.2-1
- 23.08.2 - 23.08.2
@ -293,7 +281,7 @@ xvfb-run -a bash -c "%ctest" || :
- 21.12.3 - 21.12.3
* Mon Feb 07 2022 Rex Dieter <rdieter@fedoraproject.org> - 21.12.2.1-1 * Mon Feb 07 2022 Rex Dieter <rdieter@fedoraproject.org> - 21.12.2.1-1
- 21.12.2.1 - 21.12.2.1
* Wed Feb 02 2022 Rex Dieter <rdieter@fedoraproject.org> - 21.12.2-1 * Wed Feb 02 2022 Rex Dieter <rdieter@fedoraproject.org> - 21.12.2-1
- 21.12.2 - 21.12.2

Loading…
Cancel
Save