- up to 0.98.3

Changed files:
    amsn-libpng.patch -> 1.2
    amsn-no-exact-http.patch -> 1.2
    amsn-songbird-exception.patch -> 1.2
    amsn.spec -> 1.43

diff --git a/amsn-libpng.patch b/amsn-libpng.patch
deleted file mode 100644 (file)
index 0b6e2aa..0000000
--- a/amsn-libpng.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- amsn-0.98.1/utils/TkCximage/src/CxImage/ximapng.cpp        2008-03-07 20:14:37.000000000 +0100
-+++ amsn-0.98.1-dud/utils/TkCximage/src/CxImage/ximapng.cpp    2010-02-02 22:23:50.352316685 +0100
-@@ -142,9 +142,9 @@ bool CxImagePNG::Decode(CxFile *hFile)
-       if (info_ptr->num_trans!=0){ //palette transparency
-               if (info_ptr->num_trans==1){
-                       if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE){
--                              info.nBkgndIndex = info_ptr->trans_values.index;
-+                              info.nBkgndIndex = info_ptr->trans_color.index;
-                       } else{
--                              info.nBkgndIndex = info_ptr->trans_values.gray>>nshift;
-+                              info.nBkgndIndex = info_ptr->trans_color.gray>>nshift;
-                       }
-               }
-               if (info_ptr->num_trans>1){
-@@ -152,7 +152,7 @@ bool CxImagePNG::Decode(CxFile *hFile)
-                       if (pal){
-                               DWORD ip;
-                               for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
--                                      pal[ip].rgbReserved=info_ptr->trans[ip];
-+                                      pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
-                               for (ip=info_ptr->num_trans;ip<head.biClrUsed;ip++){
-                                       pal[ip].rgbReserved=255;
-                               }
-@@ -166,9 +166,9 @@ bool CxImagePNG::Decode(CxFile *hFile)
-               int num_trans;
-               png_color_16 *image_background;
-               if (png_get_tRNS(png_ptr, info_ptr, &trans, &num_trans, &image_background)){
--                      info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_values.red>>nshift);
--                      info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_values.green>>nshift);
--                      info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_values.blue>>nshift);
-+                      info.nBkgndColor.rgbRed   = (BYTE)(info_ptr->trans_color.red>>nshift);
-+                      info.nBkgndColor.rgbGreen = (BYTE)(info_ptr->trans_color.green>>nshift);
-+                      info.nBkgndColor.rgbBlue  = (BYTE)(info_ptr->trans_color.blue>>nshift);
-                       info.nBkgndColor.rgbReserved = 0;
-                       info.nBkgndIndex = 0;
-               }
-@@ -417,12 +417,12 @@ bool CxImagePNG::Encode(CxFile *hFile)
-       if (info.nBkgndIndex >= 0){
-               info_ptr->num_trans = 1;
-               info_ptr->valid |= PNG_INFO_tRNS;
--              info_ptr->trans = trans;
--              info_ptr->trans_values.index = (BYTE)info.nBkgndIndex;
--              info_ptr->trans_values.red   = tc.rgbRed;
--              info_ptr->trans_values.green = tc.rgbGreen;
--              info_ptr->trans_values.blue  = tc.rgbBlue;
--              info_ptr->trans_values.gray  = info_ptr->trans_values.index;
-+              info_ptr->trans_alpha = trans;
-+              info_ptr->trans_color.index = (BYTE)info.nBkgndIndex;
-+              info_ptr->trans_color.red   = tc.rgbRed;
-+              info_ptr->trans_color.green = tc.rgbGreen;
-+              info_ptr->trans_color.blue  = tc.rgbBlue;
-+              info_ptr->trans_color.gray  = info_ptr->trans_color.index;
- 
-               // the transparency indexes start from 0 for non grayscale palette
-               if (!bGrayScale && head.biClrUsed && info.nBkgndIndex)
-@@ -443,7 +443,7 @@ bool CxImagePNG::Encode(CxFile *hFile)
-                               trans[ip]=GetPaletteColor((BYTE)ip).rgbReserved;
-                       info_ptr->num_trans = (WORD)nc;
-                       info_ptr->valid |= PNG_INFO_tRNS;
--                      info_ptr->trans = trans;
-+                      info_ptr->trans_alpha = trans;
-               }
- 
-               // copy the palette colors

diff --git a/amsn-no-exact-http.patch b/amsn-no-exact-http.patch
deleted file mode 100644 (file)
index 8f996d4..0000000
--- a/amsn-no-exact-http.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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$}
- 
- 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

diff --git a/amsn-songbird-exception.patch b/amsn-songbird-exception.patch
deleted file mode 100644 (file)
index 4db4100..0000000
--- a/amsn-songbird-exception.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- amsn/plugins/music/infosongbird    (revision 11807)
-+++ amsn/plugins/music/infosongbird    (working copy)
-@@ -1,7 +1,10 @@
- #!/usr/bin/env python
--import dbus
--bus = dbus.SessionBus()
--object = bus.get_object('org.mozilla.songbird', '/org/mozilla/songbird')
--print object.getStatus()
--print object.getTitle()
--print object.getArtist()
-+try:
-+      import dbus
-+      bus = dbus.SessionBus()
-+      object = bus.get_object('org.mozilla.songbird', '/org/mozilla/songbird')
-+      print object.getStatus()
-+      print object.getTitle()
-+      print object.getArtist()
-+except dbus.exceptions.DBusException:
-+      print "not installed"

diff --git a/amsn.spec b/amsn.spec
index b14309f7bee51cdecea77b024e3dc06d43acce8c..9cf00ecbe52477b462c33d22715356dd391244de 100644 (file)
--- a/amsn.spec
+++ b/amsn.spec
@@ -1,24 +1,21 @@
 # TODO
 # - Requires: /bin/bash /bin/sh /usr/bin/env /usr/bin/perl  ... etc in music plugin, subpackage it?
-# - mv languages instead handling specially in find-lang.sh, send to upstream
+# - use mv for language codes fix, instead handling specially in find-lang.sh, send to upstream
 Summary:       MSN Messenger clone for Linux
 Summary(de.UTF-8):     MSN Messenger-Klon für Linux
 Summary(fr.UTF-8):     Clône MSN Messenger pour Linux
 Summary(pl.UTF-8):     Klon MSN Messengera dla Linuksa
 Name:          amsn
-Version:       0.98.1
-Release:       4
+Version:       0.98.3
+Release:       0.1
 License:       GPL
 Group:         Applications/Communications
-Source0:       http://downloads.sourceforge.net/amsn/%{name}-%{version}.tar.gz
-# Source0-md5: 8c608673a4e920b83cc9f41c2cb837dc
+Source0:       http://downloads.sourceforge.net/project/amsn/amsn/%{version}/%{name}-%{version}-src.tar.gz
+# Source0-md5: 4f6e75e422694d2adce68b773b459223
 Source1:       find-lang.sh
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-paths.patch
-Patch2:                %{name}-libpng.patch
 Patch3:                %{name}-bwidget.patch
-Patch4:                %{name}-no-exact-http.patch
-Patch5:                %{name}-songbird-exception.patch
 Patch6:                %{name}-disable-autoupdate.patch
 URL:           http://www.amsn-project.net/
 BuildRequires: farsight2-devel
@@ -99,6 +96,7 @@ find -name '*.tcl' -print0 | xargs -0 sed -i -e 's,\r$,,'
 rm -r utils/BWidget-1.9.0
 rm -r plugins/music/MusicWin
 rm plugins/music/*.scpt
+rm plugins/amsnplus/snapshot
 
 # skins in amsn-skins.spec
 rm -r skins/*
@@ -118,10 +116,7 @@ rm -r skins/*
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 %patch6 -p1
 
 %build
@@ -132,6 +127,9 @@ rm -r skins/*
 %{__make} \
        verbose=yes
 
+# build with our flags
+#%{__cc} plugins/amsnplus/snapshot.c -o plugins/amsnplus/snapshot %{rpmcflags} %{rpmldflags} `imlib-config --cflags` `imlib-config --libs`
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_iconsdir}/hicolor,%{_pixmapsdir},%{_desktopdir}}
@@ -143,6 +141,9 @@ 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
 
+#install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/amsnplus
+#mv $RPM_BUILD_ROOT{%{_datadir},%{_libdir}}/%{name}/plugins/amsnplus/snapshot
+
 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
@@ -170,6 +171,12 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/desktop-icons/* $RPM_BUILD_ROOT%{_iconsdir
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/desktop-icons
 rm $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/amsnplus/{snapshot.c,Makefile}
+
+#%{_datadir}/%{name}/plugins/growl/styles/aMSN.growlStyle/Contents/Resources/default.css
+#%{_datadir}/%{name}/plugins/growl/styles/aMSNMac.growlStyle/Contents/Info.plist
+#%{_datadir}/%{name}/plugins/address_book/utils/addressbook/pkgIndex.tcl
+
 # docs in docs
 rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/*/test.tcl
 
@@ -217,19 +224,43 @@ rm -rf $RPM_BUILD_ROOT
 
 %files plugins -f %{name}-plugins.lang
 %defattr(644,root,root,755)
+%{_datadir}/%{name}/plugins/DBusStateChanger
+%{_datadir}/%{name}/plugins/DualDisplayPicture
+%{_datadir}/%{name}/plugins/LilyPondIM
+%{_datadir}/%{name}/plugins/Restore
+%{_datadir}/%{name}/plugins/SkinColor
+%{_datadir}/%{name}/plugins/TeXIM
+%{_datadir}/%{name}/plugins/Translate
+%{_datadir}/%{name}/plugins/advancedconfigviewer
+%{_datadir}/%{name}/plugins/camserv
+%{_datadir}/%{name}/plugins/changeit
+%{_datadir}/%{name}/plugins/dbusviewer
+%{_datadir}/%{name}/plugins/desktop_integration
+%{_datadir}/%{name}/plugins/devel
+%{_datadir}/%{name}/plugins/emotes
+%{_datadir}/%{name}/plugins/gename
+%{_datadir}/%{name}/plugins/keepalive
+%{_datadir}/%{name}/plugins/movewin
+%{_datadir}/%{name}/plugins/notify
+%{_datadir}/%{name}/plugins/organize_received
+%{_datadir}/%{name}/plugins/sayit
+%{_datadir}/%{name}/plugins/userstatus
+%{_datadir}/%{name}/plugins/whatis
+
+# need to list resources manually due autogenerated lang resources
 %dir %{_datadir}/%{name}/plugins/ColoredNicks
 %{_datadir}/%{name}/plugins/ColoredNicks/*.tcl
 %{_datadir}/%{name}/plugins/ColoredNicks/*.xml
 
 %dir %{_datadir}/%{name}/plugins/MSNGameTTT
+%{_datadir}/%{name}/plugins/MSNGameTTT/pixmaps
 %{_datadir}/%{name}/plugins/MSNGameTTT/*.tcl
 %{_datadir}/%{name}/plugins/MSNGameTTT/*.xml
-%{_datadir}/%{name}/plugins/MSNGameTTT/pixmaps
 
 %dir %{_datadir}/%{name}/plugins/SearchContact
+%{_datadir}/%{name}/plugins/SearchContact/pixmaps
 %{_datadir}/%{name}/plugins/SearchContact/*.tcl
 %{_datadir}/%{name}/plugins/SearchContact/*.xml
-%{_datadir}/%{name}/plugins/SearchContact/pixmaps
 
 %dir %{_datadir}/%{name}/plugins/WebcamShooter
 %{_datadir}/%{name}/plugins/WebcamShooter/*.tcl
@@ -245,24 +276,129 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/plugins/Nudge/*.wav
 
 %dir %{_datadir}/%{name}/plugins/inkdraw
+%{_datadir}/%{name}/plugins/inkdraw/pixmaps
 %{_datadir}/%{name}/plugins/inkdraw/*.tcl
 %{_datadir}/%{name}/plugins/inkdraw/*.xml
-%{_datadir}/%{name}/plugins/inkdraw/pixmaps
 %{_datadir}/%{name}/plugins/inkdraw/pencils
 
 %dir %{_datadir}/%{name}/plugins/music
+%{_datadir}/%{name}/plugins/music/pixmaps
 %{_datadir}/%{name}/plugins/music/*.tcl
 %{_datadir}/%{name}/plugins/music/*.xml
 %{_datadir}/%{name}/plugins/music/*.txt
 %{_datadir}/%{name}/plugins/music/info*
-%{_datadir}/%{name}/plugins/music/pixmaps
 
 %dir %{_datadir}/%{name}/plugins/remind
 %{_datadir}/%{name}/plugins/remind/*.tcl
 %{_datadir}/%{name}/plugins/remind/*.xml
 
 %dir %{_datadir}/%{name}/plugins/winks
+%{_datadir}/%{name}/plugins/winks/pixmaps
 %{_datadir}/%{name}/plugins/winks/*.tcl
 %{_datadir}/%{name}/plugins/winks/*.xml
 %{_datadir}/%{name}/plugins/winks/*.txt
-%{_datadir}/%{name}/plugins/winks/pixmaps
+
+%dir %{_datadir}/%{name}/plugins/FPSstats
+%{_datadir}/%{name}/plugins/FPSstats/README
+%{_datadir}/%{name}/plugins/FPSstats/pixmaps
+%{_datadir}/%{name}/plugins/FPSstats/*.tcl
+%{_datadir}/%{name}/plugins/FPSstats/*.xml
+
+%dir %{_datadir}/%{name}/plugins/Invisibility
+%{_datadir}/%{name}/plugins/Invisibility/Changelog
+%{_datadir}/%{name}/plugins/Invisibility/*.tcl
+%{_datadir}/%{name}/plugins/Invisibility/*.xml
+
+%dir %{_datadir}/%{name}/plugins/Kryptonite
+%{_datadir}/%{name}/plugins/Kryptonite/pixmaps
+%{_datadir}/%{name}/plugins/Kryptonite/*.tcl
+%{_datadir}/%{name}/plugins/Kryptonite/*.xml
+
+%dir %{_datadir}/%{name}/plugins/SendRecents
+%{_datadir}/%{name}/plugins/SendRecents/*.tcl
+%{_datadir}/%{name}/plugins/SendRecents/*.xml
+
+%dir %{_datadir}/%{name}/plugins/SpellCheck
+%{_datadir}/%{name}/plugins/SpellCheck/Changelog.txt
+%{_datadir}/%{name}/plugins/SpellCheck/ReadMe.txt
+%{_datadir}/%{name}/plugins/SpellCheck/pixmaps
+%{_datadir}/%{name}/plugins/SpellCheck/*.tcl
+%{_datadir}/%{name}/plugins/SpellCheck/*.xml
+
+%dir %{_datadir}/%{name}/plugins/actionsmenu
+%{_datadir}/%{name}/plugins/actionsmenu/pixmaps
+%{_datadir}/%{name}/plugins/actionsmenu/*.tcl
+%{_datadir}/%{name}/plugins/actionsmenu/*.xml
+
+%dir %{_datadir}/%{name}/plugins/address_book
+%{_datadir}/%{name}/plugins/address_book/utils
+%{_datadir}/%{name}/plugins/address_book/*.tcl
+%{_datadir}/%{name}/plugins/address_book/*.xml
+
+%dir %{_datadir}/%{name}/plugins/amsnplus
+%{_datadir}/%{name}/plugins/amsnplus/readme
+%{_datadir}/%{name}/plugins/amsnplus/pixmaps
+%{_datadir}/%{name}/plugins/amsnplus/*.tcl
+%{_datadir}/%{name}/plugins/amsnplus/*.xml
+
+%dir %{_datadir}/%{name}/plugins/bugbuddy
+%{_datadir}/%{name}/plugins/bugbuddy/CREDITS
+%{_datadir}/%{name}/plugins/bugbuddy/*.tcl
+%{_datadir}/%{name}/plugins/bugbuddy/*.xml
+
+%dir %{_datadir}/%{name}/plugins/chameleon
+%{_datadir}/%{name}/plugins/chameleon/*.tcl
+%{_datadir}/%{name}/plugins/chameleon/*.xml
+
+%dir %{_datadir}/%{name}/plugins/colorize
+%{_datadir}/%{name}/plugins/colorize/*.tcl
+%{_datadir}/%{name}/plugins/colorize/*.xml
+
+%dir %{_datadir}/%{name}/plugins/countdown
+%{_datadir}/%{name}/plugins/countdown/*.tcl
+%{_datadir}/%{name}/plugins/countdown/*.xml
+
+%dir %{_datadir}/%{name}/plugins/emoticons_importer
+%{_datadir}/%{name}/plugins/emoticons_importer/*.tcl
+%{_datadir}/%{name}/plugins/emoticons_importer/*.xml
+
+%dir %{_datadir}/%{name}/plugins/games
+%{_datadir}/%{name}/plugins/games/images
+%{_datadir}/%{name}/plugins/games/*.tcl
+%{_datadir}/%{name}/plugins/games/*.xml
+%{_datadir}/%{name}/plugins/games/changelog
+%{_datadir}/%{name}/plugins/games/developers.readme
+%{_datadir}/%{name}/plugins/games/readme
+
+%dir %{_datadir}/%{name}/plugins/glogs
+%{_datadir}/%{name}/plugins/glogs/*.tcl
+%{_datadir}/%{name}/plugins/glogs/*.xml
+
+%dir %{_datadir}/%{name}/plugins/gnotify
+%{_datadir}/%{name}/plugins/gnotify/pixmaps
+%{_datadir}/%{name}/plugins/gnotify/*.tcl
+%{_datadir}/%{name}/plugins/gnotify/*.xml
+
+%dir %{_datadir}/%{name}/plugins/growl
+%{_datadir}/%{name}/plugins/growl/styles
+%{_datadir}/%{name}/plugins/growl/*.tcl
+%{_datadir}/%{name}/plugins/growl/*.xml
+%{_datadir}/%{name}/plugins/growl/*.png
+
+%dir %{_datadir}/%{name}/plugins/jake
+%{_datadir}/%{name}/plugins/jake/README
+%{_datadir}/%{name}/plugins/jake/*.tcl
+%{_datadir}/%{name}/plugins/jake/*.xml
+
+%dir %{_datadir}/%{name}/plugins/openwith
+%{_datadir}/%{name}/plugins/openwith/*.tcl
+%{_datadir}/%{name}/plugins/openwith/*.xml
+
+%dir %{_datadir}/%{name}/plugins/pop3
+%{_datadir}/%{name}/plugins/pop3/pixmaps
+%{_datadir}/%{name}/plugins/pop3/*.tcl
+%{_datadir}/%{name}/plugins/pop3/*.xml
+
+%dir %{_datadir}/%{name}/plugins/transparent
+%{_datadir}/%{name}/plugins/transparent/*.tcl
+%{_datadir}/%{name}/plugins/transparent/*.xml