Hello community,
here is the log from the commit of package suse-hpc for openSUSE:Factory
checked in at 2018-12-28 12:32:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-hpc (Old)
and /work/SRC/openSUSE:Factory/.suse-hpc.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-hpc"
Fri Dec 28 12:32:20 2018 rev:15 rq:659954 version:0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/suse-hpc/suse-hpc.changes 2018-11-19
23:33:28.307088207 +0100
+++ /work/SRC/openSUSE:Factory/.suse-hpc.new.28833/suse-hpc.changes
2018-12-28 12:32:21.484087200 +0100
@@ -1,0 +2,10 @@
+Fri Dec 14 19:20:06 UTC 2018 - Todd R <toddrme2...@gmail.com>
+
+- Add hpc_docdir macro.
+- Add cmake directories macros.
+- Use upstream-recommended %{_rpmconfigdir}/macros.d directory
+ for rpm macros.
+- Add meson macro.
+- Future-proof cmake macro.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-hpc.spec ++++++
--- /var/tmp/diff_new_pack.E9f2Uh/_old 2018-12-28 12:32:21.944086881 +0100
+++ /var/tmp/diff_new_pack.E9f2Uh/_new 2018-12-28 12:32:21.944086881 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# 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/
#
@@ -29,7 +29,6 @@
Source4: hpc_elflib.attr
Source5: LICENSE
Url: http://www.suse.com/hpc
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Provide rpm macros for building and installing SUSE HPC
@@ -42,8 +41,8 @@
gcc -o dlinfo dlinfo.c -ldl
%install
-mkdir -p %{buildroot}%{_sysconfdir}/rpm
-install -m 644 %{S:0} %{buildroot}%{_sysconfdir}/rpm
+mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
+install -m 644 %{S:0} %{buildroot}%{_rpmconfigdir}/macros.d
mkdir -p %{buildroot}%{_rpmconfigdir}/fileattrs
install -m 755 %{S:2} dlinfo %{buildroot}%{_rpmconfigdir}
install -m 644 %{S:3} %{S:4} %{buildroot}%{_rpmconfigdir}/fileattrs
@@ -56,9 +55,8 @@
%endif
%files
-%defattr(-,root,root,-)
%mylicense LICENSE
-%config %{_sysconfdir}/rpm/macros.hpc
+%{_rpmconfigdir}/macros.d/macros.hpc
%{_rpmconfigdir}/dlinfo
%{_rpmconfigdir}/hpc_elf.pl
%{_rpmconfigdir}/fileattrs/*
++++++ macros.hpc ++++++
--- /var/tmp/diff_new_pack.E9f2Uh/_old 2018-12-28 12:32:22.020086829 +0100
+++ /var/tmp/diff_new_pack.E9f2Uh/_new 2018-12-28 12:32:22.020086829 +0100
@@ -32,9 +32,12 @@
%hpc_libexecdir %{hpc_prefix}/lib
%hpc_localstatedir %{_localstatedir}
%hpc_sharedstatedir %{_sharedstatedir}
-%hpc_mandir %{hpc_prefix}/share/man
-%hpc_infodir %{hpc_prefix}/share/info
+%hpc_mandir %{hpc_datadir}/man
+%hpc_docdir %{hpc_datadir}/doc/packages
+%hpc_infodir %{hpc_datadir}/info
%hpc_pkgconfigdir %{hpc_libdir}/pkgconfig
+%hpc_cmake_dir %{hpc_datadir}/cmake
+%hpc_cmake_moddir %{hpc_cmake_dir}/Modules
# pkgconfig
# %hpc_write_pkgconfig [-l <libname>][-n <pkgfile_name>]
@@ -294,7 +297,7 @@
--exec-prefix=%{hpc_exec_prefix} \\\
--bindir=%{hpc_bindir} \\\
--sbindir=%{hpc_sbindir} \\\
- --sysconfdir=%{_sysconfdir} \\\
+ --sysconfdir=%{hpc_sysconfdir} \\\
--datadir=%{hpc_datadir} \\\
--includedir=%{hpc_includedir} \\\
--libdir=%{hpc_libdir} \\\
@@ -637,7 +640,7 @@
%hpc_compress_man() \
[ -n "%{*}" ] || { echo "no man page list!" >&2 ; exit 1; } \
for j in %{*}; do \
- for i in $(ls %{buildroot}%hpc_mandir/man${j}/*.${j}* | grep -v
".*\.gz$"); \
+ for i in $(ls %{buildroot}%{hpc_mandir}/man${j}/*.${j}* | grep -v
".*\.gz$"); \
do \
test -L $i && continue \
gzip $i \
@@ -646,17 +649,66 @@
# wraps macro from macros.cmake - paths replaced by HPC paths.
%hpc_cmake \
- %{!?cmake:%{error: please include macros.cmake}} \
- %{?cmake: \
+ %{!?cmake:%{error: please include macros.cmake}} \
+ %{?cmake: \
%global __cmake %{_bindir}/cmake \
- %define _prefix %{hpc_prefix} \
+ %define _bindir %{hpc_bindir} \
+ %define _datadir %{hpc_datadir} \
%define _includedir %{hpc_includedir} \
+ %define _infodir %{hpc_infodir} \
%define _libdir %{hpc_libdir} \
- %define _datadir %{hpc_datadir} \
+ %define _libexecdir %{hpc_libexecdir} \
+ %define _localstatedir %{hpc_localstatedir} \
+ %define _mandir %{hpc_mandir} \
+ %define _prefix %{hpc_prefix} \
+ %define _sbindir %{hpc_sbindir} \
+ %define _sharedstatedir %{hpc_sharedstatedir} \
+ %define _sysconfdir %{hpc_sysconfdir} \
%cmake \\\
%undefine __cmake \\\
- %undefine _prefix \\\
+ %undefine _bindir \\\
+ %undefine _datadir \\\
%undefine _includedir \\\
+ %undefine _infodir \\\
%undefine _libdir \\\
+ %undefine _libexecdir \\\
+ %undefine _localstatedir \\\
+ %undefine _mandir \\\
+ %undefine _prefix \\\
+ %undefine _sbindir \\\
+ %undefine _sharedstatedir \\\
+ %undefine _sysconfdir \\\
+ }
+
+# wraps macro from macros.meson - paths replaced by HPC paths.
+%hpc_meson \
+ %{!?meson:%{error: please include macros.meson}} \
+ %{?meson: \
+ %global __meson %{_bindir}/meson \
+ %define _bindir %{hpc_bindir} \
+ %define _datadir %{hpc_datadir} \
+ %define _includedir %{hpc_includedir} \
+ %define _infodir %{hpc_infodir} \
+ %define _libdir %{hpc_libdir} \
+ %define _libexecdir %{hpc_libexecdir} \
+ %define _localstatedir %{hpc_localstatedir} \
+ %define _mandir %{hpc_mandir} \
+ %define _prefix %{hpc_prefix} \
+ %define _sbindir %{hpc_sbindir} \
+ %define _sharedstatedir %{hpc_sharedstatedir} \
+ %define _sysconfdir %{hpc_sysconfdir} \
+ %meson \\\
+ %undefine __meson \\\
+ %undefine _bindir \\\
%undefine _datadir \\\
+ %undefine _includedir \\\
+ %undefine _infodir \\\
+ %undefine _libdir \\\
+ %undefine _libexecdir \\\
+ %undefine _localstatedir \\\
+ %undefine _mandir \\\
+ %undefine _prefix \\\
+ %undefine _sbindir \\\
+ %undefine _sharedstatedir \\\
+ %undefine _sysconfdir \\\
}
