Accepting request 1142890 from home:simotek:branches:shells

- Fix changelog timestamp in the last entry
- Hard code rather then use -DCMAKE_INSTALL_DOCDIR:PATH=%{__cmake_make_prefix_relative %{_docdir}/%{name}
  It was causing issues with the 15.5 build

OBS-URL: https://build.opensuse.org/request/show/1142890
OBS-URL: https://build.opensuse.org/package/show/shells/fish?expand=0&rev=89
This commit is contained in:
Simon Lees 2024-01-31 04:46:33 +00:00 committed by Git OBS Bridge
parent d1919176f1
commit fa0cf67993
2 changed files with 21 additions and 4 deletions

View File

@ -1,5 +1,18 @@
-------------------------------------------------------------------
Mon Jan 1 18:42:02 UTC 2023 - Victorhck <victorhck@opensuse.org>
Tue Jan 30 10:17:54 UTC 2024 - Simon Lees <sflees@suse.de>
- Fix changelog timestamp in the last entry
- Hard code rather then use -DCMAKE_INSTALL_DOCDIR:PATH=%{__cmake_make_prefix_relative %{_docdir}/%{name}
It was causing issues with the 15.5 build
-------------------------------------------------------------------
Wed Jan 24 14:38:01 UTC 2024 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Fix build to cope with changes in (open)SUSE specific cmake
macros, move documentation to canonical location.
-------------------------------------------------------------------
Mon Jan 1 18:42:02 UTC 2024 - Victorhck <victorhck@opensuse.org>
- Update to 3.7.0:
* The history pager will now also attempt subsequence matches (#9476),

View File

@ -67,14 +67,18 @@ find share/tools -type f -name *.py -exec \
%cmake \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}
-DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} \
-DCMAKE_INSTALL_DOCDIR:PATH=share/doc/packages/fish \
%{nil}
%cmake_build
%install
%cmake_install
%find_lang %{name}
rm %{buildroot}/%{_datadir}/doc/fish/.buildinfo
# Location varies between TW and SLE/Leap, try both
rm %{buildroot}/%{_datadir}/doc/packages/fish/.buildinfo
%suse_update_desktop_file -G "Command-line interpreter" fish TerminalEmulator
@ -102,7 +106,7 @@ fi
%{_bindir}/fish
%{_bindir}/fish_indent
%{_bindir}/fish_key_reader
%{_datadir}/doc/%{name}
%doc %{_datadir}/doc/packages/%{name}
%{_datadir}/%{name}
%{_mandir}/man1/*.1%{?ext_man}
%{_datadir}/applications/fish.desktop