rpm/Modules
SHA256
1
0
Fork 0
forked from pool/Modules
Code Pull Requests Activity

Accepting request 597447 from home:bmanojlovic:branches:systemsmanagement

Browse Source 
- rolled back change from /usr/share/Modules (package name) to old 
  expected behavior /usr/share/modules
- fixed redhat/fedora builds

OBS-URL: https://build.opensuse.org/request/show/597447
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/Modules?expand=0&rev=25
This commit is contained in:
Klaus Kämpf 2018-04-17 11:40:51 +00:00 committed by Git OBS Bridge
parent d895b795d6
commit 572e24bda7
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Apr 17 11:13:53 UTC 2018 - boris@steki.net
- rolled back change from /usr/share/Modules (package name) to old
expected behavior /usr/share/modules
- fixed redhat/fedora builds
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 16 19:24:51 UTC 2018 - boris@steki.net Mon Apr 16 19:24:51 UTC 2018 - boris@steki.net

12
Modules.spec
View File

@ -41,8 +41,9 @@ Obsoletes: environment-modules < %{version}
Recommends: %{name}-doc Recommends: %{name}-doc
%endif %endif
%if 0%{?redhat_version} %if 0%{?rhel_version} || 0%{?fedora_version}
BuildRequires: perl(Digest::MD5) BuildRequires: perl(Digest::MD5)
BuildRequires: perl(Exporter)
%endif %endif
%description %description
@ -59,7 +60,8 @@ modules environment is common on SGI/Crays and many workstation farms.
%package doc %package doc
Summary: Documentation for Change environment at runtime Summary: Documentation for Change environment at runtime
Group: System/Management Group: Documentation/Other
BuildArch: noarch
%description doc %description doc
The Modules package provides for dynamic modification of a user's The Modules package provides for dynamic modification of a user's
@ -86,7 +88,7 @@ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DUSE_INTERP_RESULT -DUSE_INTERP_ERR
--libexecdir="%{_prefix}/%_lib/%{name}/" \ --libexecdir="%{_prefix}/%_lib/%{name}/" \
--prefix="%_prefix" \ --prefix="%_prefix" \
--with-version-path="%_datadir/%{name}" \ --with-version-path="%_datadir/%{name}" \
--modulefilesdir="%{_datadir}/%{name}/modulefiles" \ --modulefilesdir="%{_datadir}/modules" \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--with-etc-path="%_sysconfdir" \ --with-etc-path="%_sysconfdir" \
--with-skel-path="%_sysconfdir/skel" \ --with-skel-path="%_sysconfdir/skel" \
@ -106,7 +108,7 @@ mv $RPM_BUILD_ROOT/usr/share/doc doc_dir
%doc doc_dir/README %doc doc_dir/README
%dir %{_libdir}/%{name} %dir %{_libdir}/%{name}
%dir %{_datadir}/%{name} %dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/modulefiles %dir %{_datadir}/modules
%{_bindir}/add.modules %{_bindir}/add.modules
%{_bindir}/envml %{_bindir}/envml
%{_bindir}/mkroot %{_bindir}/mkroot
@ -114,7 +116,7 @@ mv $RPM_BUILD_ROOT/usr/share/doc doc_dir
%{_datadir}/%{name}/init %{_datadir}/%{name}/init
%{_libdir}/%{name}/modulecmd-compat %{_libdir}/%{name}/modulecmd-compat
%{_libdir}/%{name}/modulecmd.tcl %{_libdir}/%{name}/modulecmd.tcl
%{_datadir}/%{name}/modulefiles/* %{_datadir}/modules/*
%{_mandir}/man1/module-compat.1* %{_mandir}/man1/module-compat.1*
%{_mandir}/man1/module.1* %{_mandir}/man1/module.1*
%{_mandir}/man4/modulefile-compat.4* %{_mandir}/man4/modulefile-compat.4*