rebuild with added forgotten patch

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

.gitignore

@@ -1,2 +1,3 @@
 amsn-0.98.3-src.tar.bz2
 /amsn-0.98.4-src.tar.bz2
+/amsn-0.98.9-src.tar.bz2

amsn-0.98.4-useV4L2.patch

@@ -1,84 +0,0 @@
---- amsn/configure.ac	2011/04/08 17:08:27	12314
-+++ amsn/configure.ac	2011/04/12 00:20:59	12315
-@@ -489,6 +489,11 @@
-       libv4l2 >= 0.5.0,
-       HAVE_LIBV4L=yes,HAVE_LIBV4L=no)
-   fi
-+  AC_CHECK_HEADERS(linux/videodev.h,HAVE_LIBV4L=yes,HAVE_LIBV4L=no)
-+  AC_CHECK_HEADERS(linux/videodev2.h,HAVE_LIBV4L2=yes,HAVE_LIBV4L2=no)
-+  if test x"$v4l2" = x"yes" ; then
-+    HAVE_LIBV4L=yes
-+  fi
-   AC_SUBST(HAVE_LIBV4L)
- 
-   AC_ARG_ENABLE([upnp],
---- amsn/utils/linux/capture/capture.h	2011/04/08 17:08:27	12314
-+++ amsn/utils/linux/capture/capture.h	2011/04/12 00:20:59	12315
-@@ -30,11 +30,13 @@
- 
- #include "config.h"
- 
-+/*
- #ifdef HAVE_SYS_VIDEODEV2_H
- #   include <sys/videodev2.h>
- #else
- #   include <linux/videodev.h>
- #endif
-+*/
- 
- #include "grab-ng.h"
- 
---- amsn/configure	2010/06/17 00:31:07	12053
-+++ amsn/configure	2011/04/12 00:43:13	12317
-@@ -597,6 +605,7 @@
- HAVE_GUPNP
- GUPNP_LIBS
- GUPNP_CFLAGS
-+HAVE_LIBV4L2
- HAVE_LIBV4L
- LIBV4L_LIBS
- LIBV4L_CFLAGS
-@@ -5688,6 +5697,35 @@
- 	HAVE_LIBV4L=yes
- fi
-   fi
-+  for ac_header in linux/videodev.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
-+if test "x$ac_cv_header_linux_videodev_h" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LINUX_VIDEODEV_H 1
-+_ACEOF
-+ HAVE_LIBV4L=yes
-+else
-+  HAVE_LIBV4L=no
-+fi
-+
-+done
-+
-+  for ac_header in linux/videodev2.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "linux/videodev2.h" "ac_cv_header_linux_videodev2_h" "$ac_includes_default"
-+if test "x$ac_cv_header_linux_videodev2_h" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LINUX_VIDEODEV2_H 1
-+_ACEOF
-+ HAVE_LIBV4L2=yes
-+else
-+  HAVE_LIBV4L2=no
-+fi
-+
-+done
-+
-+
- 
- 
-   # Check whether --enable-upnp was given.
-@@ -7058,6 +7124,7 @@
-     STATIC       : $STATIC
-     FARSIGHT     : $HAVE_FARSIGHT
-     LIBV4L       : $HAVE_LIBV4L
-+    LIBV4L2      : $HAVE_LIBV4L2
-     GUPNP-IGD    : $HAVE_GUPNP
- 
- EOF

amsn-0.98.9-chrpath.patch

@@ -0,0 +1,22 @@
+--- amsn/utils/linux/capture/libng/plugins/Rules.mk	(revision 12409)
++++ amsn/utils/linux/capture/libng/plugins/Rules.mk	(working copy)
+@@ -11,7 +11,7 @@
+ 	rm -f $(TARGETS-plugins) $(capture_dir)/libng/plugins/*.o
+ 
+ $(TARGETS-plugins): CFLAGS+=$(V4L_CFLAGS) -I$(capture_dir) -I$(capture_dir)/libng -I$(capture_dir)/structs
+-$(TARGETS-plugins): LDFLAGS+=$(foreach rp,$(RPATH),"-Wl,-rpath=$(rp)/$(capture_dir)/libng")
++$(TARGETS-plugins): LDFLAGS+=-Wl,-rpath=$(libdir)/amsn/utils/capture/libng
+ $(TARGETS-plugins): MORE_LIBS=-L$(capture_dir)/libng -lng
+ 
+ $(TARGETS-plugins): | $(capture_dir)/libng/libng.so
+--- amsn/utils/linux/capture/Rules.mk	(revision 12409)
++++ amsn/utils/linux/capture/Rules.mk	(working copy)
+@@ -4,7 +4,7 @@
+ $(OBJS-capture): CFLAGS+=-I$(capture_dir) -I$(capture_dir)/libng
+ 
+ $(TARGETS-capture): MORE_LIBS=-L$(capture_dir)/libng -lng
+-$(TARGETS-capture): LDFLAGS+=$(foreach rp,$(RPATH),"-Wl,-rpath=$(rp)/$(capture_dir)/libng")
++$(TARGETS-capture): LDFLAGS+=-Wl,-rpath=$(libdir)/amsn/utils/capture/libng
+ 
+ $(TARGETS-capture): $(OBJS-capture) | $(capture_dir)/libng/libng.so
+ 	@$(echo_link_so)

amsn.spec

@@ -1,28 +1,34 @@
 %{!?tcl_version: %define tcl_version 8.5}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
-Name:           amsn
-Version:        0.98.4
-Release:        4%{?dist}
-Summary:        MSN Messenger clone for Linux, Mac and Windows
+Name:		amsn
+Version:	0.98.9
+Release:	1%{?dist}
+Summary:	MSN Messenger clone for Linux, Mac and Windows
 
-Group:          Applications/Internet
-License:        GPLv2
-URL:            http://www.amsn-project.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
+Group:		Applications/Internet
+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
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch1:		amsn-0.98.9-chrpath.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
-BuildRequires:  farsight2-devel
-BuildRequires:  gupnp-igd-devel
-BuildRequires:  libv4l-devel
-BuildRequires:  tcl(abi) = %{tcl_version}
-Requires:       tcl(abi) = %{tcl_version}
+BuildRequires:	desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
+%if 0%{?fedora}	>= 17
+BuildRequires:	farstream-devel
+%else
+BuildRequires:	farsight2-devel
+%endif
+BuildRequires:	gupnp-igd-devel
+BuildRequires:	libv4l-devel
+BuildRequires:	tcl(abi) = %{tcl_version}
+BuildRequires:	autoconf, automake, libtool
+Requires:	tcl(abi) = %{tcl_version}
 Requires:	tcl-snack
-Requires:       tcltls, tclsoap, bwidget, tkdnd, xdg-utils
+Requires:	tcltls, bwidget, tkdnd, xdg-utils
 Requires:	tktray
+Requires:	tcllib
 
 %description
 This is an MSN Messenger clone for Unix, Windows, and Macintosh.
@@ -44,14 +50,16 @@ snapshots with your webcam to use as your display picture.
 %patch0 -p1
 %patch1 -p1
 
+autoreconf -i -f -v
+
 rm -r utils/BWidget-1.9.0
 rm -r skins/default/winicons
 rm -r plugins/music/MusicWin
 rm plugins/amsnplus/snapshot
 
 # for webcam to work these paths need to be added because we move libs around
-%{__sed} -i 's#\.\./libng/plugins#%{tcl_sitearch}/capture/libng/plugins#' utils/linux/capture/libng/grab-ng.c
-%{__sed} -i 's#\.\./libng/contrib-plugins#%{tcl_sitearch}/capture/libng/contrib-plugins#' utils/linux/capture/libng/grab-ng.c
+%{__sed} -i 's#\.\./libng/plugins#%{_libdir}/%{name}/utils/capture/libng/plugins#' utils/linux/capture/libng/grab-ng.c
+%{__sed} -i 's#\.\./libng/contrib-plugins#%{_libdir}/%{name}/utils/capture/libng/contrib-plugins#' utils/linux/capture/libng/grab-ng.c
 
 %{__sed} -i 's# utils/BWidget-1.9.0##' Makefile.in
 %{__sed} -i 's#soundcommand "play \\$sound"#soundcommand "aplay -q \\$sound"#' config.tcl
@@ -79,15 +87,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/
@@ -96,10 +97,10 @@ rm ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/skins/Dark\ Matter\ 4.0/pixmapscroll/test.tcl
 chmod 755 ${RPM_BUILD_ROOT}%{_datadir}/%{name}/utils/voipcontrols/test.tcl
 
-desktop-file-install --vendor="fedora"                          \
-        --dir="${RPM_BUILD_ROOT}%{_datadir}/applications"       \
-        --delete-original                                       \
-        ${RPM_BUILD_ROOT}%{_datadir}/applications/amsn.desktop
+desktop-file-install --vendor="fedora"				\
+	--dir="${RPM_BUILD_ROOT}%{_datadir}/applications"	\
+	--delete-original					\
+	${RPM_BUILD_ROOT}%{_datadir}/applications/amsn.desktop
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -112,9 +113,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
@@ -135,6 +136,14 @@ fi
 
 
 %changelog
+* Sun Jul 22 2012 Sander Hoentjen <sander@hoentjen.eu> 0.98.9-1
+- rebuild with patch added to git
+
+* Sun Jul 22 2012 Sander Hoentjen <sander@hoentjen.eu> 0.98.9-0
+- Update to new version
+- require tcllib, it isn't pulled in by other dependencies anymore
+- drop upstreamed patches
+
 * Mon Jun 20 2011 Sander Hoentjen <sander@hoentjen.eu> 0.98.4-4
 - use V4L2 (backport http://amsn.svn.sourceforge.net/viewvc/amsn?view=revision&revision=12315)
 

sources

@@ -1 +1 @@
-96fd20e8709ced4443432d125a5e0a5a  amsn-0.98.4-src.tar.bz2
+13885ccc9972b2722e33552601c5b2b4  amsn-0.98.9-src.tar.bz2