dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-amsn-0.96.tar.bz2

.gitignore

@@ -0,0 +1 @@
+amsn-0.97.2.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: amsn
-# $Id$
-NAME := amsn
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

amsn.spec

@@ -1,21 +1,21 @@
-%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_version: %define tcl_version 8.4}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
 Name:           amsn
-Version:        0.96
-Release:        9%{?dist}
+Version:        0.97.2
+Release:        1%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
-License:        GPL
+License:        GPLv2
 URL:            http://www.amsn-project.net/
 Source0:        http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  autoconf, desktop-file-utils, tcl, tk-devel, which, libpng-devel, libjpeg-devel
+BuildRequires:  desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
+BuildRequires:  tcl(abi) = %{tcl_version}
 Requires:       tcl(abi) = %{tcl_version}
-Requires:       tcltls, tclsoap, tcllib, bwidget, tk, tkdnd, htmlview, sox
-Patch1:         amsn-0.96-system-bwidget.patch
+Requires:       tcltls, tclsoap, tcllib, bwidget, tkdnd, xdg-utils, alsa-utils
 
 %description
 This is an MSN Messenger clone for Unix, Windows, and Macintosh.
@@ -34,9 +34,7 @@ snapshots with your webcam to use as your display picture.
 
 %prep
 %setup -q
-%patch1 -p1 -b .1-system-bwidget
-rm -r utils/TkCximage/src/{jpeg,png,zlib}
-rm -r utils/BWidget-1.7.0
+rm -r utils/bwidget1.8.0
 rm -r skins/default/winicons
 
 # this can go after tcl package includes tcl_sitearch in path
@@ -46,11 +44,13 @@ rm -r skins/default/winicons
 %{__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# utils/BWidget-1.7.0##' Makefile.in
-%{__sed} -i 's#mozilla#htmlview#' config.tcl
-%{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl
+%{__sed} -i 's# utils/bwidget1.8.0##' Makefile.in
+%{__sed} -i 's#mozilla#xdg-open#' config.tcl
+%{__sed} -i 's#my_filemanager open#xdg-open#' config.tcl
+%{__sed} -i 's#openfilecommand ""#openfilecommand "xdg-open \\$file"#' config.tcl
+%{__sed} -i 's#soundcommand "play \\$sound"#soundcommand "aplay -q \\$sound"#' config.tcl
 %{__sed} -i 's#set program_dir \[file dirname \[info script\]\]#set program_dir "%{_datadir}/amsn/"#' amsn amsn-remote amsn-remote-CLI
-autoconf
+%{__sed} -i 's#Info=AMSN#X-Info=AMSN#' amsn.desktop
 
 %build
 %configure --enable-debug
@@ -59,7 +59,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make rpm-install INSTALL_PREFIX=${RPM_BUILD_ROOT}
+make install DESTDIR=${RPM_BUILD_ROOT}
 mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/amsn ${RPM_BUILD_ROOT}/%{_bindir}/amsn 
 mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/amsn-remote ${RPM_BUILD_ROOT}/%{_bindir}/amsn-remote
 mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/amsn-remote-CLI ${RPM_BUILD_ROOT}/%{_bindir}/amsn-remote-CLI
@@ -81,15 +81,16 @@ 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}/
 
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/
-cp ${RPM_BUILD_ROOT}%{_datadir}/amsn/icons/48x48/msn.png ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/
+mv ${RPM_BUILD_ROOT}%{_datadir}/amsn/desktop-icons/ ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/
+rm ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
 
-desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
-	--delete-original					\
-	${RPM_BUILD_ROOT}%{_datadir}/%{name}/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}
@@ -97,13 +98,13 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files
 %defattr(-,root,root,-)
-%doc AGREEMENT CREDITS docs/ FAQ GNUGPL HELP INSTALL README remote.help TODO lang/LANG-HOWTO
+%doc AGREEMENT CREDITS docs/ FAQ FAQ.html GNUGPL HELP INSTALL README remote.help TODO lang/LANG-HOWTO
 %{_bindir}/amsn
 %{_bindir}/amsn-remote
 %{_bindir}/amsn-remote-CLI
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-amsn.desktop
-%{_datadir}/icons/hicolor/48x48/apps/msn.png
+%{_datadir}/icons/hicolor/*
 %{tcl_sitearch}/*
 %exclude %{_datadir}/%{name}/plugins/*
 
@@ -125,6 +126,20 @@ fi
 
 
 %changelog
+* Sun Aug 17 2008 Sander Hoentjen <sander@hoentjen.eu> - 0.97.2-1
+- Update to latest release
+
+* Wed Dec 24 2007 Sander Hoentjen <sander@hoentjen.eu> - 0.97-1
+- Update to 0.97
+
+* Wed Nov 21 2007 Sander Hoentjen <sander@hoentjen.eu> - 0.96-11
+- Fix undefined tcl_version
+
+* Sun Nov 11 2007 Sander Hoentjen <sander@hoentjen.eu> - 0.96-10
+- change htmlview to xdg-open (bug #365381)
+- use alsa by default for playing sounds
+- undo rev 8 and 9 changes until it is supported
+
 * Thu Mar 31 2007 Sander Hoentjen <sander@hoentjen.eu> - 0.96-9
 - buildrequire tcl
 

sources

@@ -1 +1 @@
-3df6b0d34ef1997a47c0b8af29b2547a  amsn-0.96.tar.bz2
+6c494d97b5ab810f1b265ef19bf652b0  amsn-0.97.2.tar.bz2