- little cleanup

[packages/ekg.git] / ekg.spec

diff --git a/ekg.spec b/ekg.spec
index cc7201a776899fb024c3edcd1fed2cfcd1f228ee..8a43c8ac0b43f7b50f02dd30d3574783522c9836 100644 (file)
--- a/ekg.spec
+++ b/ekg.spec
@@ -1,6 +1,11 @@
-%bcond_without voip
-%bcond_with    python
-%bcond_with    ioctl_daemon
+#
+# Conditional build:
+%bcond_without aspell          # without spell checking
+%bcond_without voip            # without VoIP support
+%bcond_with    python          # with python support
+%bcond_with    ioctl_daemon    # with ioctl_daemon (suid root)
+#
+%define snap    20040628
 
 Summary:       A client compatible with Gadu-Gadu
 Summary(de):   Ein Cliente kompatibel mit Gadu-Gadu
@@ -8,22 +13,25 @@ Summary(es): Un cliente compatible con Gadu-Gadu
 Summary(it):   Un cliente compatibile con Gadu-Gadu
 Summary(pl):   Klient kompatybilny z Gadu-Gadu
 Name:          ekg
-Version:       1.4
-Release:       3
+Version:       1.5
+#Release:      0.%{snap}.3
+Release:       4
 Epoch:         4
 License:       GPL v2
 Group:         Applications/Communications
+#Source0:      http://dev.null.pl/ekg/%{name}-%{snap}.tar.gz
 Source0:       http://dev.null.pl/ekg/%{name}-%{version}.tar.gz
-# Source0-md5: 8f35030c05e62c30ce9068e26bd365a2
+# Source0-md5: 721ebfe7b13e9531b30d558465e6695f
 Source1:       %{name}.conf
 Patch0:                %{name}-kadu-0_3_6.patch
 URL:           http://dev.null.pl/ekg/
+%{?with_aspell:BuildRequires:  aspell-devel}
 BuildRequires: autoconf
 BuildRequires: automake
 %{?with_voip:BuildRequires:    libgsm-devel}
 BuildRequires: libjpeg-devel
 BuildRequires: ncurses-devel
-BuildRequires: openssl-devel >= 0.9.7c
+BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: %{_bindir}/perl
 %{?with_python:BuildRequires:  python-devel}
 BuildRequires: readline-devel
@@ -49,9 +57,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,10 +81,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:      openssl-devel
 Obsoletes:     libgg-devel
-License:       LGPL
 
 %description -n libgadu-devel
 The libgadu-devel package contains the header files and some
@@ -100,10 +109,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.
@@ -118,12 +127,15 @@ Biblioteca libgadu est
 Statyczna biblioteka libgadu.
 
 %prep
-%setup -q
-%patch0 -p1
+#%setup -q -n %{name}-%{snap}
+%setup -q -n %{name}-%{version}
+#%patch0 -p1
 
 %build
+sed -i -e 's/#define.*GG_LIBGADU_VERSION.*/#define GG_LIBGADU_VERSION "%{version}.%{snap}"/g' lib/libgadu.h
+
 rm -f missing
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoheader}
 %{__autoconf}
 %configure \
@@ -132,14 +144,15 @@ 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_aspell:--enable-aspell} \
+       %{!?with_ioctl_daemon:--disable-ioctld}
+
+%{__make} \
+       CC="%{__cc} %{rpmcflags} -Wall -I%{_includedir}/ncurses"
 
 %if %{with ioctl_daemon}
-cd src
-%{__make} ioctld
-cd ..
+%{__make} -C src ioctld
 %endif
 
 %install
@@ -149,7 +162,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
 
@@ -157,7 +170,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}
@@ -175,6 +188,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc docs/{7thguard,dcc,files,gdb,python,sim,themes,ui-ncurses,vars,voip}.txt
+%{?with_aspell:%doc docs/slownik.txt}
 %doc ChangeLog docs/{FAQ,README,TODO,ULOTKA} docs/emoticons.{ansi,sample}
 %attr(755,root,root) %{_bindir}/e*
 %{?with_ioctl_daemon:%attr(4755,root,root) %{_bindir}/ioctld}