- new bcond style

Changed files:
    defrag.spec -> 1.20

diff --git a/defrag.spec b/defrag.spec
index 8b88d27d43cf6a6010a5560917492a1a1c9958dc..35e317f06b542eee9fd11417b62e54e7c294b7cb 100644 (file)
--- a/defrag.spec
+++ b/defrag.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-# _without_static
+%bcond_without static          # don't build static
 #
 Summary:       Linux filesystem defragmenter
 Summary(pl):   Narzêdzia do defragmentacji linuksowych systemów plików
@@ -35,14 +35,14 @@ minix, ext, ext2 i xia tak, by zwi
 %patch3 -p1
 
 %build
-%{?!_without_static:%{__make} OPTI="%{rpmcflags}" LDFLAGS="%{rpmldflags}" CC="%{__cc}"}
-%{?_without_static:%{__make} OPTI="%{rpmcflags}" LDFLAGS="%{rpmldflags}" CC="%{__cc}" e2defrag defrag e2dump frag}
+%{?with_static:%{__make} OPTI="%{rpmcflags}" LDFLAGS="%{rpmldflags}" CC="%{__cc}"}
+%{!?with_static:%{__make} OPTI="%{rpmcflags}" LDFLAGS="%{rpmldflags}" CC="%{__cc}" e2defrag defrag e2dump frag}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/sbin,%{_mandir}/man8}
 
-%{__make} %{?!_without_static:install}%{?_without_static:install_shared} \
+%{__make} %{?with_static:install}%{!?with_static:install_shared} \
        DESTDIR=$RPM_BUILD_ROOT
 
 %clean