- pl, some cleanups

Changed files:
    amsn.spec -> 1.3

diff --git a/amsn.spec b/amsn.spec
index 3c0983c9640ee870c37c943ba6ebc29a5c72146f..39fc33ffd49c07eca52f494dabd3ae9500b1b12c 100644 (file)
--- a/amsn.spec
+++ b/amsn.spec
@@ -3,8 +3,9 @@
 %bcond_without imlib   # do not compile freedesktop notification plugin
 #
 Summary:       MSN Messenger clone for Linux
-Summary(fr):   Clône MSN Messenger pour Linux
 Summary(de):   MSN Messenger-Klon für Linux
+Summary(fr):   Clône MSN Messenger pour Linux
+Summary(pl):   Klon MSN Messengera dla Linuksa
 Name:          amsn
 Version:       0.94
 Release:       0.5
@@ -18,31 +19,25 @@ URL:                http://amsn.sourceforge.net/
 %{?with_imlib:BuildRequires:   imlib-devel}
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
+BuildRequires: sed >= 4.0
 BuildRequires: tcl-devel >= 8.3
 BuildRequires: tk-devel >= 8.3
-BuildRequires: sed >= 4.0
-Requires:      tk >= 8.3
+# IM's convert is needed to display pictures (buddy icons).
+Requires:      ImageMagick
 Requires:      tcl >= 8.3
 # MSN Protocol 9 won't let you in without SSL anymore.
 Requires:      tcl-tls
-# IM's convert is needed to display pictures (buddy icons).
-Requires:      ImageMagick
+Requires:      tk >= 8.3
 %{!?with_imlib:BuildArch:      noarch}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 This is Tcl/Tk clone that implements the Microsoft Messenger (MSN) for
-Unix,Windows, or Macintosh platforms. It supports file transfers,
+Unix, Windows, or Macintosh platforms. It supports file transfers,
 groups, and many more features. Visit http://amsn.sourceforge.net/ for
 details. This is an ongoing project, and it is already going pretty
 well.
 
-%description -l fr
-amsn est un client Microsoft Messenger (MSN) pour UNIX, Windows et
-Macintosh écrit en Tcl/Tk.  Il supporte les tranferts de fichiers, les
-groupes et beaucoup d'autres possibilités. 
-Visitez http://amsn.sourceforge.net/ pour de plus amples détails.
-
 %description -l de
 amsn ist ein Microsoft Messenger (MSN) Client für UNIX, Windows und
 Macintosh, der in Tcl/Tk geschrieben ist. Es unterstützt
@@ -50,6 +45,19 @@ Datei
 Begeben Sie sich auf http://amsn.sourceforge.net/ um mehr über dieses
 Projekt zu erfahren.
 
+%description -l fr
+amsn est un client Microsoft Messenger (MSN) pour UNIX, Windows et
+Macintosh écrit en Tcl/Tk.  Il supporte les tranferts de fichiers, les
+groupes et beaucoup d'autres possibilités. 
+Visitez http://amsn.sourceforge.net/ pour de plus amples détails.
+
+%description -l pl
+amsn to klient Microsoft Messengera (MSN) dla Uniksów, Windows i
+Macintosha napisany w Tcl/Tk. Obs³uguje przesy³anie plików, grupy i
+wiele wiêcej mo¿liwo¶ci - szczegó³y pod adresem
+http://amsn.sourceforge.net/ . Projekt jest nadal rozwijany i ju¿
+dzia³a ca³kiem dobrze.
+
 %prep
 %setup -q -n %{name}-%{_ver}
 
@@ -60,26 +68,24 @@ sed -i -e '/Categories=/s/.*/Categories=Network;InstantMessaging;/' %{name}.desk
 %if %{with imlib}
 cd plugins/traydock
 %configure
-%{__make} %{?_smp_mflags}
+%{__make}
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-# create directories if necessary
-install -d $RPM_BUILD_ROOT/usr/share/%{name}
+install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %{__make} install \
        prefix=$RPM_BUILD_ROOT%{_prefix}
 
 %if %{with imlib}
        # Installing the freedesktop notification plugin"
-       install -d $RPM_BUILD_ROOT/usr/lib/amsn/plugins/traydock
-       mv $RPM_BUILD_ROOT/usr/share/amsn/plugins/traydock/libtray.so $RPM_BUILD_ROOT/usr/lib/amsn/plugins/traydock/
-       rm -rf $RPM_BUILD_ROOT/usr/share/amsn/plugins/traydock/
-       ln -s ../../../lib/amsn/plugins/traydock/ $RPM_BUILD_ROOT/usr/share/amsn/plugins/
+       install -d $RPM_BUILD_ROOT%{_libdir}/amsn/plugins/traydock
+       mv $RPM_BUILD_ROOT%{_datadir}/amsn/plugins/traydock/libtray.so $RPM_BUILD_ROOT%{_libdir}/amsn/plugins/traydock
+       rm -rf $RPM_BUILD_ROOT%{_datadir}/amsn/plugins/traydock
+       ln -s ../../../%{_lib}/amsn/plugins/traydock $RPM_BUILD_ROOT%{_datadir}/amsn/plugins
 %else
-       rm -rf $RPM_BUILD_ROOT/usr/share/amsn/plugins/traydock
+       rm -rf $RPM_BUILD_ROOT%{_datadir}/amsn/plugins/traydock
 %endif
 
 # force relative path
@@ -90,17 +96,17 @@ install -d $RPM_BUILD_ROOT%{_desktopdir}
 install %{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 # remove junk
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/amsn-0.91
-rm -rf $RPM_BUILD_ROOT/usr/share/amsn/amsn.{desktop,spec,debianmenu}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/amsn-0.91
+rm -rf $RPM_BUILD_ROOT%{_datadir}/amsn/amsn.{desktop,spec,debianmenu}
 # docs in docs
-rm -rf $RPM_BUILD_ROOT/usr/share/amsn/docs
-rm -rf $RPM_BUILD_ROOT/usr/share/amsn/{CREDITS,GNUGPL,README,HELP,FAQ,TODO,Makefile,cvs_date}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/amsn/docs
+rm -rf $RPM_BUILD_ROOT%{_datadir}/amsn/{CREDITS,GNUGPL,README,HELP,FAQ,TODO,Makefile,cvs_date}
 # random binary for PPC
-rm -rf $RPM_BUILD_ROOT/usr/share/amsn/sndplay
+rm -rf $RPM_BUILD_ROOT%{_datadir}/amsn/sndplay
 # not for our arch
-rm -rf $RPM_BUILD_ROOT/usr/share/amsn/plugins/{winflash,winutils,QuickTimeTcl3.1,applescript,tclCarbonNotification,tclAE2.0}
-rm -rf $RPM_BUILD_ROOT/usr/share/amsn/plugins/winico*
-rm -rf $RPM_BUILD_ROOT/usr/share/amsn/utils/
+rm -rf $RPM_BUILD_ROOT%{_datadir}/amsn/plugins/{winflash,winutils,QuickTimeTcl3.1,applescript,tclCarbonNotification,tclAE2.0}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/amsn/plugins/winico*
+rm -rf $RPM_BUILD_ROOT%{_datadir}/amsn/utils
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -122,6 +128,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %attr(755,root,root) %{_datadir}/%{name}/%{name}*
 
-%{_datadir}/pixmaps/*.png
+%{_pixmapsdir}/*.png
 %{_desktopdir}/%{name}.desktop
-%{?with_imlib:/usr/lib/amsn}
+%{?with_imlib:%{_libdir}/amsn}