summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec28
1 files changed, 4 insertions, 24 deletions
diff --git a/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec b/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec
index 91eaf10..57e19bc 100644
--- a/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec
+++ b/repos/autotools/autotools-latest/autotools-latest/autotools-latest.spec
@@ -8,7 +8,7 @@
Summary: Package that installs %scl
Name: %scl
Version: 1
-Release: 21%{?dist}
+Release: 22%{?dist}
License: GPLv2+
Group: Applications/File
@@ -50,7 +50,6 @@ Collection or packages depending on %{scl} Software Collection.
%build
-%if 0%{?rhel} >= 5 && 0%{?rhel} < 8
cat > enable <<\EOF
%_compat_scl_env_adjust PATH %{_bindir}
%_compat_scl_env_adjust LIBRARY_PATH %{_libdir}
@@ -58,31 +57,11 @@ cat > enable <<\EOF
%_compat_scl_env_adjust MANDIR %{_mandir}
%_compat_scl_env_adjust INFOPATH %{_infodir}
EOF
-%else
-cat > %{scl} << EOF
-#%%Module1.0
-prepend-path X_SCLS %{scl}
-prepend-path PATH %{_bindir}
-prepend-path LIBRARY_PATH %{_libdir}
-prepend-path LD_LIBRARY_PATH %{_libdir}
-prepend-path MANPATH %{_mandir}
-prepend-path INFOPATH %{_infodir}
-prepend-path PKG_CONFIG_PATH %{_libdir}/pkgconfig
-EOF
-%endif
%install
-%if 0%{?rhel} >= 5 && 0%{?rhel} < 8
mkdir -p %{buildroot}/%{_scl_scripts}/root
install -c -p -m 0644 enable %{buildroot}%{_scl_scripts}/enable
-%else
-mkdir -p %{buildroot}%{_scl_scripts}
-install -c -p -m 0644 %{scl} %{buildroot}%{_scl_scripts}
-#automaticaly create enable script for compatibility
-%scl_enable_script
-%endif
-
%scl_install
cat %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
@@ -104,8 +83,9 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config
%changelog
-* Thu Oct 11 2018 Pavel Raiskup <praiskup@redhat.com> - 1-21
-- new rebuild
+* Thu Oct 11 2018 Pavel Raiskup <praiskup@redhat.com> - 1-22
+- new rebuild, thanks to V. Ondruch we don't have to depend on
+ environment-modules
* Fri Feb 17 2017 Pavel Raiskup <praiskup@redhat.com> - 1-20
- Bump for rhbz#1409277, scl-utils rebuild in copr temporarily