diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2014-05-28 14:04:02 +0200 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2014-05-28 15:29:28 +0200 |
| commit | c8105a8b9ed9981fc64026f24151b75d32ee8daf (patch) | |
| tree | 413d1767c4dce4eb94f6fefe79a1b04d078a5c72 /repos | |
| parent | e2f9dcc499540ae401d37cbd29d9b360fd77d6af (diff) | |
| download | scl-autotools-c8105a8b9ed9981fc64026f24151b75d32ee8daf.tar.gz scl-autotools-c8105a8b9ed9981fc64026f24151b75d32ee8daf.tar.xz scl-autotools-c8105a8b9ed9981fc64026f24151b75d32ee8daf.zip | |
git/autotools-git: Fix $INFOPATH
Adjust also $INFOPATH, use general pattern by
%_compat_scl_env_adjust macro from compat-rpm-config, also move
generating of 'enable' script into %build phase
Diffstat (limited to 'repos')
| -rw-r--r-- | repos/autotools/autotools-git/autotools-git/autotools-git.spec | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/repos/autotools/autotools-git/autotools-git/autotools-git.spec b/repos/autotools/autotools-git/autotools-git/autotools-git.spec index 6095b00..0d58d89 100644 --- a/repos/autotools/autotools-git/autotools-git/autotools-git.spec +++ b/repos/autotools/autotools-git/autotools-git/autotools-git.spec @@ -1,3 +1,5 @@ +%_compat_el5_build + # Workaround to always have %scl defined %{!?scl:%global scl autotools-git} @@ -6,13 +8,16 @@ Summary: Package that installs %scl Name: %scl_name Version: 1 -Release: 10%{?dist} +Release: 11%{?dist} BuildArch: noarch License: GPLv2+ Group: Applications/File Requires: %{?scl_prefix}m4, %{?scl_prefix}automake Requires: %{?scl_prefix}autoconf, %{?scl_prefix}libtool + +BuildRequires: compat-rpm-config + %{?scl:BuildRequires: scl-utils-build} %{?scl:BuildRequires: iso-codes} @@ -41,6 +46,15 @@ Package shipping essential scripts to work with %scl Software Collection. %prep %setup -c -T +%build +cat > enable <<\EOF +%_compat_scl_env_adjust PATH %{_bindir} +%_compat_scl_env_adjust LIBRARY_PATH %{_libdir} +%_compat_scl_env_adjust LD_LIBRARY_PATH %{_libdir} +%_compat_scl_env_adjust MANDIR %{_mandir} +%_compat_scl_env_adjust INFOPATH %{_infodir} +EOF + %install %if 0%{?rhel} == 5 @@ -48,13 +62,7 @@ rm -rf %{buildroot} %endif mkdir -p %{buildroot}/%{_scl_scripts}/root - -cat > %{buildroot}/%{_scl_scripts}/enable <<EOF -export PATH=%{_bindir}\${PATH:+:\${PATH}} -export LIBRARY_PATH=%{_libdir}\${LIBRARY_PATH:+:\${LIBRARY_PATH}} -export LD_LIBRARY_PATH=%{_libdir}\${LD_LIBRARY_PATH:+:\${LD_LIBRARY_PATH}} -export MANPATH=%{_mandir}:\${MANPATH} -EOF +install -c -p -m 0644 enable %{buildroot}%{_scl_scripts}/enable %scl_install @@ -74,6 +82,10 @@ rm -rf %{buildroot}/%{_root_sysconfdir}/rpm/macros.%{scl}-config %changelog +* Wed May 28 2014 Pavel Raiskup <praiskup@redhat.com> - 1-11 +- adjust also INFOPATH, use general pattern %%_compat_scl_env_adjust macro, also + move generating of 'enable' script into %%build phase + * Fri Apr 18 2014 Pavel Raiskup <praiskup@redhat.com> - 1-10 - the fix for 'filelist' (#1079203) is not needed, according to https://fedorahosted.org/SoftwareCollections/ticket/18 |