- use only new-style bconds

Changed files:
    ekg2.spec -> 1.14

diff --git a/ekg2.spec b/ekg2.spec
index 1541635b30d63241a40e0481110c092f7c64af29..1f5406e94fd4e66c33b5d58878cd48837ff18313 100644 (file)
--- a/ekg2.spec
+++ b/ekg2.spec
@@ -1,8 +1,11 @@
+#
+# Conditional build:
 %bcond_with    yesterday_snapshot      # Build most current ekg2 snapshot
                                        # (must use ./builder -n5 or plain rpmbuild)
 %bcond_with    aspell                  # Build in spell-checking support with aspell
                                        # (currently leaks memory)
-
+%bcond_with    ioctl_daemon            # with (suid-root) ioctl daemon
+#
 %if %{with yesterday_snapshot}
 %define                _snap %(date +%%Y%%m%%d -d yesterday)
 %else
@@ -61,16 +64,18 @@ Gadu-Gadu jak i Jabbera. Planowana tak
 %{__autoheader}
 %{__automake}
 %configure \
-       %{!?_with_aspell:--without-aspell} %{?_with_aspell:--with-aspell}
+       --with%{!?with_aspell:out}-aspell
 echo '#define HAVE_GNUTLS 1' >> ekg2-config.h # KLUDGE, wait for autoconf update
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
+
 rm -rf docs/{CVS,.cvsignore,Makefile*}
-mv README README-main
+mv -f README README-main
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -82,4 +87,4 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/ekg2
 %dir %{_libdir}/ekg2/plugins
 %attr(755,root,root) %{_libdir}/ekg2/plugins/*.so
-%{?_with_ioctl_daemon:%attr(4755,root,root) %{_libdir}/ioctld}
+%{?with_ioctl_daemon:%attr(4755,root,root) %{_libdir}/ioctld}