- added english man page,

- added patch fixing polish man page,
- fixed placing man pages,
- use %{__make} macro,
= a+x libgg.so.* (libgg subpackage),
- removed libgg.so link (libgg-devel subpackage),
- cosmetics,
- release 2.

Changed files:
    ekg.spec -> 1.20

diff --git a/ekg.spec b/ekg.spec
index 030c6930bce5ce6b7470d399f7fcf17be7a5ccfd..8efed9307afdd93d4bcac1deee169fdf67f02540 100644 (file)
--- a/ekg.spec
+++ b/ekg.spec
@@ -1,9 +1,9 @@
-%define                snapshot        20011215
-Summary:       A client compatible with Gadu-Gadu      
-Summary(pl):   Eksperymentalny Klient Gadu-Gadu        
-Name:          ekg             
+%define                snapshot        20011215
+Summary:       A client compatible with Gadu-Gadu
+Summary(pl):   Eksperymentalny Klient Gadu-Gadu
+Name:          ekg
 Version:       0.9.0.%{snapshot}
-Release:       1
+Release:       2
 License:       GPL
 Group:         Networking/Utilities
 Group(de):     Netzwerkwesen/Werkzeuge
@@ -11,10 +11,12 @@ Group(es):  Red/Utilitarios
 Group(pl):     Sieciowe/Narzêdzia
 Group(pt_BR):  Rede/Utilitários
 Source0:       http://dev.null.pl/ekg/%{name}-%{snapshot}.tar.gz
-URL:           http://dev.null.pl/ekg/ 
+Source1:       ekg.1.man
+Patch0:                ekg-man_bug.patch
+URL:           http://dev.null.pl/ekg/
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
-BuildRoot:     %{tmpdir}/%{name}-%{version}.%{snapshot}-root-%(id -u -n)
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 A client compatible with Gadu-Gadu.
@@ -23,98 +25,96 @@ A client compatible with Gadu-Gadu.
 Eksperymentalny Klient Gadu-Gadu.
 
 %package -n libgg
-Summary:       libgg Library
-Summary(pl):   Biblioteka libgg 
+Summary:       libgg library
+Summary(pl):   Biblioteka libgg
 Group:         Libraries
-Group(pl):     Biblioteki 
+Group(pl):     Biblioteki
 
-%description -n libgg 
-libgg is intended to make it easy to add Gadu-Gadu communication support 
-to your software.
+%description -n libgg
+libgg is intended to make it easy to add Gadu-Gadu communication
+support to your software.
 
 %description -n libgg -l pl
-libgg umo¿liwia ³atwe dodanie do ró¿nych aplikacji komunikacji bazuj±cej 
-na protokole Gadu-Gadu.
+libgg umo¿liwia ³atwe dodanie do ró¿nych aplikacji komunikacji
+bazuj±cej na protokole Gadu-Gadu.
 
 %package -n libgg-devel
-Summary:       libgg Library Development 
-Summary(pl):   Czê¶æ dla programistów biblioteki libgg
+Summary:       libgg library development
+Summary(pl):   Czê¶æ biblioteki libgg dla programistów
 Group:         Development/Libraries
-Group(pl):     Programowanie/Biblioteki 
+Group(pl):     Programowanie/Biblioteki
 Requires:      libgg
 
 %description -n libgg-devel
-The libgg-devel package contains the header files and some documentation 
-needed to develop application with libgg.
+The libgg-devel package contains the header files and some
+documentation needed to develop application with libgg.
 
 %description -n libgg-devel -l pl
-Pakiet libgg-devel zawiera pliki nag³ówkowe i dokumentacjê, potrzebne 
+Pakiet libgg-devel zawiera pliki nag³ówkowe i dokumentacjê, potrzebne
 do kompilowania aplikacji korzystaj±cych z libgg.
 
 %package -n libgg-static
-Summary:       Static libgg Library 
+Summary:       Static libgg Library
 Summary(pl):   Statyczna biblioteka libgg
 Group:         Development/Libraries
-Group(pl):     Programowanie/Biblioteki 
-Requires:      libgg-devel 
+Group(pl):     Programowanie/Biblioteki
+Requires:      libgg-devel
 
 %description -n libgg-static
 Static libgg library.
 
 %description -n libgg-static -l pl
 Statyczna biblioteka libgg.
- 
+
 %prep
-%setup -q -n %{name}-%{snapshot} 
+%setup -q -n %{name}-%{snapshot}
+%patch0 -p0
 
 %build
 %configure \
        %{?!debug:--without-debug}
-make
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_includedir}
-install -d $RPM_BUILD_ROOT%{_libdir}
-install -d $RPM_BUILD_ROOT%{_datadir}/ekg
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir},%{_libdir}} \
+       $RPM_BUILD_ROOT{%{_mandir}/{,pl/}man1,%{_datadir}/ekg}
 
 install src/ekg $RPM_BUILD_ROOT%{_bindir}
-install lib/libgg.so.* $RPM_BUILD_ROOT%{_libdir}
-install lib/libgg.a $RPM_BUILD_ROOT%{_libdir}
-ln -s %{_libdir}/libgg.so.0.9.0 $RPM_BUILD_ROOT%{_libdir}/libgg.so
 install lib/libgg.h $RPM_BUILD_ROOT%{_includedir}
+install lib/libgg.a $RPM_BUILD_ROOT%{_libdir}
+install lib/libgg.so.* $RPM_BUILD_ROOT%{_libdir}
 
 install themes/*.theme $RPM_BUILD_ROOT%{_datadir}/ekg
 
-gzip -9nf ChangeLog docs/* 
+install docs/ekg.man $RPM_BUILD_ROOT%{_mandir}/pl/man1/ekg.1
+install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/ekg.1
 
-%post -n libgg -p /sbin/ldconfig 
-%postun -n libgg -p /sbin/ldconfig 
+gzip -9nf ChangeLog docs/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -n libgg -p /sbin/ldconfig
+%postun -n libgg -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog.gz docs/README.gz
-%doc docs/7thguard.txt.gz docs/themes.txt.gz 
-%doc docs/ekl.pl.gz docs/ekg.man.gz 
-%attr(755,root,root) %{_bindir}/* 
+%attr(755,root,root) %{_bindir}/*
 %{_datadir}/ekg
+%doc docs/{7thguard,themes}.txt.gz
+%doc ChangeLog.gz docs/{README,ekl.pl}.gz
+%{_mandir}/man1/*
+%lang(pl) %{_mandir}/pl/man1/*
+
 %files -n libgg
-%defattr(644,root,root,755)
-%attr(644,root,root) %{_libdir}/libgg.so.*
+%attr(755,root,root) %{_libdir}/libgg.so.*
 
 %files -n libgg-devel
 %defattr(644,root,root,755)
-%attr(644,root,root) %{_libdir}/libgg.so
-%attr(644,root,root) %{_includedir}/* 
-%doc docs/protocol.txt.gz
-%doc docs/api.txt.gz
-%doc docs/7thguard.txt.gz
+%{_includedir}/libgg.h
+%doc docs/{7thguard,api,protocol}.txt.gz
 %doc ChangeLog.gz docs/README.gz
 
 %files -n libgg-static
-%defattr(644,root,root,755)
 %attr(644,root,root) %{_libdir}/libgg.a