- s/openssh-devel/openssl-devel/, cleanups/unifications

Changed files:
    ekg.spec -> 1.165

diff --git a/ekg.spec b/ekg.spec
index 962f8288a9708809abe6dd9f8f4e1621474bb9e5..82d1473d3fde37b959ab6c8251f9d923f90b1c96 100644 (file)
--- a/ekg.spec
+++ b/ekg.spec
@@ -1,7 +1,9 @@
-%bcond_without voip
-%bcond_with    python
-%bcond_with    ioctl_daemon
-
+#
+# Conditional build:
+%bcond_without voip            # without VoIP support
+%bcond_with    python          # with python support
+%bcond_with    ioctl_daemon    # with ioctl_daemon (suid root)
+#
 Summary:       A client compatible with Gadu-Gadu
 Summary(de):   Ein Cliente kompatibel mit Gadu-Gadu
 Summary(es):   Un cliente compatible con Gadu-Gadu
@@ -49,9 +51,9 @@ Klient kompatybilny z Gadu-Gadu.
 Summary:       libgadu library
 Summary(es):   Biblioteca libgadu
 Summary(pl):   Biblioteka libgadu
+License:       LGPL v2.1
 Group:         Libraries
 Obsoletes:     libgg
-License:       LGPL v2.1
 
 %description -n libgadu
 libgadu is intended to make it easy to add Gadu-Gadu communication
@@ -73,11 +75,11 @@ bazuj
 Summary:       libgadu development library
 Summary(es):   Biblioteca de desarrollo de libgadu
 Summary(pl):   Czê¶æ biblioteki libgadu dla programistów
+License:       LGPL v2.1
 Group:         Development/Libraries
 Requires:      libgadu = %{epoch}:%{version}
-Requires:      openssh-devel
+Requires:      openssl-devel
 Obsoletes:     libgg-devel
-License:       LGPL
 
 %description -n libgadu-devel
 The libgadu-devel package contains the header files and some
@@ -101,10 +103,10 @@ potrzebne do kompilowania aplikacji korzystaj
 Summary:       Static libgadu library
 Summary(es):   Biblioteca libgadu estática
 Summary(pl):   Statyczna biblioteka libgadu
+License:       LGPL v2.1
 Group:         Development/Libraries
 Requires:      libgadu-devel = %{epoch}:%{version}
 Obsoletes:     libgg-static
-License:       LGPL
 
 %description -n libgadu-static
 Static libgadu library.
@@ -133,14 +135,14 @@ rm -f missing
        --with-pthread \
        --without-bind \
        %{?with_python:--with-python} \
-       %{?!with_voip:--without-libgsm} \
-       %{?!with_ioctl_daemon:--disable-ioctld}
-%{__make} CC="%{__cc} %{rpmcflags} -Wall -I/usr/include/ncurses"
+       %{!?with_voip:--without-libgsm} \
+       %{!?with_ioctl_daemon:--disable-ioctld}
+
+%{__make} \
+       CC="%{__cc} %{rpmcflags} -Wall -I/usr/include/ncurses"
 
 %if %{with ioctl_daemon}
-cd src
-%{__make} ioctld
-cd ..
+%{__make} -C src ioctld
 %endif
 
 %install
@@ -150,7 +152,7 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 %{__make} install install-ekl2 \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 
 # For libgadu-devel
 
@@ -158,7 +160,7 @@ rm examples/Makefile examples/Makefile.in examples/.cvsignore
 rm -r examples/CVS
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/libgadu-%{version}
-mv examples/* $RPM_BUILD_ROOT%{_examplesdir}/libgadu-%{version}/
+mv examples/* $RPM_BUILD_ROOT%{_examplesdir}/libgadu-%{version}
 
 %if %{with ioctl_daemon}
 install src/ioctld $RPM_BUILD_ROOT%{_bindir}