[amsn] - Update to new version - require tcllib, it isn't pulled in by other dependencies anymore - drop up

[Sander Hoentjen]

commit 19355a805fe9b650bc974703f1c048c1fe76d51c
Author: Sander Hoentjen <sander at hoentjen.eu>
Date:   Tue Jul 3 19:53:07 2012 +0200

    - Update to new version
    - require tcllib, it isn't pulled in by other dependencies anymore
    - drop upstreamed patches

 amsn-0.98.4-farstream.patch |  306 --------------------------
 amsn-0.98.4-libpng15.patch  |  498 -------------------------------------------
 amsn-0.98.4-useV4L2.patch   |   84 --------
 amsn.spec                   |   31 +--
 sources                     |    2 +-
 5 files changed, 12 insertions(+), 909 deletions(-)
---
diff --git a/amsn.spec b/amsn.spec
index d115611..12739c1 100644
--- a/amsn.spec
+++ b/amsn.spec
@@ -2,8 +2,8 @@
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name:		amsn
-Version:	0.98.4
-Release:	10%{?dist}
+Version:	0.98.9
+Release:	0%{?dist}
 Summary:	MSN Messenger clone for Linux, Mac and Windows
 
 Group:		Applications/Internet
@@ -11,9 +11,6 @@ License:	GPLv2
 URL:		http://www.amsn-project.net/
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
 Patch0:		amsn-0.98.1-usesnack.patch
-Patch1:		amsn-0.98.4-useV4L2.patch
-Patch2:		amsn-0.98.4-libpng15.patch
-Patch3:		amsn-0.98.4-farstream.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
@@ -30,6 +27,7 @@ Requires:	tcl(abi) = %{tcl_version}
 Requires:	tcl-snack
 Requires:	tcltls, bwidget, tkdnd, xdg-utils
 Requires:	tktray
+Requires:	tcllib
 
 %description
 This is an MSN Messenger clone for Unix, Windows, and Macintosh.
@@ -49,11 +47,6 @@ snapshots with your webcam to use as your display picture.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%if 0%{?fedora} >= 17
-%patch3 -p1 -b .farstream
-%endif
 
 autoreconf -i -f -v
 
@@ -92,15 +85,8 @@ rm -r ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/docs
 rm -r ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/{AGREEMENT,FAQ,GNUGPL,INSTALL,remote.help,TODO}
 rm -r ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/lang/{*.*,LANG-HOWTO,sortlang}
 
-mkdir -p ${RPM_BUILD_ROOT}/%{tcl_sitearch}
-mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/linux/* ${RPM_BUILD_ROOT}/%{tcl_sitearch}/
-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}/%{_libdir}/%{name}/utils/linux/* ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/utils/
+rm -r ${RPM_BUILD_ROOT}/%{_libdir}/%{name}/utils/linux/
 
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/
 mv ${RPM_BUILD_ROOT}%{_datadir}/amsn/desktop-icons/ ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/
@@ -125,9 +111,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/amsn-remote
 %{_bindir}/amsn-remote-CLI
 %{_datadir}/%{name}/
+%{_libdir}/%{name}/
 %{_datadir}/applications/fedora-amsn.desktop
 %{_datadir}/icons/hicolor/*/*/amsn.png
-%{tcl_sitearch}/*
 %exclude %{_datadir}/%{name}/plugins/*
 
 %files plugins
@@ -148,6 +134,11 @@ fi
 
 
 %changelog
+* Mon Jun 25 2012 Sander Hoentjen <sander at hoentjen.eu> 0.98.9-0
+- Update to new version
+- require tcllib, it isn't pulled in by other dependencies anymore
+- drop upstreamed patches
+
 * Fri Mar  9 2012 Tom Callaway <spot at fedoraproject.org> 0.98.4-10
 - support farstream instead of deprecated farsight2
 
diff --git a/sources b/sources
index 4a401d2..3404102 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-96fd20e8709ced4443432d125a5e0a5a  amsn-0.98.4-src.tar.bz2
+13885ccc9972b2722e33552601c5b2b4  amsn-0.98.9-src.tar.bz2