Compare commits
45 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
37baf63356 | ||
|
|
b58298d723 | ||
|
|
0f3976d950 | ||
|
|
25e728f0b0 | ||
|
|
4ddbcc014f | ||
|
|
ca677954c1 | ||
|
|
0a791b67cc | ||
|
|
1854bec339 | ||
|
|
ae0523e6f1 | ||
|
|
c480a2f613 | ||
|
|
1f065e995e | ||
|
|
df863486fb | ||
|
|
e57c880fcf | ||
|
|
19355a805f | ||
|
|
84116ed29c | ||
|
|
f06001562e | ||
|
|
492d513eee | ||
|
|
a7bf132d1f | ||
|
|
22b38fa57f | ||
|
|
024ccb26ff | ||
|
|
26f9b06b51 | ||
|
|
b4863ae67e | ||
|
|
94728ea66a | ||
|
|
e07f0a2871 | ||
|
|
5660b489fb | ||
|
|
e3e42ad807 | ||
|
|
a5c4981a5f | ||
|
|
42f9915507 | ||
|
|
aaaea84a13 | ||
|
|
1072874265 | ||
|
|
cb16b88d99 | ||
|
|
39e761e8e2 | ||
|
|
20be54d239 | ||
|
|
f3a26b9261 | ||
|
|
127b4cd2c2 | ||
|
|
e92bd5494c | ||
|
|
57d0db7026 | ||
|
|
d411bb1195 | ||
|
|
6ffaf26bf7 | ||
|
|
bb0e8e7e26 | ||
|
|
dc15dc9d3d | ||
|
|
31a922a037 | ||
|
|
d14081b633 | ||
|
|
b8c4f3c77e | ||
|
|
f0065765d5 |
6 changed files with 1 additions and 298 deletions
|
|
@ -1 +0,0 @@
|
|||
amsn-0.96.tar.bz2
|
||||
21
Makefile
21
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)
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
Common subdirectories: amsn~/autopackage and amsn/autopackage
|
||||
diff -u amsn~/autoupdate.tcl amsn/autoupdate.tcl
|
||||
--- amsn~/autoupdate.tcl 2006-05-30 18:08:07.000000000 +0200
|
||||
+++ amsn/autoupdate.tcl 2006-05-30 18:10:55.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-package require AMSN_BWidget
|
||||
+package require BWidget
|
||||
|
||||
namespace eval ::autoupdate {
|
||||
|
||||
Common subdirectories: amsn~/debian and amsn/debian
|
||||
Common subdirectories: amsn~/docs and amsn/docs
|
||||
diff -u amsn~/gui.tcl amsn/gui.tcl
|
||||
--- amsn~/gui.tcl 2006-05-30 18:09:00.000000000 +0200
|
||||
+++ amsn/gui.tcl 2006-05-30 08:29:00.000000000 +0200
|
||||
@@ -12,11 +12,30 @@
|
||||
tk_messageBox -default ok -message "You need TCL/TK 8.4 or better to run aMSN. Please upgrade." -icon warning
|
||||
exit
|
||||
}
|
||||
-package require AMSN_BWidget
|
||||
+package require BWidget
|
||||
if {[catch {package require tkdnd}] } {
|
||||
proc dnd { args } {}
|
||||
proc shape { args } {}
|
||||
}
|
||||
+
|
||||
+################################################
|
||||
+# 'Missing' BWidget commands #
|
||||
+################################################
|
||||
+ScrollableFrame .tmp
|
||||
+destroy .tmp
|
||||
+proc ::ScrollableFrame::compute_width { path } {
|
||||
+ $path configure -width [winfo reqwidth [$path getframe]]
|
||||
+}
|
||||
+
|
||||
+proc ::ScrollableFrame::compute_height { path } {
|
||||
+ $path configure -height [winfo reqheight [$path getframe]]
|
||||
+}
|
||||
+
|
||||
+proc ::ScrollableFrame::compute_size { path } {
|
||||
+ $path compute_width
|
||||
+ $path compute_height
|
||||
+}
|
||||
+
|
||||
#package require pixmapbutton
|
||||
if {![catch {tk windowingsystem} wsystem] && $wsystem == "aqua"} {
|
||||
#Use tclCarbonHICommand for window utilities
|
||||
Only in amsn~: gui.tcl~
|
||||
Common subdirectories: amsn~/icons and amsn/icons
|
||||
Common subdirectories: amsn~/lang and amsn/lang
|
||||
Common subdirectories: amsn~/plugins and amsn/plugins
|
||||
diff -u amsn~/preferences.tcl amsn/preferences.tcl
|
||||
--- amsn~/preferences.tcl 2006-05-30 18:08:12.000000000 +0200
|
||||
+++ amsn/preferences.tcl 2006-05-30 18:11:16.000000000 +0200
|
||||
@@ -1,5 +1,4 @@
|
||||
-
|
||||
-package require AMSN_BWidget
|
||||
+package require BWidget
|
||||
|
||||
#TODO:
|
||||
#Put items frame and listbox in scrollbars!!
|
||||
Binary files amsn~/.preferences.tcl.swp and amsn/.preferences.tcl.swp differ
|
||||
Common subdirectories: amsn~/skins and amsn/skins
|
||||
Common subdirectories: amsn~/.svn and amsn/.svn
|
||||
Common subdirectories: amsn~/utils and amsn/utils
|
||||
210
amsn.spec
210
amsn.spec
|
|
@ -1,210 +0,0 @@
|
|||
%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
|
||||
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
|
||||
|
||||
Name: amsn
|
||||
Version: 0.96
|
||||
Release: 9%{?dist}
|
||||
Summary: MSN Messenger clone for Linux, Mac and Windows
|
||||
|
||||
Group: Applications/Internet
|
||||
License: GPL
|
||||
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
|
||||
Requires: tcl(abi) = %{tcl_version}
|
||||
Requires: tcltls, tclsoap, tcllib, bwidget, tk, tkdnd, htmlview, sox
|
||||
Patch1: amsn-0.96-system-bwidget.patch
|
||||
|
||||
%description
|
||||
This is an MSN Messenger clone for Unix, Windows, and Macintosh.
|
||||
It is written in tcl/tk and supports filetransfers, webcam, etc.
|
||||
|
||||
%package plugins
|
||||
Summary: Plugins for aMSN
|
||||
Group: Applications/Internet
|
||||
URL: http://amsn.sourceforge.net/plugins.php
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description plugins
|
||||
Extra plugins for amsn to enable drawing Ink, send and receive Nudges,
|
||||
view the last lines of a recent chat when opening a new one and create
|
||||
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 skins/default/winicons
|
||||
|
||||
# this can go after tcl package includes tcl_sitearch in path
|
||||
%{__sed} -i 's#lappend auto_path \[file join ${HOME} plugins\]#lappend auto_path \[file join \${HOME} plugins\] %{tcl_sitearch}#' amsn
|
||||
|
||||
# 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/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#set program_dir \[file dirname \[info script\]\]#set program_dir "%{_datadir}/amsn/"#' amsn amsn-remote amsn-remote-CLI
|
||||
autoconf
|
||||
|
||||
%build
|
||||
%configure --enable-debug
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
make rpm-install INSTALL_PREFIX=${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
|
||||
|
||||
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}
|
||||
|
||||
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}/
|
||||
|
||||
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/
|
||||
|
||||
desktop-file-install --vendor fedora \
|
||||
--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
|
||||
--add-category X-Fedora \
|
||||
--delete-original \
|
||||
${RPM_BUILD_ROOT}%{_datadir}/%{name}/amsn.desktop
|
||||
|
||||
%clean
|
||||
rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AGREEMENT CREDITS docs/ FAQ 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
|
||||
%{tcl_sitearch}/*
|
||||
%exclude %{_datadir}/%{name}/plugins/*
|
||||
|
||||
%files plugins
|
||||
%defattr(-,root,root,-)
|
||||
%{_datadir}/%{name}/plugins/*
|
||||
|
||||
%post
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
fi
|
||||
|
||||
%postun
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Mar 31 2007 Sander Hoentjen <sander@hoentjen.eu> - 0.96-9
|
||||
- buildrequire tcl
|
||||
|
||||
* Thu Mar 31 2007 Sander Hoentjen <sander@hoentjen.eu> - 0.96-8
|
||||
- require specific tcl major version (abi) which it is built on
|
||||
|
||||
* Thu Mar 8 2007 Sander Hoentjen <sander@hoentjen.eu> - 0.96-7
|
||||
- Don't own tcl_sitearch
|
||||
|
||||
* Sun Mar 4 2007 Sander Hoentjen <sander@hoentjen.eu> - 0.96-6
|
||||
- No versioned requires on tk anymore since it doesn't work with the epoch
|
||||
- bump for rebuild against reverted 8.4
|
||||
- added tcl macros from tcl guidelines draft
|
||||
- moved private extensions to sitelib
|
||||
|
||||
* Fri Feb 2 2007 Sander Hoentjen <sander@hoentjen.eu> - 0.96-5
|
||||
- Bump because i messed up tagging
|
||||
|
||||
* Fri Feb 2 2007 Sander Hoentjen <sander@hoentjen.eu> - 0.96-4
|
||||
- updated requires to tcl/tk 8.5 since it will segfault with 8.4 if it is built against 8.5 and vice versa
|
||||
- fixed previous changelog entry date
|
||||
|
||||
* Fri Feb 2 2007 Sander Hoentjen <sander@hoentjen.eu> - 0.96-3
|
||||
- rebuilt against tcl/tk 8.5
|
||||
|
||||
* Thu Sep 4 2006 Sander Hoentjen <sander@hoentjen.eu> - 0.96-2
|
||||
- webcam now works (bug #206674)
|
||||
|
||||
* Thu Sep 2 2006 Sander Hoentjen <sander@hoentjen.eu> - 0.96-1
|
||||
- updated to 0.96 final
|
||||
- drop nolocate and locallibs patch because they were accepted upstream
|
||||
- changed URL because they moved the website
|
||||
|
||||
* Tue Aug 28 2006 Sander Hoentjen <tjikkun@xs4all.nl> - 0.96-0.13.rc1
|
||||
- Tag error, so bumping the release
|
||||
|
||||
* Tue Aug 28 2006 Sander Hoentjen <tjikkun@xs4all.nl> - 0.96-0.12.rc1
|
||||
- FC6 mass rebuild
|
||||
|
||||
* Tue Jun 20 2006 Sander Hoentjen <tjikkun@xs4all.nl> - 0.96-0.11.rc1
|
||||
- requires sox, htmlview and tkdnd now
|
||||
- moved amsn, amsn-remote and amsn-remote-CLI to bindir
|
||||
- removed extra " from amsn.desktop
|
||||
|
||||
* Mon Jun 19 2006 Sander Hoentjen <tjikkun@xs4all.nl> - 0.96-0.10.rc1
|
||||
- requires tk >= 8.4.13 because of bug #193853
|
||||
|
||||
* Mon Jun 19 2006 Sander Hoentjen <tjikkun@xs4all.nl> - 0.96-0.9.rc1
|
||||
- fixed lots of stuff pointed out in comment #25 on bug #185951
|
||||
|
||||
* Sat Jun 17 2006 Sander Hoentjen <tjikkun@xs4all.nl> - 0.96-0.8.rc1
|
||||
- updated to 0.96rc1
|
||||
|
||||
* Thu Jun 8 2006 Sander Hoentjen <tjikkun@xs4all.nl> - 0.96-0.7.20060608svn
|
||||
- updated to current 0.96 branch of svn
|
||||
- use systemwide bwidget install
|
||||
|
||||
* Tue May 18 2006 Sander Hoentjen <tjikkun@xs4all.nl> - 0.96-0.6.20060517svn
|
||||
- TkCximage now uses system libs instead own included ( bugzilla #185951#c13 )
|
||||
|
||||
* Tue May 17 2006 Sander Hoentjen <tjikkun@xs4all.nl> - 0.96-0.5.20060517svn
|
||||
- update to current svn (upstream switched from cvs to svn)
|
||||
- removed file permission fixes since they are fixed upstream
|
||||
- removed BuildRequires: tcl-devel since that is required by tk-devel anyway
|
||||
- require tclsoap and remove it from the amsn package
|
||||
- require tcllib and remove all files from amsn that are packaged in tcllib
|
||||
|
||||
* Tue Apr 25 2006 Sander Hoentjen <tjikkun@xs4all.nl> - 0.96-0.4.20060425cvs
|
||||
- updated to new cvs snapshot
|
||||
- added enable-debug to configure
|
||||
|
||||
* Mon Mar 27 2006 Sander Hoentjen <tjikkun@xs4all.nl> - 0.96-0.3.20060327cvs
|
||||
- split into amsn, amsn-plugins
|
||||
|
||||
* Mon Mar 27 2006 Sander Hoentjen <tjikkun@xs4all.nl> - 0.96-0.2.20060327cvs
|
||||
- linflash added upstream
|
||||
- icon for desktop entry
|
||||
- docfiles
|
||||
- no locate needed during configure
|
||||
- no explicit requires for tcl and tk
|
||||
|
||||
* Wed Mar 22 2006 Sander Hoentjen <tjikkun@xs4all.nl> - 0.96-0.1.20060322cvs
|
||||
- created
|
||||
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
MSN network shutting down, so package is no longer usefull
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
3df6b0d34ef1997a47c0b8af29b2547a amsn-0.96.tar.bz2
|
||||
Reference in a new issue