rpms/ayttm/devel ayttm-msn-load.patch, NONE, 1.1 ayttm-rename-ayttm_streamer_wrapper.patch, NONE, 1.1 ayttm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Sun Oct 11 07:25:34 UTC 2009

Author: mintojoseph

Update of /cvs/pkgs/rpms/ayttm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31718/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ayttm-msn-load.patch ayttm-rename-ayttm_streamer_wrapper.patch 
	ayttm.spec import.log 
Log Message:

 Modified Files:
	devel/.cvsignore devel/sources 
 Added Files:
 	devel/ayttm-msn-load.patch 
	devel/ayttm-rename-ayttm_streamer_wrapper.patch 
	devel/ayttm.spec devel/import.log 
----------------------------------------------------------------------
initial package


ayttm-msn-load.patch:
 msn.c |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE ayttm-msn-load.patch ---
--- modules/msn2/msn.c	2009/09/06 18:23:08	1.13
+++ modules/msn2/msn.c	2009/09/14 10:40:36	1.14
@@ -79,11 +79,13 @@
  *			     Begin Module Code
  ************************************************************************************/
 /*  Module defines */
-#define plugin_info msn2_LTX_plugin_info
-#define SERVICE_INFO msn2_LTX_SERVICE_INFO
-#define plugin_init msn2_LTX_plugin_init
-#define plugin_finish msn2_LTX_plugin_finish
-#define module_version msn2_LTX_module_version
+#ifndef USE_POSIX_DLOPEN
+	#define plugin_info msn2_LTX_plugin_info
+	#define SERVICE_INFO msn2_LTX_SERVICE_INFO
+	#define plugin_init msn2_LTX_plugin_init
+	#define plugin_finish msn2_LTX_plugin_finish
+	#define module_version msn2_LTX_module_version
+#endif
 
 
 typedef struct _ay_msn_local_account
@@ -142,8 +144,8 @@
 	PLUGIN_SERVICE,
 	"MSN",
 	"Provides MSN Messenger support",
-	"$Revision: 1.13 $",
-	"$Date: 2009/09/06 18:23:08 $",
+	"$Revision: 1.14 $",
+	"$Date: 2009/09/14 10:40:36 $",
 	&ref_count,
 	plugin_init,
 	plugin_finish,

ayttm-rename-ayttm_streamer_wrapper.patch:
 ayttm.spec                                     |    2 
 ayttm.spec.in                                  |    2 
 modules/image_filter/Makefile.am               |    2 
 modules/image_filter/Makefile.in               |    2 
 modules/image_filter/ayttm_streamer_wrapper    |   55 +++++++++++++++++++++++++
 modules/image_filter/ayttm_streamer_wrapper.sh |   55 -------------------------
 modules/image_filter/video_capture.c           |    2 
 7 files changed, 60 insertions(+), 60 deletions(-)

--- NEW FILE ayttm-rename-ayttm_streamer_wrapper.patch ---
diff -pruN ayttm-0.6.0-orig/ayttm.spec ayttm-0.6.0-fix/ayttm.spec
--- ayttm-0.6.0-orig/ayttm.spec	2009-09-11 09:21:01.000000000 +0530
+++ ayttm-0.6.0-fix/ayttm.spec	2009-09-16 14:11:36.274638531 +0530
@@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 # the config file
 %config(noreplace) /etc/ayttmrc
 # Lastly, the binary itself
-%{_bindir}/ayttm_streamer_wrapper.sh
+%{_bindir}/ayttm_streamer_wrapper
 %{_bindir}/ayttm
 %exclude %{_libdir}/ayttm/*.a
 
diff -pruN ayttm-0.6.0-orig/ayttm.spec.in ayttm-0.6.0-fix/ayttm.spec.in
--- ayttm-0.6.0-orig/ayttm.spec.in	2009-05-22 15:12:55.000000000 +0530
+++ ayttm-0.6.0-fix/ayttm.spec.in	2009-09-16 14:11:20.149638832 +0530
@@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 # the config file
 %config(noreplace) /etc/ayttmrc
 # Lastly, the binary itself
-%{_bindir}/ayttm_streamer_wrapper.sh
+%{_bindir}/ayttm_streamer_wrapper
 %{_bindir}/@PACKAGE@
 %exclude %{_libdir}/@PACKAGE@/*.a
 
diff -pruN ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper
--- ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper	1970-01-01 05:30:00.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper	2004-01-20 10:07:29.000000000 +0530
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+make_rcfile()
+{
+	file=$1
+	outdir=$2/webcam
+	[ ! -e $outdir ] && mkdir $outdir
+	cat >$file <<EOF
+[ftp]
+dir  = $outdir
+file = webcam.jpeg
+tmp  = uploading.jpeg
+local = 1
+
+[grab]
+device = /dev/video0
+text = "webcam %Y-%m-%d %H:%M:%S"
+width = 320
+height = 240
+delay = 3
+quality = 75
+EOF
+
+}
+
+RCFILE=~/.webcamrc
+[ "$1" = "-d" ] && AYTTM_DIR=$2 || AYTTM_DIR=~/.ayttm
+
+[ ! -e $RCFILE ] && make_rcfile $RCFILE $AYTTM_DIR
+
+if ! ps -u $UID | grep -q webcam >/dev/null; then
+	/usr/bin/webcam &>/dev/null &
+fi
+ps -u $UID | grep -q webcam >/dev/null || exit -1
+
+IMGDIR=$( sed -ne "/.*\<dir *= */{s///;p
+}" $RCFILE )
+if ! echo $IMGDIR | sed -e 's,^~/,,' | grep -q "^/" >/dev/null; then
+	IMGDIR=$HOME/$IMGDIR
+fi
+IMGFILE=$( sed -ne "/.*\<file *= */{s///;p
+}" $RCFILE )
+
+cat $IMGDIR/$IMGFILE || exit -1
+
+exit 0
+
+#LOCK=$AYTTM_DIR/webcam_grab.lock
+#[ -e $LOCK ] && exit 0
+#touch $LOCK
+
+#/usr/bin/streamer -q -f jpeg -o /dev/stdout OUTFILE 2>/dev/null
+#rm -f $LOCK
+
+#exit 0
diff -pruN ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper.sh ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper.sh
--- ayttm-0.6.0-orig/modules/image_filter/ayttm_streamer_wrapper.sh	2004-01-20 10:07:29.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/ayttm_streamer_wrapper.sh	1970-01-01 05:30:00.000000000 +0530
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-make_rcfile()
-{
-	file=$1
-	outdir=$2/webcam
-	[ ! -e $outdir ] && mkdir $outdir
-	cat >$file <<EOF
-[ftp]
-dir  = $outdir
-file = webcam.jpeg
-tmp  = uploading.jpeg
-local = 1
-
-[grab]
-device = /dev/video0
-text = "webcam %Y-%m-%d %H:%M:%S"
-width = 320
-height = 240
-delay = 3
-quality = 75
-EOF
-
-}
-
-RCFILE=~/.webcamrc
-[ "$1" = "-d" ] && AYTTM_DIR=$2 || AYTTM_DIR=~/.ayttm
-
-[ ! -e $RCFILE ] && make_rcfile $RCFILE $AYTTM_DIR
-
-if ! ps -u $UID | grep -q webcam >/dev/null; then
-	/usr/bin/webcam &>/dev/null &
-fi
-ps -u $UID | grep -q webcam >/dev/null || exit -1
-
-IMGDIR=$( sed -ne "/.*\<dir *= */{s///;p
-}" $RCFILE )
-if ! echo $IMGDIR | sed -e 's,^~/,,' | grep -q "^/" >/dev/null; then
-	IMGDIR=$HOME/$IMGDIR
-fi
-IMGFILE=$( sed -ne "/.*\<file *= */{s///;p
-}" $RCFILE )
-
-cat $IMGDIR/$IMGFILE || exit -1
-
-exit 0
-
-#LOCK=$AYTTM_DIR/webcam_grab.lock
-#[ -e $LOCK ] && exit 0
-#touch $LOCK
-
-#/usr/bin/streamer -q -f jpeg -o /dev/stdout OUTFILE 2>/dev/null
-#rm -f $LOCK
-
-#exit 0
diff -pruN ayttm-0.6.0-orig/modules/image_filter/Makefile.am ayttm-0.6.0-fix/modules/image_filter/Makefile.am
--- ayttm-0.6.0-orig/modules/image_filter/Makefile.am	2007-08-04 02:08:38.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/Makefile.am	2009-09-16 14:10:07.300638690 +0530
@@ -11,7 +11,7 @@ else
 JASPER_BUILD =
 endif
 
-bin_SCRIPTS = ayttm_streamer_wrapper.sh
+bin_SCRIPTS = ayttm_streamer_wrapper
 pkglib_LTLIBRARIES = video_capture.la $(JASPER_BUILD)
 
 img2jpc_la_SOURCES = img2jpc.c 
diff -pruN ayttm-0.6.0-orig/modules/image_filter/Makefile.in ayttm-0.6.0-fix/modules/image_filter/Makefile.in
--- ayttm-0.6.0-orig/modules/image_filter/Makefile.in	2009-09-11 09:20:20.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/Makefile.in	2009-09-16 14:10:34.031388774 +0530
@@ -287,7 +287,7 @@ AM_CFLAGS = $(GLIB_CFLAGS) $(JASPER_CFLA
 @MINGW32_TRUE at WIN32_LIBADD = -L../../src -layttm -lintl -lglib-2.0
 @BUILD_JASPER_FILTER_FALSE at JASPER_BUILD = 
 @BUILD_JASPER_FILTER_TRUE at JASPER_BUILD = img2jpc.la
-bin_SCRIPTS = ayttm_streamer_wrapper.sh
+bin_SCRIPTS = ayttm_streamer_wrapper
 pkglib_LTLIBRARIES = video_capture.la $(JASPER_BUILD)
 img2jpc_la_SOURCES = img2jpc.c 
 img2jpc_la_LDFLAGS = -module -avoid-version $(WIN32_LDFLAGS)
diff -pruN ayttm-0.6.0-orig/modules/image_filter/video_capture.c ayttm-0.6.0-fix/modules/image_filter/video_capture.c
--- ayttm-0.6.0-orig/modules/image_filter/video_capture.c	2009-07-27 22:12:03.000000000 +0530
+++ ayttm-0.6.0-fix/modules/image_filter/video_capture.c	2009-09-16 14:11:01.998637986 +0530
@@ -43,7 +43,7 @@
 static int plugin_init();
 static int plugin_finish();
 
-static char frame_grabber[MAX_PREF_LEN]= AYTTM_BIN_DIR "/ayttm_streamer_wrapper.sh -d %d";
+static char frame_grabber[MAX_PREF_LEN]= AYTTM_BIN_DIR "/ayttm_streamer_wrapper -d %d";
 
 /*  Module Exports */
 PLUGIN_INFO plugin_info = {


--- NEW FILE ayttm.spec ---
Summary: Universal Instant Messaging Client
Name: ayttm
Version: 0.6.0
Release: 1%{?dist}
Group: Applications/Internet
License: GPLv2+ and LGPLv2+
URL: http://ayttm.sourceforge.net/
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2

# Fix for msn2.so loading issue
# https://sourceforge.net/tracker/?func=detail&atid=550744&aid=2858501&group_id=77614
Patch0: ayttm-msn-load.patch

# Renamed ayttm_streamer_wrapper.sh to ayttm_streamer_wrapper.
# https://sourceforge.net/tracker/?func=detail&aid=2859843&group_id=77614&atid=550746
Patch1: ayttm-rename-ayttm_streamer_wrapper.patch 

BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: flex
BuildRequires: bison
BuildRequires: libtool-ltdl-devel
BuildRequires: libXpm-devel
BuildRequires: openssl-devel
BuildRequires: jasper-devel
BuildRequires: esound-devel
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
BuildRequires: gettext
BuildRequires: aspell-devel
BuildRequires: libtool-ltdl

Requires: xawtv
Requires: aspell

%description
Ayttm is designed to become a Universal Instant Messaging client, seamlessly
integrating all existing Instant Messaging clients and providing a single
consistant user interface. Currently, Ayttm supports sending and receiving
messages through AOL, ICQ, Yahoo, MSN, IRC and Jabber.

%prep

%setup -q -n %{name}-%{version}
%patch0 -p0
%patch1 -p1

tr -d '\r' < AUTHORS > AUTHORS.new
iconv -f ISO-8859-2 -t UTF-8 AUTHORS.new > AUTHORS


%build
%configure --enable-smtp --enable-jasper-filter --enable-posix-dlopen --sysconfdir=/etc 
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%find_lang %{name}


desktop-file-install                                    \
--delete-original                                       \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications              \
$RPM_BUILD_ROOT/%{_datadir}/applnk/Internet/%{name}.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING AUTHORS README ChangeLog
%doc %{_mandir}/man*/*
%{_datadir}/pixmaps/*.png
%{_datadir}/ayttm/sounds/*
%{_datadir}/ayttm/smileys/*
%{_datadir}/gnome/apps/Internet/ayttm.desktop
%{_datadir}/applications/ayttm.desktop
%{_libdir}/ayttm/*.so 
%config(noreplace) %{_sysconfdir}/ayttmrc
%{_bindir}/ayttm_streamer_wrapper
%{_bindir}/ayttm
%exclude %{_libdir}/ayttm/*.a
%exclude %{_libdir}/ayttm/*.la

%changelog

* Tue Sep 16 2009 Minto Joseph <mvaliyav at redhat.com> 0.6.0-1
- Rebased to new upstream release
- Cleaned up spec file
- Added patch for msn2.so loading issue 
- Added patch for renaming ayttm_streamer_wrapper

* Tue Jul 28 2009 Minto Joseph <mvaliyav at redhat.com> 0.5.0-1.111
- Rebased to new upstream release

* Fri Jun 26 2009 Parag <panemade at gmail.com > 0.5.0-2
- Use correct way to install translations and rpm macros 
- Correct BuildRequires and follow post release naming

* Mon Jun 10 2009 Minto Joseph <mvaliyav at redhat.com> - 0.5.0-1
- Cleaned up spec file
- Included ifnarch for ppc64 to fix build issue with brp-compress 
- Removed the option for stripping of debug information

* Mon Jun 01 2009 Minto Joseph <mvaliyav at redhat.com> - 0.5.0-0
- initial package




--- NEW FILE import.log ---
ayttm-0_6_0-1_fc11:HEAD:ayttm-0.6.0-1.fc11.src.rpm:1255245454


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ayttm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	9 Oct 2009 02:55:55 -0000	1.1
+++ .cvsignore	11 Oct 2009 07:25:30 -0000	1.2
@@ -0,0 +1 @@
+ayttm-0.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ayttm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	9 Oct 2009 02:55:55 -0000	1.1
+++ sources	11 Oct 2009 07:25:31 -0000	1.2
@@ -0,0 +1 @@
+729597a2a827d8b46173d7e462cfb7a9  ayttm-0.6.0.tar.bz2


