- keep versioned libgadu R

[packages/ekg.git] / ekg.spec

diff --git a/ekg.spec b/ekg.spec
index 4c3da11c83b942f941ea03d5fd242c73833fee71..3b59a918019afe9a3a5647b4a421ff8043bac482 100644 (file)
--- a/ekg.spec
+++ b/ekg.spec
@@ -1,57 +1,46 @@
-# TODO
-# - security  http://security.gentoo.org/glsa/glsa-200507-26.xml

 #
 # Conditional build:
 #
 # Conditional build:

-%bcond_with    yesterday_snapshot      # Build most current ekg snapshot (must use ./builder -n5 or plain rpmbuild)

 %bcond_without aspell          # without spell checking
 %bcond_without voip            # without VoIP support
 %bcond_without python          # with python support
 %bcond_without pthread         # build with Posix threads support
 %bcond_with    ioctl_daemon    # with ioctl_daemon (suid root)
 %bcond_without aspell          # without spell checking
 %bcond_without voip            # without VoIP support
 %bcond_without python          # with python support
 %bcond_without pthread         # build with Posix threads support
 %bcond_with    ioctl_daemon    # with ioctl_daemon (suid root)

-#
-%if %{with yesterday_snapshot}
-%define                _snap %(date +%%Y%%m%%d -d yesterday)
-%else
-%define                _pre    rc3
-%endif
+%bcond_with    lock_reason     # with lock_reason patch

 #
 Summary:       A client compatible with Gadu-Gadu
 #
 Summary:       A client compatible with Gadu-Gadu

-Summary(de):   Ein Cliente kompatibel mit Gadu-Gadu
-Summary(es):   Un cliente compatible con Gadu-Gadu
-Summary(it):   Un cliente compatibile con Gadu-Gadu
-Summary(pl):   Klient kompatybilny z Gadu-Gadu
+Summary(de.UTF-8):     Ein Cliente kompatibel mit Gadu-Gadu
+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
 Name:          ekg

-Version:       1.6
-%if %{with yesterday_snapshot}
-Release:       0.%{_snap}.1
-%else
-Release:       0.%{_pre}.1
-%endif
+Version:       1.7
+Release:       4

 Epoch:         4
 License:       GPL v2
 Group:         Applications/Communications
 Epoch:         4
 License:       GPL v2
 Group:         Applications/Communications

-%if %{with yesterday_snapshot}
-Source0:       http://dev.null.pl/ekg/%{name}-%{_snap}.tar.gz
-%else
-Source0:       http://dev.null.pl/ekg/%{name}-1.6%{_pre}.tar.gz
-%endif
-# Source0-md5: 421b8874e4b1c16fd7a17f08bec9c3fc
+Source0:       http://ekg.chmurka.net/%{name}-%{version}.tar.gz
+# Source0-md5: 2aa92b56517fdf09d75519a105772b74

 Source1:       %{name}.conf
 Source1:       %{name}.conf

-URL:           http://dev.null.pl/ekg/
+Patch0:                %{name}-LDFLAGS.patch
+Patch1:                %{name}-lock_reason.patch
+Patch2:                %{name}-external_libgadu.patch
+URL:           http://ekg.chmurka.net/
+BuildRequires: %{_bindir}/perl

 %{?with_aspell:BuildRequires:  aspell-devel}
 BuildRequires: autoconf
 BuildRequires: automake
 %{?with_aspell:BuildRequires:  aspell-devel}
 BuildRequires: autoconf
 BuildRequires: automake

+BuildRequires: libgadu-devel >= 4:1.7.0

 %{?with_voip:BuildRequires:    libgsm-devel}
 BuildRequires: libjpeg-devel
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel >= 0.9.7d
 %{?with_voip:BuildRequires:    libgsm-devel}
 BuildRequires: libjpeg-devel
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel >= 0.9.7d

-BuildRequires: %{_bindir}/perl

 %if %{with python}
 BuildRequires: python
 BuildRequires: python-devel
 %endif
 BuildRequires: readline-devel
 BuildRequires: zlib-devel
 %if %{with python}
 BuildRequires: python
 BuildRequires: python-devel
 %endif
 BuildRequires: readline-devel
 BuildRequires: zlib-devel

+Requires:      libgadu >= 4:1.7.0

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -72,120 +61,48 @@ EKG features include:
 Please note that the program is not internationalized and all messages
 are in Polish (although the commands are in English).
 
 Please note that the program is not internationalized and all messages
 are in Polish (although the commands are in English).
 

-%description -l de
+%description -l de.UTF-8

 Ein Cliente kompatibel mit Gadu-Gadu.
 
 Ein Cliente kompatibel mit Gadu-Gadu.
 

-%description -l es
+%description -l es.UTF-8

 Un cliente compatible con Gadu-Gadu.
 
 Un cliente compatible con Gadu-Gadu.
 

-%description -l it
+%description -l it.UTF-8

 Un cliente compatibile con Gadu-Gadu.
 
 Un cliente compatibile con Gadu-Gadu.
 

-%description -l pl
+%description -l pl.UTF-8

 EKG ("Eksperymentalny Klient Gadu-Gadu") jest open source'owym
 EKG ("Eksperymentalny Klient Gadu-Gadu") jest open source'owym

-klientem gadu-gadu dla systemów uniksowych. Gadu-Gadu to popularny w
-polsce komunikator internetowy.
-
-Mo¿liwo¶ci EKG:
-  - interfejs u¿ytkownika podobny do irssi,
-  - wysy³anie i odbieranie plików,
-  - rozmowy g³osowe,
-  - uruchamianie poleceñ pow³oki w okre¶lonych sytuacjach,
-  - wczytywanie wej¶cia z potoku,
-  - wsparcie dla skryptów w jêzyku Python,
-  - synteza mowy (z u¿yciem zewnêtrznego programu),
+klientem gadu-gadu dla systemów uniksowych. Gadu-Gadu to popularny w
+Polsce komunikator internetowy.
+
+Możliwości EKG:
+  - interfejs użytkownika podobny do irssi,
+  - wysyłanie i odbieranie plików,
+  - rozmowy głosowe,
+  - uruchamianie poleceń powłoki w określonych sytuacjach,
+  - wczytywanie wejścia z potoku,
+  - wsparcie dla skryptów w języku Python,
+  - synteza mowy (z użyciem zewnętrznego programu),

   - wsparcie dla szyfrowania.
 
   - wsparcie dla szyfrowania.
 

-Program nie jest umiêdzynarodowiony i wszystkie komunikaty s± po
-polsku (jednak komendy s± w jêzyku angielskim).
-
-%package -n libgadu
-Summary:       libgadu library
-Summary(es):   Biblioteca libgadu
-Summary(pl):   Biblioteka libgadu
-License:       LGPL v2.1
-Group:         Libraries
-Obsoletes:     libgg
-
-%description -n libgadu
-libgadu is intended to make it easy to add Gadu-Gadu communication
-support to your software.
-
-%description -n libgadu -l de
-Mit libgadu ist es Ihnen möglich auf einfache Weise Gadu-Gadu
-Kommunikations-Unterstützung in Ihre Software einzubinden.
-
-%description -n libgadu -l es
-libgadu está pensada para facilitar añadirle comunicación vía
-Gadu-Gadu a su software.
-
-%description -n libgadu -l pl
-libgadu umo¿liwia ³atwe dodanie do ró¿nych aplikacji komunikacji
-bazuj±cej na protokole Gadu-Gadu.
-
-%package -n libgadu-devel
-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}-%{release}
-Requires:      openssl-devel
-Obsoletes:     libgg-devel
-
-%description -n libgadu-devel
-The libgadu-devel package contains the header files and some
-documentation needed to develop application with libgadu.
-
-%description -n libgadu-devel -l de
-Das libgadu-devel Paket enthält Header-Files (Kopfzeilenordner) und
-die Dokumentation die Sie benötigen um mit libgadu Anwendungen zu
-entwickeln.
-
-%description -n libgadu-devel -l es
-El paquete libgadu-devel contiene los ficheros de cabecera, juntos con
-una documentación, necesarios para desarrollar aplicaciones que usar
-libgadu.
-
-%description -n libgadu-devel -l pl
-Pakiet libgadu-devel zawiera pliki nag³ówkowe i dokumentacjê,
-potrzebne do kompilowania aplikacji korzystaj±cych z libgadu.
-
-%package -n libgadu-static
-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}-%{release}
-Obsoletes:     libgg-static
-
-%description -n libgadu-static
-Static libgadu library.
-
-%description -n libgadu-static -l de
-Statisches libgadu Archiv.
-
-%description -n libgadu-static -l es
-Biblioteca libgadu estática.
-
-%description -n libgadu-static -l pl
-Statyczna biblioteka libgadu.
+Program nie jest umiędzynarodowiony i wszystkie komunikaty są po
+polsku (jednak komendy są w języku angielskim).

 
 %prep
 
 %prep

-%if %{with yesterday_snapshot}
-%setup -q -n %{name}-%{_snap}
-%else
-%setup -q -n %{name}-%{version}%{_pre}
+%setup -q
+%patch0 -p0
+%if %{with lock_reason}
+%patch1 -p1

 %endif
 %endif

-
+%patch2 -p0

 
 %build
 
 %build

-rm -f missing

 %{__aclocal} -I m4
 %{__autoheader}
 %{__autoconf}
 %configure \
 %{__aclocal} -I m4
 %{__autoheader}
 %{__autoconf}
 %configure \

+       CFLAGS_LIBGADU="%{rpmcflags}" \
+       --enable-dynamic \

        --enable-shared \
        --enable-static \
 %if %{with pthread}
        --enable-shared \
        --enable-static \
 %if %{with pthread}


@@ -199,8 +116,7 @@ rm -f missing
        %{?with_aspell:--enable-aspell} \
        %{?with_ioctl_daemon:--enable-ioctld}
 
        %{?with_aspell:--enable-aspell} \
        %{?with_ioctl_daemon:--enable-ioctld}
 

-%{__make} \
-       CC="%{__cc}  -Wall -I%{_includedir}/ncurses"
+%{__make}

 
 %if %{with ioctl_daemon}
 %{__make} -C src ioctld
 
 %if %{with ioctl_daemon}
 %{__make} -C src ioctld


@@ -220,22 +136,13 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 rm -f examples/Makefile examples/Makefile.in examples/.cvsignore
 rm -rf examples/CVS
 
 rm -f examples/Makefile examples/Makefile.in examples/.cvsignore
 rm -rf examples/CVS
 

-install -d $RPM_BUILD_ROOT%{_examplesdir}/libgadu-%{version}
-cp -af examples/* $RPM_BUILD_ROOT%{_examplesdir}/libgadu-%{version}
-

 %if %{with ioctl_daemon}
 install src/ioctld $RPM_BUILD_ROOT%{_bindir}
 %endif
 
 %if %{with ioctl_daemon}
 install src/ioctld $RPM_BUILD_ROOT%{_bindir}
 %endif
 

-cd $RPM_BUILD_ROOT%{_libdir}
-ln -sf libgadu.so.*.* libgadu.so
-

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%post  -n libgadu -p /sbin/ldconfig
-%postun -n libgadu -p /sbin/ldconfig
-

 %files
 %defattr(644,root,root,755)
 %doc docs/{7thguard,dcc,files,gdb,python,sim,themes,ui-ncurses,vars,voip}.txt
 %files
 %defattr(644,root,root,755)
 %doc docs/{7thguard,dcc,files,gdb,python,sim,themes,ui-ncurses,vars,voip}.txt


@@ -243,25 +150,7 @@ rm -rf $RPM_BUILD_ROOT
 %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}
 %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}

-%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/*.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf

 %{_datadir}/ekg
 %{_mandir}/man1/*
 %lang(pl) %{_mandir}/pl/man1/*
 %{_datadir}/ekg
 %{_mandir}/man1/*
 %lang(pl) %{_mandir}/pl/man1/*

-
-%files -n libgadu
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgadu.so.*.*
-
-%files -n libgadu-devel
-%defattr(644,root,root,755)
-%doc docs/{7thguard,ui,devel-hints,przenosny-kod}.txt docs/protocol.html
-%doc ChangeLog docs/{README,TODO}
-%attr(755,root,root) %{_libdir}/libgadu.so
-%{_includedir}/libgadu.h
-%{_includedir}/libgadu-config.h
-%{_pkgconfigdir}/*
-%{_examplesdir}/libgadu-%{version}
-
-%files -n libgadu-static
-%defattr(644,root,root,755)
-%{_libdir}/libgadu.a