- use __rm macro, explicit files in system dirs

[packages/ekg.git] / ekg.spec

diff --git a/ekg.spec b/ekg.spec
index e8985b20e9b4f59c6391fc8d31781feb288bcbb7..e57f62ffee6e3b281063678099a347285313055d 100644 (file)
--- a/ekg.spec
+++ b/ekg.spec
@@ -13,29 +13,35 @@ Summary(es.UTF-8):  Un cliente compatible con Gadu-Gadu
 Summary(it.UTF-8):     Un cliente compatibile con Gadu-Gadu
 Summary(pl.UTF-8):     Klient kompatybilny z Gadu-Gadu
 Name:          ekg
-Version:       1.8
-Release:       1.rc1.2
+Version:       1.7
+Release:       16
 Epoch:         4
 License:       GPL v2
 Group:         Applications/Communications
-Source0:       http://ekg.chmurka.net/%{name}-%{version}rc1.tar.gz
-# Source0-md5: ae98f336a71f7aad446a3f620b672441
+Source0:       http://ekg.chmurka.net/%{name}-%{version}.tar.gz
+# Source0-md5: 2aa92b56517fdf09d75519a105772b74
 Source1:       %{name}.conf
 Patch0:                %{name}-LDFLAGS.patch
 Patch1:                %{name}-lock_reason.patch
+Patch2:                %{name}-external_libgadu.patch
+Patch3:                %{name}-giflib.patch
+Patch4:                %{name}-openssl.patch
 URL:           http://ekg.chmurka.net/
 BuildRequires: %{_bindir}/perl
 %{?with_aspell:BuildRequires:  aspell-devel}
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: giflib-devel >= 5.1
 BuildRequires: libgadu-devel >= 4:1.7.0
 %{?with_voip:BuildRequires:    libgsm-devel}
 BuildRequires: libjpeg-devel
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: pkgconfig
 %if %{with python}
 BuildRequires: python
 BuildRequires: python-devel
+BuildRequires: python-modules
 %endif
 BuildRequires: readline-devel
 BuildRequires: zlib-devel
@@ -88,11 +94,14 @@ Program nie jest umiędzynarodowiony i wszystkie komunikaty są po
 polsku (jednak komendy są w języku angielskim).
 
 %prep
-%setup -q -n %{name}-%{version}rc1
+%setup -q
 %patch0 -p0
 %if %{with lock_reason}
 %patch1 -p1
 %endif
+%patch2 -p0
+%patch3 -p1
+%patch4 -p1
 
 %build
 %{__aclocal} -I m4
@@ -109,7 +118,6 @@ polsku (jednak komendy są w języku angielskim).
        --without-pthread \
 %endif
        --without-bind \
-       --disable-ui-gtk \
        %{?with_python:--with-python} \
        %{!?with_voip:--without-libgsm} \
        %{?with_aspell:--enable-aspell} \
@@ -132,8 +140,8 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 
 # For libgadu-devel
 
-rm -f examples/Makefile examples/Makefile.in examples/.cvsignore
-rm -rf examples/CVS
+%{__rm} examples/Makefile examples/Makefile.in examples/.cvsignore
+%{__rm} -r examples/CVS
 
 %if %{with ioctl_daemon}
 install src/ioctld $RPM_BUILD_ROOT%{_bindir}
@@ -144,12 +152,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc docs/{files,gdb,python,sim,themes,ui-ncurses,vars,voip}.txt
+%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*
+%attr(755,root,root) %{_bindir}/ekg
+%attr(755,root,root) %{_bindir}/ekl2.pl
+%attr(755,root,root) %{_bindir}/ekl2.sh
 %{?with_ioctl_daemon:%attr(4755,root,root) %{_bindir}/ioctld}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ekg.conf
 %{_datadir}/ekg
-%{_mandir}/man1/*
-%lang(pl) %{_mandir}/pl/man1/*
+%{_mandir}/man1/ekg.1*
+%{_mandir}/man1/ekl2.1*
+%lang(pl) %{_mandir}/pl/man1/ekg.1*
+%lang(pl) %{_mandir}/pl/man1/ekl2.1*