rpms/amsn/devel amsn-0.98.1-no-exact-http.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 amsn.spec, 1.24, 1.25 sources, 1.5, 1.6 amsn-0.96-system-bwidget.patch, 1.1, NONE amsn-0.97-libng-fixes.patch, 1.1, NONE amsn-0.97-libng-libv4l2.patch, 1.1, NONE amsn-0.97-tkcximage.patch, 1.1, NONE
Sander Hoentjen
tjikkun at fedoraproject.org
Wed Nov 11 09:36:15 UTC 2009
Author: tjikkun
Update of /cvs/pkgs/rpms/amsn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5006
Modified Files:
.cvsignore amsn.spec sources
Added Files:
amsn-0.98.1-no-exact-http.patch
Removed Files:
amsn-0.96-system-bwidget.patch amsn-0.97-libng-fixes.patch
amsn-0.97-libng-libv4l2.patch amsn-0.97-tkcximage.patch
Log Message:
new version 0.98.1
amsn-0.98.1-no-exact-http.patch:
autoupdate.tcl | 2 +-
proxy.tcl | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE amsn-0.98.1-no-exact-http.patch ---
--- amsn/autoupdate.tcl 2009-11-11 09:23:42.736604374 +0100
+++ amsn~/autoupdate.tcl 2009-11-11 09:38:25.349355120 +0100
@@ -536,7 +536,7 @@
}
#///////////////////////////////////////////////////////////////////////
- package require -exact http 2.4.4
+ package require http 2.4.4
proc check_web_version { token } {
global version rcversion weburl
--- amsn/proxy.tcl 2009-11-11 09:23:43.270603596 +0100
+++ amsn~/proxy.tcl 2009-11-11 09:31:51.524364201 +0100
@@ -9,7 +9,7 @@
::Version::setSubversionId {$Id: proxy.tcl 11344 2009-07-12 21:18:51Z kakaroto $}
package provide Proxy 0.1
-package require -exact http 2.4.4
+package require http 2.4.4
# This should be converted to a proper package, to use with package require
source socks.tcl ;# SOCKS5 proxy support
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore 27 Oct 2008 18:25:29 -0000 1.5
+++ .cvsignore 11 Nov 2009 09:36:14 -0000 1.6
@@ -1 +1 @@
-amsn-0.97.2.tar.bz2
+amsn-0.98.1.tar.bz2
Index: amsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/devel/amsn.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- amsn.spec 24 Jul 2009 16:51:07 -0000 1.24
+++ amsn.spec 11 Nov 2009 09:36:14 -0000 1.25
@@ -2,20 +2,20 @@
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
Name: amsn
-Version: 0.97.2
-Release: 5%{?dist}
+Version: 0.98.1
+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://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2
-Patch0: amsn-0.97-libng-fixes.patch
-Patch1: amsn-0.97-libng-libv4l2.patch
-Patch2: amsn-0.97-tkcximage.patch
+Patch0: amsn-0.98.1-no-exact-http.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}
@@ -39,23 +39,18 @@ snapshots with your webcam to use as you
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p2
-rm -r utils/bwidget1.8.0
+rm -r utils/BWidget-1.9.0
rm -r skins/default/winicons
+rm -r plugins/music/MusicWin
# 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# 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# utils/BWidget-1.9.0##' Makefile.in
%{__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
-%{__sed} -i 's#Info=AMSN#X-Info=AMSN#' amsn.desktop
%build
%configure --enable-debug
@@ -69,29 +64,33 @@ mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
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
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/base64
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/http2.4
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/log
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/sha1
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/snit
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/tcldom
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/tclsoap1.6.7
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/Tclxml
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/uri
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/docs
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/{AGREEMENT,FAQ,GNUGPL,INSTALL,remote.help,TODO}
-rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/lang/{*.*,LANG-HOWTO,sortlang}
+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
+rm -r ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/uri
+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}/
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
+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 \
@@ -131,6 +130,12 @@ fi
%changelog
+* Thu Nov 05 2009 Sander Hoentjen <sander at hoentjen.eu> - 0.98.1-1
+- Update to new upstream
+- drop patches that are now upstream
+- voice support
+- upnp support
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.97.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 27 Oct 2008 18:25:29 -0000 1.5
+++ sources 11 Nov 2009 09:36:14 -0000 1.6
@@ -1 +1 @@
-6c494d97b5ab810f1b265ef19bf652b0 amsn-0.97.2.tar.bz2
+2ef1d32324d3f9d85795433414abd51b amsn-0.98.1.tar.bz2
--- amsn-0.96-system-bwidget.patch DELETED ---
--- amsn-0.97-libng-fixes.patch DELETED ---
--- amsn-0.97-libng-libv4l2.patch DELETED ---
--- amsn-0.97-tkcximage.patch DELETED ---
More information about the fedora-extras-commits
mailing list