[environment-modules] - Really do not replace modified profile.d scripts (bug #962762) - Specfile cleanup
Orion Poplawski
orion at fedoraproject.org
Tue May 14 14:57:42 UTC 2013
commit 6dede715e3ac0a79898e70fb27a9c54aa877eb89
Author: Orion Poplawski <orion at nwra.com>
Date: Tue May 14 08:57:33 2013 -0600
- Really do not replace modified profile.d scripts (bug #962762)
- Specfile cleanup
environment-modules.spec | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/environment-modules.spec b/environment-modules.spec
index bcbbba7..04060ad 100644
--- a/environment-modules.spec
+++ b/environment-modules.spec
@@ -1,6 +1,6 @@
Name: environment-modules
Version: 3.2.10
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Provides dynamic modification of a user's environment
Group: System Environment/Base
@@ -19,7 +19,6 @@ Patch1: environment-modules-versioning.patch
Patch2: environment-modules-clear.patch
# Patch from modules list to add completion to avail command
Patch3: environment-modules-avail.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl-devel, tclx-devel, libX11-devel
BuildRequires: dejagnu
@@ -71,7 +70,6 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
cp -p %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh
@@ -80,16 +78,11 @@ ln -s %{_datadir}/Modules/init/csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modul
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modulefiles
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%check
make test
%files
-%defattr(-,root,root,-)
%doc LICENSE.GPL README TODO
%{_sysconfdir}/modulefiles
%config(noreplace) %{_sysconfdir}/profile.d/*
@@ -97,7 +90,7 @@ make test
%dir %{_datadir}/Modules
%{_datadir}/Modules/bin/
%dir %{_datadir}/Modules/init
-%{_datadir}/Modules/init/*
+%config(noreplace) %{_datadir}/Modules/init/*
%config(noreplace) %{_datadir}/Modules/init/.modulespath
%{_datadir}/Modules/modulefiles
%{_mandir}/man1/module.1.gz
@@ -105,6 +98,10 @@ make test
%changelog
+* Tue May 14 2013 Orion Poplawski <orion at cora.nwra.com> - 3.2.10-5
+- Really do not replace modified profile.d scripts (bug #962762)
+- Specfile cleanup
+
* Wed Apr 17 2013 Orion Poplawski <orion at cora.nwra.com> - 3.2.10-4
- Do not replace modified profile.d scripts (bug #953199)
More information about the scm-commits
mailing list