From ae89b9703c8da663a07de7eb6e1e538dc2e79d78 Mon Sep 17 00:00:00 2001 From: Ryan S. Elliott Date: Jul 31 2019 03:22:20 +0000 Subject: [PATCH 1/4] Update kim-api.spec to 2.1.2 and add zsh completions --- diff --git a/kim-api.spec b/kim-api.spec index b9f193b..617e50b 100644 --- a/kim-api.spec +++ b/kim-api.spec @@ -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 @@ -57,16 +57,12 @@ This package contains the example models for the KIM-API. %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=%{compdir} -DZSH_COMPLETION_COMPLETIONSDIR=/usr/share/zsh/site-functions .. %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 @@ -78,9 +74,6 @@ mv %{buildroot}%{_libdir}/kim-api/cmake/kim-api-config-version.cmake %{buildroot 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 @@ -93,6 +86,8 @@ sed -i 's@-Wl,-rpath,%{_libdir} @@' %{buildroot}%{_libdir}/pkgconfig/libkim-api. %{_libexecdir}/kim-api/kim-api-shared-library-test %{_libdir}/libkim-api.so.%{sover} %{compdir}/kim-api-collections-management.bash +/usr/share/zsh/site-functions/_kim-api-collections-management +/usr/share/zsh/site-functions/kim-api-collections-management.bash %{_datadir}/emacs/site-lisp/kim-api-c-style.el %files devel @@ -106,10 +101,13 @@ sed -i 's@-Wl,-rpath,%{_libdir} @@' %{buildroot}%{_libdir}/pkgconfig/libkim-api. %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 - 2.1.2-1 +- update to 2.1.2 and add zsh completions + * Thu Jul 25 2019 Fedora Release Engineering - 2.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 2491f46e227d061a92cdf9a00185441218cb9572 Mon Sep 17 00:00:00 2001 From: Ryan S. Elliott Date: Jul 31 2019 03:24:49 +0000 Subject: [PATCH 2/4] Update sources to 2.1.2 --- diff --git a/sources b/sources index b6dd2df..b83cbc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kim-api-2.0.2.txz) = 69d9c506e365f0633d539c0047bc11f057e28788644ce27083ef9772bfbce31f23519301479fe26588496d5fbe3bcc3c74aea81ddfc1e8c2c1a4d8fa56f108e8 +SHA512 (kim-api-2.1.2.txz) = b00a2ca30d635967e2ea3b4c6419c725d18fb699c021810a74e05b438df4397e7739a40f85be2a5a545b4a0927ac29dfc040093886189b5baf54b1a89b691e3c \ No newline at end of file From e7d8a2722cb336c5fd1e0471c43c04e93f135bd5 Mon Sep 17 00:00:00 2001 From: Ryan S. Elliott Date: Jul 31 2019 12:54:40 +0000 Subject: [PATCH 3/4] Update kim-api.spec update zsh install details --- diff --git a/kim-api.spec b/kim-api.spec index 617e50b..285edca 100644 --- a/kim-api.spec +++ b/kim-api.spec @@ -10,10 +10,11 @@ BuildRequires: gcc-c++ 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,7 +58,7 @@ This package contains the example models for the KIM-API. %build mkdir build pushd build -%{cmake3} -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} -DBASH_COMPLETION_COMPLETIONSDIR=%{compdir} -DZSH_COMPLETION_COMPLETIONSDIR=/usr/share/zsh/site-functions .. +%{cmake3} -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_LIBEXECDIR=%{_libexecdir} -DBASH_COMPLETION_COMPLETIONSDIR=%{b_compdir} -DZSH_COMPLETION_COMPLETIONSDIR=%{z_compdir} .. %make_build %install @@ -85,9 +86,9 @@ mv %{buildroot}%{_libdir}/kim-api/cmake/Modules/FindKIM-API.cmake %{buildroot}%{ %{_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 -/usr/share/zsh/site-functions/_kim-api-collections-management -/usr/share/zsh/site-functions/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 %{_datadir}/emacs/site-lisp/kim-api-c-style.el %files devel From d74ba7c7c766d089bd6e435103197fa9ba20f885 Mon Sep 17 00:00:00 2001 From: Ryan S. Elliott Date: Jul 31 2019 14:35:30 +0000 Subject: [PATCH 4/4] Update kim-api.spec update cmake file install handling --- diff --git a/kim-api.spec b/kim-api.spec index 285edca..84f4c35 100644 --- a/kim-api.spec +++ b/kim-api.spec @@ -68,13 +68,6 @@ pushd build 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 - %ldconfig_scriptlets %files