diff --git a/krusader.spec b/krusader.spec index d778e6a..897e0ec 100644 --- a/krusader.spec +++ b/krusader.spec @@ -1,6 +1,6 @@ Name: krusader -Version: 2.6.0 -Release: 2%{?dist} +Version: 2.7.0 +Release: 1%{?dist} Summary: An advanced twin-panel (commander-style) file-manager for KDE Group: Applications/File @@ -56,15 +56,14 @@ pushd %{_target_platform} %{cmake_kf5} .. popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} -C %{_target_platform} +%make_install -C %{_target_platform} # Merge applications into one software center item -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/org.kde.krusader.root-mode.appdata.xml < %{buildroot}%{_datadir}/metainfo/org.kde.krusader.root-mode.appdata.xml < @@ -77,10 +76,10 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/org.kde.krusader.root-mode.appdata.xml EOF # Make symlink relative and remove wrong EOL -pushd $RPM_BUILD_ROOT%{_docdir}/HTML/ +pushd %{buildroot}%{_docdir}/HTML/ for i in * do - pushd $RPM_BUILD_ROOT%{_docdir}/HTML/$i/krusader/ + pushd %{buildroot}%{_docdir}/HTML/$i/krusader/ for j in *.docbook do tr -d '\r' < $j > ${j}.tmp @@ -98,24 +97,13 @@ for i in %{buildroot}%{_datadir}/applications/org.kde.krusader*.desktop ; do desktop-file-validate $i done -%post -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : -xdg-desktop-menu forceupdate 2> /dev/null || : - -%postun -xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : -xdg-icon-resource forceupdate --theme locolor 2> /dev/null || : -xdg-desktop-menu forceupdate 2> /dev/null || : - %files -f %{name}.lang -%defattr(-,root,root,-) %doc doc-extras/actions_tutorial.txt -%doc AUTHORS ChangeLog COPYING FAQ README SVNNEWS TODO +%doc AUTHORS ChangeLog COPYING FAQ README NEWS TODO %{_sysconfdir}/xdg/kio_isorc %{_bindir}/* %{_libdir}/qt5/plugins/*.so -%{_datadir}/appdata/org.kde.%{name}*.appdata.xml +%{_datadir}/metainfo/org.kde.%{name}*.appdata.xml %{_datadir}/applications/org.kde.krusader*.desktop %{_datadir}/doc/HTML/*/krusader/* %{_datadir}/icons/hicolor/*/apps/*.png @@ -126,6 +114,9 @@ xdg-desktop-menu forceupdate 2> /dev/null || : %{_mandir}/*/man1/krusader.1.gz %changelog +* Fri May 18 2018 Vitaly Zaitsev - 2.7.0-1 +- Updated to version 2.7.0. + * Wed Feb 07 2018 Fedora Release Engineering - 2.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 3ab8d69..11e3d68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (krusader-2.6.0.tar.xz) = d7ae1696e77ddbd8b18043e8497356151ddaa69192a89dbf1f4381216318aaca97a0be4e44595e51007f1eccf73eec55c3bd9f694aaacfa138aa3391f1f5d898 +SHA512 (krusader-2.7.0.tar.xz) = 254b1a0a68fca010dfe79d8364ca745dacc2b5899c9b99d6c576b95e9ac8a564a59a291568158ec1f114b0e2c0137e2a9e7a9b4c01497539e6a9a9d5b7411b1d