packages: amsn/amsn.spec - move utils to tcl_sitearch (fc merge) - BR libv4...

[glen]

Author: glen                         Date: Thu Feb 25 21:54:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move utils to tcl_sitearch (fc merge)
- BR libv4l-devel, farsight2-devel

---- Files affected:
packages/amsn:
   amsn.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: packages/amsn/amsn.spec
diff -u packages/amsn/amsn.spec:1.34 packages/amsn/amsn.spec:1.35
--- packages/amsn/amsn.spec:1.34	Thu Feb 25 22:42:31 2010
+++ packages/amsn/amsn.spec	Thu Feb 25 22:54:29 2010
@@ -1,8 +1,5 @@
 # $Revision$, $Date$
 # TODO
-# - farsight.so in %{_datadir}!
-# - asyncresolver.so in %{_datadir}!
-# - tclISF.so in %{_datadir}!
 # - Requires: /bin/bash /bin/sh /usr/bin/env /usr/bin/perl
 # - mv languages instead handling specially in find-lang.sh, send to upstream
 Summary:	MSN Messenger clone for Linux
@@ -11,7 +8,7 @@
 Summary(pl.UTF-8):	Klon MSN Messengera dla Linuksa
 Name:		amsn
 Version:	0.98.1
-Release:	2.1
+Release:	2.3
 License:	GPL
 Group:		Applications/Communications
 Source0:	http://downloads.sourceforge.net/amsn/%{name}-%{version}.tar.gz
@@ -22,9 +19,11 @@
 Patch2:		%{name}-libpng.patch
 Patch3:		%{name}-bwidget.patch
 URL:		http://www.amsn-project.net/
+BuildRequires:	farsight2-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 2:1.4
 BuildRequires:	libstdc++-devel
+BuildRequires:	libv4l-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.517
@@ -127,6 +126,7 @@
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/amsn-remote-CLI $RPM_BUILD_ROOT%{_bindir}/amsn-remote-CLI
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/base64
+#rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/http
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/log
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/sha1
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/snit
@@ -141,10 +141,15 @@
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/TkCximage $RPM_BUILD_ROOT%{tcl_sitearch}
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/webcamsn $RPM_BUILD_ROOT%{tcl_sitearch}
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/tcl_siren $RPM_BUILD_ROOT%{tcl_sitearch}
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/tclISF $RPM_BUILD_ROOT%{tcl_sitearch}
+#mv $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/gupnp $RPM_BUILD_ROOT%{tcl_sitearch}
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/farsight $RPM_BUILD_ROOT%{tcl_sitearch}
+mv $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/asyncresolver $RPM_BUILD_ROOT%{tcl_sitearch}
+
 mv $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_desktopdir}}/%{name}.desktop
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/desktop-icons/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/desktop-icons
-ln -sf %{_iconsdir}/hicolor/48x48/apps/%{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
+rm $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
 # docs in docs
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/*/test.tcl
@@ -183,7 +188,6 @@
 
 %{_iconsdir}/hicolor/*/apps/*.png
 %{_desktopdir}/%{name}.desktop
-%{_pixmapsdir}/%{name}.png
 
 %dir %{tcl_sitearch}/*
 %{tcl_sitearch}/*/*.tcl
@@ -251,6 +255,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2010/02/25 21:54:29  glen
+- move utils to tcl_sitearch (fc merge)
+- BR libv4l-devel, farsight2-devel
+
 Revision 1.34  2010/02/25 21:42:31  glen
 - fix packaging of lang of plugins
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/amsn/amsn.spec?r1=1.34&r2=1.35&f=u