Author: darekr Date: Wed Dec 13 16:03:15 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- new bcond style
---- Files affected:
SPECS:
ksh93.spec (1.24 -> 1.25)
---- Diffs:
================================================================
Index: SPECS/ksh93.spec
diff -u SPECS/ksh93.spec:1.24 SPECS/ksh93.spec:1.25
--- SPECS/ksh93.spec:1.24 Sat Aug 12 19:11:15 2006
+++ SPECS/ksh93.spec Wed Dec 13 17:03:09 2006
@@ -1,8 +1,8 @@
# $Revision$, $Date$
#
# Conditional build:
-# _without_static - don't build static version
-# _with_binsh - build with /bin/sh symlink
+%bcond_without static # don't build static version
+%bcond_with binsh # build with /bin/sh symlink
#
Summary: Original AT&T Korn Shell
Summary(pl): Oryginalna powłoka Korna z AT&T
@@ -20,7 +20,7 @@
Patch1: %{name}-echo-e.patch
Patch2: %{name}-login.patch
URL: http://www.kornshell.com/
-%if %{!?_without_static:1}%{?_without_static:0}
+%if %{with static}
BuildRequires: glibc-static
%endif
Requires(post): /sbin/ldconfig
@@ -103,7 +103,7 @@
../../../lib/libdll.a -ldl ../../../lib/libcmd.a \
../../../lib/libast.a -lm
-%if %{!?_without_static:1}%{?_without_static:0}
+%if %{with static}
%{__cc} -static -o ksh93.static pmain.o -L../../../lib -lksh \
../../../lib/libdll.a -ldl ../../../lib/libcmd.a \
../../../lib/libast.a -lm
@@ -114,13 +114,13 @@
install -d $RPM_BUILD_ROOT{%{_mandir}/man1,/lib,/bin,%{_sysconfdir}}
install arch/*/src/cmd/ksh93/ksh93 $RPM_BUILD_ROOT/bin
-%if %{!?_without_static:1}%{?_without_static:0}
+%if %{with static}
install arch/*/src/cmd/ksh93/ksh93.static $RPM_BUILD_ROOT/bin
%endif
install arch/*/src/cmd/ksh93/libksh.so.* $RPM_BUILD_ROOT/lib
install arch/*/man/man1/sh.1 $RPM_BUILD_ROOT%{_mandir}/man1/ksh93.1
-%if %{?_with_binsh:1}%{!?_with_binsh:0}
+%if %{with binsh}
echo ".so ksh93.1" > $RPM_BUILD_ROOT%{_mandir}/man1/sh.1
ln -sf ksh93 $RPM_BUILD_ROOT/bin/sh
%endif
@@ -143,14 +143,14 @@
if [ "$SHNAME" = "/bin/ksh93" ]; then
HAS_KSH=1
fi
-%if %{?_with_binsh:1}%{!?_with_binsh:0}
+%if %{with binsh}
if [ "$SHNAME" = "/bin/sh" ]; then
HAS_SH=1
fi
%endif
done < /etc/shells
[ -n "$HAS_KSH" ] || echo "/bin/ksh93" >> /etc/shells
-%if %{?_with_binsh:1}%{!?_with_binsh:0}
+%if %{with binsh}
[ -n "$HAS_SH" ] || echo "/bin/sh" >> /etc/shells
%endif
fi
@@ -160,7 +160,7 @@
if [ "$1" = "0" ]; then
while read SHNAME; do
[ "$SHNAME" = "/bin/ksh93" ] ||\
-%if %{?_with_binsh:1}%{!?_with_binsh:0}
+%if %{with binsh}
[ "$SHNAME" = "/bin/sh" ] ||\
%endif
echo "$SHNAME"
@@ -203,11 +203,11 @@
%{_mandir}/man1/*
-%if %{?_with_binsh:1}%{!?_with_binsh:0}
+%if %{with binsh}
%attr(755,root,root) /bin/sh
%endif
-%if %{!?_without_static:1}%{?_without_static:0}
+%if %{with static}
%files static
%defattr(644,root,root,755)
%attr(755,root,root) /bin/ksh93.static
@@ -222,6 +222,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.25 2006/12/13 16:03:09 darekr
+- new bcond style
+
Revision 1.24 2006/08/12 17:11:15 ankry
- formatting
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/ksh93.spec?r1=1.24&r2=1.25&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
