[amsn/f16] Update to new version

Sander Hoentjen tjikkun at fedoraproject.org
Sun Jul 22 12:08:07 UTC 2012 

commit dfcee71f0a3ed862cff620e33661d3c6234a9441
Author: Sander Hoentjen <sander at hoentjen.eu>
Date:   Sun Jul 22 14:06:21 2012 +0200

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

 .gitignore                |    1 +
 amsn-0.98.4-useV4L2.patch |   84 ---------------------------------------------
 amsn.spec                 |   76 ++++++++++++++++++++++-------------------
 sources                   |    2 +-
 4 files changed, 43 insertions(+), 120 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd9a926..1bd38ea 100644
--- a/.gitignore
+++ b/.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
diff --git a/amsn.spec b/amsn.spec
index 0f4f3ee..1cc1dca 100644
--- a/amsn.spec
+++ b/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
-
-Group:          Applications/Internet
-License:        GPLv2
-URL:            http://www.amsn-project.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
+Name:		amsn
+Version:	0.98.9
+Release:	4%{?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
 Patch0:		amsn-0.98.1-usesnack.patch
-Patch1:		amsn-0.98.4-useV4L2.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}
+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
+%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,11 @@ fi
 
 
 %changelog
+* Sun Jul 22 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
+
 * Mon Jun 20 2011 Sander Hoentjen <sander at hoentjen.eu> 0.98.4-4
 - use V4L2 (backport http://amsn.svn.sourceforge.net/viewvc/amsn?view=revision&revision=12315)
 
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

More information about the scm-commits mailing list