- new bcond style

Changed files:
    dar.spec -> 1.13

diff --git a/dar.spec b/dar.spec
index 8f7fc6719c2d2e3d0e100e6a6b9d91a17786de34..49d80e234b054a0cf4f6c67a27290f5c014ecbf8 100644 (file)
--- a/dar.spec
+++ b/dar.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
-# {!?_without_static   build without dar_static
-#
+%bcond_without static  # build without dar_static
+
 Summary:       dar makes backup of a directory tree and files
 Summary(pl):   dar - narzêdzie do tworzenia kopii zapasowych drzew katalogów i plików
 Name:          dar
@@ -17,7 +17,7 @@ BuildRequires:        attr-devel
 BuildRequires: bzip2-devel
 BuildRequires: libstdc++-devel
 BuildRequires: zlib-devel
-%if %{!?_without_static:1}0
+%if %{with static}
 BuildRequires: attr-static
 BuildRequires: bzip2-static
 BuildRequires: glibc-static
@@ -176,7 +176,7 @@ Statyczna wersja archiwizatora dar.
 
 %build
 %{__make} \
-%if %{!?_without_static:1}0
+%if %{with static}
        BUILD_STATIC=\"yes\" \
 %else
        BUILD_STATIC=\"no\" \
@@ -187,10 +187,10 @@ Statyczna wersja archiwizatora dar.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{!?_without_static:install -d $RPM_BUILD_ROOT/bin}
+%{?with_static:install -d $RPM_BUILD_ROOT/bin}
 
 %{__make} install \
-%if %{!?_without_static:1}0
+%if %{with static}
        BUILD_STATIC=\"yes\" \
 %else
        BUILD_STATIC=\"no\" \
@@ -200,7 +200,7 @@ rm -rf $RPM_BUILD_ROOT
        BIN_DIR=%{_bindir} \
        MAN_DIR=%{_mandir}
 
-%{!?_without_static:mv -f $RPM_BUILD_ROOT{%{_bindir},/bin}/dar_static}
+%{?with_static:mv -f $RPM_BUILD_ROOT{%{_bindir},/bin}/dar_static}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -211,7 +211,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
 
-%if %{!?_without_static:1}0
+%if %{with static}
 %files static
 %defattr(644,root,root,755)
 %attr(755,root,root) /bin/*