pool/suse-hpc
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 672358 from science:HPC

Browse Source 
- macros.hpc: Improve master package description and README message. (forwarded request 672357 from eeich)

OBS-URL: https://build.opensuse.org/request/show/672358
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-hpc?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2019-02-11 20:17:16 +00:00 committed by Git OBS Bridge
commit ef1ff96b94
4 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -6,7 +6,7 @@
<param name="exclude">.git</param> <param name="exclude">.git</param>
<param name="filename">suse-hpc</param> <param name="filename">suse-hpc</param>
<param name="versionformat">0.4.%h</param> <param name="versionformat">0.4.%h</param>
<param name="revision">87f3f2c336d9dc5f9e8874e7639459371cfae3b0</param> <param name="revision">ec20e912f5395e091bede4849ecc5476581c1871</param>
<param name="extract">general/dlinfo.c</param> <param name="extract">general/dlinfo.c</param>
<param name="extract">general/macros.hpc</param> <param name="extract">general/macros.hpc</param>
<param name="extract">general/hpc_elf.pl</param> <param name="extract">general/hpc_elf.pl</param>

22
macros.hpc
View File

@ -56,7 +56,7 @@ includedir=%{hpc_includedir} \
sysconfdir=%{hpc_sysconfdir} \ sysconfdir=%{hpc_sysconfdir} \
\ \
Name: %pname \ Name: %pname \
Description: %{summary:0} \ Description: %{SUMMARY} \
Version: %version \ Version: %version \
Libs: -L${libdir} %{?-l:-l%{-l*}} \ Libs: -L${libdir} %{?-l:-l%{-l*}} \
Cflags: -I${includedir} \ Cflags: -I${includedir} \
@ -223,9 +223,10 @@ EOF\
# delete default in %postun # delete default in %postun
%hpc_module_delete_if_default \ %hpc_module_delete_if_default \
_tmp=$(readlink -e %{hpc_module_dep_base}/version) && \ _tmp=$(readlink -f %{hpc_module_dep_base}.version) && \\\
test "$_tmp" = "$(readlink -f %{hpc_module_dep_base}/.version.%{version})" && \ test "$_tmp" = "$(readlink -f %{hpc_module_dep_base}.version.%{version})" \\\
rm -f %{hpc_module_dep_base}/version || exit 0 -o "x" = "x$(readlink -e %{hpc_module_dep_base}.version)" && \\\
rm -f %{hpc_module_dep_base}.version || exit 0
# #
%hpc_write_modules_version_file \ %hpc_write_modules_version_file \
@ -362,7 +363,8 @@ cat << EOF > %{buildroot}%{hpc_module_dep_base}%{version}
# -l: mark a library package, prepend the package name with a `lib` (like -s # -l: mark a library package, prepend the package name with a `lib` (like -s
# but without an explicite so version. Do not use -l and -s together. # but without an explicite so version. Do not use -l and -s together.
# -L: Create a link from the .version.<version_no> file to the .version file # -L: Create a link from the .version.<version_no> file to the .version file
# to mark the default version. # to mark the default version. To undo, add %hpc_module_delete_if_default
# to the package the master is created for.
# -a: Use native arch even if no library package. # -a: Use native arch even if no library package.
# -N <pname>: Specify if a sub-package has different basename (pname) # -N <pname>: Specify if a sub-package has different basename (pname)
# -q: For internal use only! # -q: For internal use only!
@ -416,13 +418,15 @@ Obsoletes: %_lname < %version \
Requires: %{s_name} = %version \ Requires: %{s_name} = %version \
%{!-l:%{!-s:%{!-a:BuildArch: noarch}}} \ %{!-l:%{!-s:%{!-a:BuildArch: noarch}}} \
%description -n %_lname \ %description -n %_lname \
The package %{_lname} provides the dependency to get binary package %{s_name} \ %{pname}: %{SUMMARY} \
The package %{_lname} provides the dependency to get binary package %{s_name}. \
When this package gets updated it installs the latest version of %name. \ When this package gets updated it installs the latest version of %name. \
%{-L:%post -n %_lname \ %{-L:%posttrans -n %_lname \
ln -sf %{hpc_module_dep_base}.version.%{version} %{hpc_module_dep_base}.version} \ [ -e %{hpc_module_dep_base}.version.%{version} ] && \\\
ln -sf .version.%{version} %{hpc_module_dep_base}.version} \
%files -n %{_lname} \ %files -n %{_lname} \
%defattr(-,root,root)\ %defattr(-,root,root)\
%define _msg '%{summary:0}: Provide the dependency to get binary package %{s_name\\\\nWhen this package gets updated it installs the latest version of %name.}' \ %define _msg '%{pname}: %{SUMMARY}.\\\\nProvide the dependency to get binary package %{s_name}.\\\\nWhen this package gets updated it installs the latest version of %{pname}.' \
%define _readme README.%{_mylib}%{_name}%{_p_ext} \ %define _readme README.%{_mylib}%{_name}%{_p_ext} \
%define _tmpexec %(tmp=$(mktemp /tmp/scr-XXXXXX); \ %define _tmpexec %(tmp=$(mktemp /tmp/scr-XXXXXX); \
readme=%{_readme} \ readme=%{_readme} \

11
suse-hpc.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Feb 6 07:08:30 UTC 2019 - eich@suse.com
- macros.hpc: Fix default moduleversion link generation and deletion
* Generation: convert to a posttrans script to make sure the link
target exists.
* Deletion: Fix paths and line endings.
(bsc#1124509)
- macros.hpc: Improve documentation for -L option in %%hpc_master macro.
- macros.hpc: Improve master package description and README message.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 7 15:44:07 UTC 2019 - eich@suse.com Mon Jan 7 15:44:07 UTC 2019 - eich@suse.com

2
suse-hpc.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #