PR#1: update to 2.1.2 and add zsh completions - rpms/kim-api

rpms / kim-api

#1 update to 2.1.2 and add zsh completions

Closed 4 years ago by junghans. Opened 4 years ago by ellio167.

Unknown source update-to-2.1.2 into master

Update kim-api.spec update cmake file install handling

Ryan S. Elliott • 4 years ago

d74ba7c

Update kim-api.spec update zsh install details

Ryan S. Elliott • 4 years ago

e7d8a27

Update sources to 2.1.2

Ryan S. Elliott • 4 years ago

2491f46

Update kim-api.spec to 2.1.2 and add zsh completions

Ryan S. Elliott • 4 years ago

ae89b97

kim-api.spec

file modified

+13 -21

		`@@ -1,5 +1,5 @@`
		`Name: kim-api`
		`- Version: 2.0.2`
		`+ Version: 2.1.2`
		`%global sover 2`
		`Release: 4%{?dist}`
		`Summary: Open Knowledgebase of Interatomic Models KIM API`
		`@@ -10,10 +10,11 @@`
		`BuildRequires: gcc-gfortran`
		`BuildRequires: pkgconfig`
		`BuildRequires: bash-completion`
		`- %global compdir %(pkg-config --variable=completionsdir bash-completion)`
		`- %if "%{compdir}" == ""`
		`- %global compdir "/etc/bash_completion.d"`
		`+ %global b_compdir %(pkg-config --variable=completionsdir bash-completion)`
		`+ %if "%{b_compdir}" == ""`
		`+ %global b_compdir "/etc/bash_completion.d"`
		`%endif`
		`+ %global z_compdir "%{_datadir}/zsh/site-functions"`
		`BuildRequires: cmake3 >= 3.4`
		`BuildRequires: vim`

		`@@ -57,30 +58,16 @@`
		`%build`
		`mkdir build`
		`pushd build`
		`- %{cmake3} -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} ..`
		`+ %{cmake3} -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} -DBASH_COMPLETION_COMPLETIONSDIR=%{b_compdir} -DZSH_COMPLETION_COMPLETIONSDIR=%{z_compdir} ..`
		`%make_build`

		`%install`
		`%make_install -C build`

		`- #bash completion files`
		`- mkdir -p %{buildroot}%{compdir}`
		`- [ "%{compdir}" = "/etc/bash_completion.d" ] \|\| mv %{buildroot}/etc/bash_completion.d/kim-api-collections-management.bash %{buildroot}%{compdir}`
		`-`
		`# emacs files`
		`mkdir -p %{buildroot}%{_datadir}/emacs/site-lisp`
		`mv %{buildroot}/usr/share/emacs/site-lisp/kim-api/kim-api-c-style.el %{buildroot}%{_datadir}/emacs/site-lisp/kim-api-c-style.el`

		`- # fix cmake files location`
		`- mkdir -p %{buildroot}%{_datadir}/cmake/kim-api`
		`- mv %{buildroot}%{_libdir}/kim-api/cmake/kim-api-config.cmake %{buildroot}%{_datadir}/cmake/kim-api/kim-api-config.cmake`
		`- mv %{buildroot}%{_libdir}/kim-api/cmake/kim-api-config-version.cmake %{buildroot}%{_datadir}/cmake/kim-api/kim-api-config-version.cmake`
		`- mkdir -p %{buildroot}%{_datadir}/cmake/Modules`
		`- mv %{buildroot}%{_libdir}/kim-api/cmake/Modules/FindKIM-API.cmake %{buildroot}%{_datadir}/cmake/Modules/FindKIM-API.cmake`
		`-`
		`- #fix pkg-config file`
		`- sed -i 's@-Wl,-rpath,%{_libdir} @@' %{buildroot}%{_libdir}/pkgconfig/libkim-api.pc`
		`-`
		`%ldconfig_scriptlets`

		`%files`
		`@@ -92,7 +79,9 @@`
		`%{_libexecdir}/kim-api/kim-api-simulator-model`
		`%{_libexecdir}/kim-api/kim-api-shared-library-test`
		`%{_libdir}/libkim-api.so.%{sover}`
		`- %{compdir}/kim-api-collections-management.bash`
		`+ %{b_compdir}/kim-api-collections-management.bash`
		`+ %{z_compdir}/_kim-api-collections-management`
		`+ %{z_compdir}kim-api-collections-management.bash`
junghans commented 4 years ago I think here is a `/` missing.
		`%{_datadir}/emacs/site-lisp/kim-api-c-style.el`

		`%files devel`
		`@@ -106,10 +95,13 @@`

		`%files examples`
		`%{_libdir}/kim-api/model-drivers/`
		`- %{_libdir}/kim-api/models/`
		`+ %{_libdir}/kim-api/portable-models/`
		`%{_libdir}/kim-api/simulator-models/`

		`%changelog`
		`+ * Tue Jul 30 2019 Ryan S. Elliott <relliott@umn.edu> - 2.1.2-1`
		`+ - update to 2.1.2 and add zsh completions`
		`+`
		`* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-4`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (kim-api-2.0.2.txz) = 69d9c506e365f0633d539c0047bc11f057e28788644ce27083ef9772bfbce31f23519301479fe26588496d5fbe3bcc3c74aea81ddfc1e8c2c1a4d8fa56f108e8`
		`+ SHA512 (kim-api-2.1.2.txz) = b00a2ca30d635967e2ea3b4c6419c725d18fb699c021810a74e05b438df4397e7739a40f85be2a5a545b4a0927ac29dfc040093886189b5baf54b1a89b691e3c`
		`\ No newline at end of file`

ellio167 commented 4 years ago

now using z_compdir with #{_datadir}

junghans commented on line 41 of kim-api.spec 4 years ago

I would use %{_datadir} here.

1 new commit added

Update kim-api.spec update zsh install details

4 years ago

1 new commit added

Update kim-api.spec update cmake file install handling

4 years ago

ellio167 commented 4 years ago

@junghans Is there a way to trigger the build? Or a way to find a running build?

junghans commented 4 years ago

It just takes a while.

The last CI failed with:

BUILDSTDERR: mv: cannot stat '/builddir/build/BUILDROOT/kim-api-2.1.2-4.fc31.arm/usr/lib/kim-api/cmake/kim-api-config.cmake': No such file or directory

ellio167 commented 4 years ago

OK, I'll be more patient. I think I fixed the cause of the last CI failure. We'll see if it is successful this time. Thanks.

ellio167 commented 4 years ago

[citest]

Pull-Request has been closed by ellio167

4 years ago

Pull-Request has been reopened by ellio167

4 years ago

junghans commented on line 62 of kim-api.spec 4 years ago

I think here is a / missing.

junghans commented 4 years ago

Even with that / I am now getting:

Processing files: kim-api-2.1.2-4.fc31.x86_64
error: More than one file on a line: /_kim-api-collections-management
error: More than one file on a line: /kim-api-collections-management.bash

I have seen that error before, but I don't remember how I fixed it in the past.

junghans commented 4 years ago

See https://src.fedoraproject.org/fork/junghans/rpms/kim-api/tree/update-to-2.1.2 and https://koji.fedoraproject.org/koji/taskinfo?taskID=36767148

junghans commented 4 years ago

Merged.