This commit is contained in:
parent
1c76b48e7c
commit
972768adc7
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 16 12:07:20 CEST 2008 - werner@suse.de
|
||||||
|
|
||||||
|
- Let's avoid not needed library dependencies (bnc#439051)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Sep 1 11:59:26 CEST 2008 - prusnak@suse.cz
|
Mon Sep 1 11:59:26 CEST 2008 - prusnak@suse.cz
|
||||||
|
|
||||||
|
23
bash.spec
23
bash.spec
@ -28,7 +28,7 @@ Recommends: bash-doc = %bash_vers
|
|||||||
Suggests: command-not-found
|
Suggests: command-not-found
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 3.2
|
Version: 3.2
|
||||||
Release: 134
|
Release: 141
|
||||||
Summary: The GNU Bourne-Again Shell
|
Summary: The GNU Bourne-Again Shell
|
||||||
Url: http://www.gnu.org/software/bash/bash.html
|
Url: http://www.gnu.org/software/bash/bash.html
|
||||||
Source0: bash-%{bash_vers}.tar.bz2
|
Source0: bash-%{bash_vers}.tar.bz2
|
||||||
@ -85,7 +85,7 @@ Group: Documentation/Man
|
|||||||
Provides: bash:%{_infodir}/bash.info.gz
|
Provides: bash:%{_infodir}/bash.info.gz
|
||||||
PreReq: %install_info_prereq
|
PreReq: %install_info_prereq
|
||||||
Version: 3.2
|
Version: 3.2
|
||||||
Release: 93
|
Release: 100
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
|
|
||||||
%description -n bash-doc
|
%description -n bash-doc
|
||||||
@ -105,7 +105,7 @@ Summary: The Readline Library
|
|||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Provides: bash:/%{_lib}/libreadline.so.5
|
Provides: bash:/%{_lib}/libreadline.so.5
|
||||||
Version: 5.2
|
Version: 5.2
|
||||||
Release: 93
|
Release: 100
|
||||||
Recommends: readline-doc = %{version}
|
Recommends: readline-doc = %{version}
|
||||||
Provides: readline = 5.2
|
Provides: readline = 5.2
|
||||||
Obsoletes: readline <= 5.2
|
Obsoletes: readline <= 5.2
|
||||||
@ -129,7 +129,7 @@ Summary: Include Files and Libraries mandatory for Development
|
|||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
Provides: bash:%{_libdir}/libreadline.a
|
Provides: bash:%{_libdir}/libreadline.a
|
||||||
Version: 5.2
|
Version: 5.2
|
||||||
Release: 134
|
Release: 141
|
||||||
Requires: libreadline5 = %{version}
|
Requires: libreadline5 = %{version}
|
||||||
Requires: ncurses-devel
|
Requires: ncurses-devel
|
||||||
Recommends: readline-doc = %{version}
|
Recommends: readline-doc = %{version}
|
||||||
@ -153,7 +153,7 @@ Group: System/Libraries
|
|||||||
Provides: readline:%{_infodir}/readline.info.gz
|
Provides: readline:%{_infodir}/readline.info.gz
|
||||||
PreReq: %install_info_prereq
|
PreReq: %install_info_prereq
|
||||||
Version: 5.2
|
Version: 5.2
|
||||||
Release: 93
|
Release: 100
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
|
|
||||||
%description -n readline-doc
|
%description -n readline-doc
|
||||||
@ -229,17 +229,19 @@ cd ../readline-%{rl_vers}
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DRECYCLES_PIDS -Wall -g"
|
CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DRECYCLES_PIDS -Wall -g"
|
||||||
|
LDFLAGS=""
|
||||||
cflags -std=gnu89 CFLAGS
|
cflags -std=gnu89 CFLAGS
|
||||||
cflags -Wuninitialized CFLAGS
|
cflags -Wuninitialized CFLAGS
|
||||||
cflags -Wextra CFLAGS
|
cflags -Wextra CFLAGS
|
||||||
cflags -Wno-unprototyped-calls CFLAGS
|
cflags -Wno-unprototyped-calls CFLAGS
|
||||||
cflags -Wno-switch-enum CFLAGS
|
cflags -Wno-switch-enum CFLAGS
|
||||||
cflags -pipe CFLAGS
|
cflags -pipe CFLAGS
|
||||||
LDFLAGS=""
|
cflags -Wl,--as-needed LDFLAGS
|
||||||
CC=gcc
|
CC=gcc
|
||||||
CC_FOR_BUILD="$CC"
|
CC_FOR_BUILD="$CC"
|
||||||
CFLAGS_FOR_BUILD="$CFLAGS"
|
CFLAGS_FOR_BUILD="$CFLAGS"
|
||||||
export CC_FOR_BUILD CFLAGS_FOR_BUILD CFLAGS LDFLAGS CC
|
LDFLAGS_FOR_BUILD="$LDFLAGS"
|
||||||
|
export CC_FOR_BUILD CFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD CFLAGS LDFLAGS CC
|
||||||
./configure --build=%{_target_cpu}-suse-linux \
|
./configure --build=%{_target_cpu}-suse-linux \
|
||||||
--prefix=%{_prefix} \
|
--prefix=%{_prefix} \
|
||||||
--with-curses \
|
--with-curses \
|
||||||
@ -387,6 +389,11 @@ EOF
|
|||||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/history.info.gz
|
%install_info_delete --info-dir=%{_infodir} %{_infodir}/history.info.gz
|
||||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/readline.info.gz
|
%install_info_delete --info-dir=%{_infodir} %{_infodir}/readline.info.gz
|
||||||
|
|
||||||
|
%clean
|
||||||
|
ldd -u -r %{buildroot}/bin/bash || true
|
||||||
|
ldd -u -r %{buildroot}%{_libdir}/libreadline.so || true
|
||||||
|
%{?buildroot: %{__rm} -rf %{buildroot}}
|
||||||
|
|
||||||
%files -f bash.lang
|
%files -f bash.lang
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%attr(600,root,root) %{_sysconfdir}/skel/.bash_history
|
%attr(600,root,root) %{_sysconfdir}/skel/.bash_history
|
||||||
@ -431,6 +438,8 @@ EOF
|
|||||||
%doc %{_defaultdocdir}/readline/
|
%doc %{_defaultdocdir}/readline/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Oct 16 2008 werner@suse.de
|
||||||
|
- Let's avoid not needed library dependencies (bnc#439051)
|
||||||
* Mon Sep 01 2008 prusnak@suse.cz
|
* Mon Sep 01 2008 prusnak@suse.cz
|
||||||
- bash should suggest command-not-found, not scout
|
- bash should suggest command-not-found, not scout
|
||||||
* Thu Jul 24 2008 werner@suse.de
|
* Thu Jul 24 2008 werner@suse.de
|
||||||
|
Loading…
Reference in New Issue
Block a user