rpms/amsn/devel amsn-0.96-configureac-nolocate.patch, NONE, 1.1 amsn-0.96-system-bwidget.patch, NONE, 1.1 amsn-0.96-tkcximage-locallibs.patch, NONE, 1.1 amsn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Sander Hoentjen (tjikkun)
fedora-extras-commits at redhat.com
Tue Jun 20 19:00:48 UTC 2006
Author: tjikkun
Update of /cvs/extras/rpms/amsn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4606/devel
Modified Files:
.cvsignore sources
Added Files:
amsn-0.96-configureac-nolocate.patch
amsn-0.96-system-bwidget.patch
amsn-0.96-tkcximage-locallibs.patch amsn.spec
Log Message:
auto-import amsn-0.96-0.11.rc1 on branch devel from amsn-0.96-0.11.rc1.src.rpm
amsn-0.96-configureac-nolocate.patch:
--- NEW FILE amsn-0.96-configureac-nolocate.patch ---
--- msn/configure.ac~ 2006-03-27 08:52:26.000000000 +0200
+++ msn/configure.ac 2006-03-27 08:53:26.000000000 +0200
@@ -129,8 +129,7 @@
/usr/lib64/tcl8.5 \
/usr/lib64/tcl8.5.* \
/usr/local/lib64/tcl8.5 \
- /usr/local/lib64/tcl8.5.* \
- `locate tclConfig.sh`"
+ /usr/local/lib64/tcl8.5.*"
for i in $dirs ; do
@@ -268,8 +267,7 @@
/usr/lib64/tk8.5 \
/usr/lib64/tk8.5.* \
/usr/local/lib64/tk8.5 \
- /usr/local/lib64/tk8.5.* \
- `locate tkConfig.sh`"
+ /usr/local/lib64/tk8.5.*"
for i in $dirs ; do
amsn-0.96-system-bwidget.patch:
--- NEW FILE amsn-0.96-system-bwidget.patch ---
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
amsn-0.96-tkcximage-locallibs.patch:
--- NEW FILE amsn-0.96-tkcximage-locallibs.patch ---
diff -ur amsn~/Makefile.in amsn/Makefile.in
--- amsn~/Makefile.in 2006-04-28 00:10:17.000000000 +0200
+++ amsn/Makefile.in 2006-05-20 10:37:16.000000000 +0200
@@ -50,7 +50,7 @@
LFS_FLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
LIB_FLAGS := -I. -I$(capture_dir) -I$(capture_dir)/libng -I$(capture_dir)/structs
LIB_FLAGS += -I$(webcamsn_dir)/src -I$(tkcximage_dir)/src -I$(tkcximage_dir)/src/CxImage
-LIB_FLAGS += -I$(tkcximage_dir)/src/zlib -I$(tkcximage_dir)/src/png -I$(tkcximage_dir)/src/jpeg
+LIB_FLAGS += -Ipng -Ijpeg
LIBDIR := @LIBDIR@
@@ -100,7 +100,7 @@
CXXFLAGS += -fPIC
# libraries
-LDLIBS := @LDLIBS@
+LDLIBS := @LDLIBS@ -lpng -ljpeg
LDFLAGS := @LDFLAGS@
ifeq (@DEBUG@,no)
LDFLAGS += -s
@@ -224,9 +224,6 @@
include $(tkcximage_dir)/Rules.mk
include $(tkcximage_dir)/src/Rules.mk
include $(tkcximage_dir)/src/CxImage/Rules.mk
-include $(tkcximage_dir)/src/zlib/Rules.mk
-include $(tkcximage_dir)/src/png/Rules.mk
-include $(tkcximage_dir)/src/jpeg/Rules.mk
include $(tkcximage_dir)/src/Rules.mk
include $(webcamsn_dir)/Rules.mk
diff -ur amsn~/utils/TkCximage/src/CxImage/ximajpg.cpp amsn/utils/TkCximage/src/CxImage/ximajpg.cpp
--- amsn~/utils/TkCximage/src/CxImage/ximajpg.cpp 2006-04-13 15:22:27.000000000 +0200
+++ amsn/utils/TkCximage/src/CxImage/ximajpg.cpp 2006-05-18 23:03:20.000000000 +0200
@@ -9,7 +9,7 @@
#if CXIMAGE_SUPPORT_JPG
-#include "../jpeg/jmorecfg.h"
+#include <jmorecfg.h>
#include "ximaiter.h"
diff -ur amsn~/utils/TkCximage/src/CxImage/ximajpg.h amsn/utils/TkCximage/src/CxImage/ximajpg.h
--- amsn~/utils/TkCximage/src/CxImage/ximajpg.h 2006-04-13 15:22:27.000000000 +0200
+++ amsn/utils/TkCximage/src/CxImage/ximajpg.h 2006-05-19 10:12:38.000000000 +0200
@@ -29,8 +29,8 @@
#define CXIMAGEJPG_SUPPORT_EXIF 1
extern "C" {
- #include "../jpeg/jpeglib.h"
- #include "../jpeg/jerror.h"
+ #include <jpeglib.h>
+ #include <jerror.h>
}
class DLL_EXP CxImageJPG: public CxImage
diff -ur amsn~/utils/TkCximage/src/CxImage/ximapng.h amsn/utils/TkCximage/src/CxImage/ximapng.h
--- amsn~/utils/TkCximage/src/CxImage/ximapng.h 2006-04-13 15:22:27.000000000 +0200
+++ amsn/utils/TkCximage/src/CxImage/ximapng.h 2006-05-18 23:04:57.000000000 +0200
@@ -22,7 +22,7 @@
#if CXIMAGE_SUPPORT_PNG
extern "C" {
-#include "../png/png.h"
+#include <png.h>
}
long int inline btohl( long int dword ) {
diff -ur amsn~/utils/TkCximage/src/Rules.mk amsn/utils/TkCximage/src/Rules.mk
--- amsn~/utils/TkCximage/src/Rules.mk 2006-02-02 22:08:21.000000000 +0100
+++ amsn/utils/TkCximage/src/Rules.mk 2006-05-19 09:57:03.000000000 +0200
@@ -1,7 +1,5 @@
OBJS-TkCximage := $(tkcximage_dir)/src/TkCximage.cpp.o $(tkcximage_dir)/src/PhotoFormat.cpp.o \
- $(tkcximage_dir)/src/procs.cpp.o $(tkcximage_dir)/src/CxImage/libCxImage.a \
- $(tkcximage_dir)/src/jpeg/libjpeg.a $(tkcximage_dir)/src/png/libpng.a \
- $(tkcximage_dir)/src/zlib/libzlib.a
+ $(tkcximage_dir)/src/procs.cpp.o $(tkcximage_dir)/src/CxImage/libCxImage.a
ifeq ($(STATIC),yes)
OBJS-TkCximage += libstdc++.a
endif
--- NEW FILE amsn.spec ---
%define alphatag rc1
Name: amsn
Version: 0.96
Release: 0.11.%{alphatag}%{?dist}
Summary: MSN Messenger clone for Linux, Mac and Windows
Group: Applications/Internet
License: GPL
URL: http://amsn.sourceforge.net/
Source0: http://dl.sourceforge.net/amsn/%{name}-%{version}%{alphatag}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
Requires: tcltls, tclsoap, tcllib, bwidget, tk >= 8.4.13, tkdnd, htmlview, sox
Patch1: amsn-0.96-configureac-nolocate.patch
Patch2: amsn-0.96-tkcximage-locallibs.patch
Patch3: 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 -n %{name}-%{version}%{alphatag} -q
%patch1 -p1 -b .1-nolocate
%patch2 -p1 -b .2-locallibs
%patch3 -p1 -b .3-system-bwidget
rm -r utils/TkCximage/src/{jpeg,png,zlib}
rm -r utils/BWidget-1.7.0
%{__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 "/usr/share/amsn/"#' amsn amsn-remote amsn-remote-CLI
%{__sed} -i 's#"##' amsn.desktop
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}/%{_libdir}
mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/linux/* ${RPM_BUILD_ROOT}/%{_libdir}/
mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/TkCximage ${RPM_BUILD_ROOT}/%{_libdir}/
mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/webcamsn ${RPM_BUILD_ROOT}/%{_libdir}/
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
%{_libdir}/traydock/
%{_libdir}/capture/
%{_libdir}/TkCximage/
%{_libdir}/webcamsn/
%{_libdir}/linflash/
%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
* Tue Jun 20 2006 Sander Hoentjen <tjikkun at 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 at xs4all.nl> - 0.96-0.10.rc1
- requires tk >= 8.4.13 because of bug #193853
* Mon Jun 19 2006 Sander Hoentjen <tjikkun at 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 at xs4all.nl> - 0.96-0.8.rc1
- updated to 0.96rc1
* Thu Jun 8 2006 Sander Hoentjen <tjikkun at 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 at 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 at 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 at xs4all.nl> - 0.96-0.4.20060425cvs
- updated to new cvs snapshot
- added enable-debug to configure
* Mon Mar 27 2006 Sander Hoentjen <tjikkun at xs4all.nl> - 0.96-0.3.20060327cvs
- split into amsn, amsn-plugins
* Mon Mar 27 2006 Sander Hoentjen <tjikkun at 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 at xs4all.nl> - 0.96-0.1.20060322cvs
- created
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amsn/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Jun 2006 18:55:48 -0000 1.1
+++ .cvsignore 20 Jun 2006 19:00:48 -0000 1.2
@@ -0,0 +1 @@
+amsn-0.96rc1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amsn/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Jun 2006 18:55:48 -0000 1.1
+++ sources 20 Jun 2006 19:00:48 -0000 1.2
@@ -0,0 +1 @@
+1b90fdbb0a51c7646f4d2e6b22f18711 amsn-0.96rc1.tar.bz2
More information about the scm-commits
mailing list