X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=amsn.spec;h=1d031ce08125c5c1f0ce2131aaf4d4a661dfddcc;hb=HEAD;hp=bacff0cfff0eacfad9787326b2b5a44931127adf;hpb=d3f6ff895d60ac4844f7bfd0224f13a7b02c7239;p=packages%2Famsn.git

diff --git a/amsn.spec b/amsn.spec
index bacff0c..1d031ce 100644
--- a/amsn.spec
+++ b/amsn.spec
@@ -1,26 +1,27 @@
 # 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:	2.6
+Version:	0.98.9
+Release:	1
 License:	GPL
 Group:		Applications/Communications
-Source0:	http://downloads.sourceforge.net/amsn/%{name}-%{version}.tar.gz
-# Source0-md5:	8c608673a4e920b83cc9f41c2cb837dc
+Source0:	http://downloads.sourceforge.net/amsn/%{name}-%{version}-src.tar.gz
+# Source0-md5:	b98f7a26df34a79b8bfade1ff2ccc88a
 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
+Patch2:		%{name}-bwidget.patch
+Patch3:		ca-certificates.patch
+Patch4:		%{name}-disable-autoupdate.patch
 URL:		http://www.amsn-project.net/
-BuildRequires:	farsight2-devel
+BuildRequires:	autoconf
+BuildRequires:	farstream-devel
+BuildRequires:	gupnp-devel
 BuildRequires:	gupnp-igd-devel
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel >= 2:1.4
@@ -35,9 +36,13 @@ BuildRequires:	tk-devel >= 8.4
 BuildRequires:	which
 BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libSM-devel
+Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	hicolor-icon-theme
+# default skin is always needed, as it contains images if extra skin misses something
+Requires:	%{name}-skin-default
 # IM's convert is needed to display pictures (buddy icons).
 Requires:	ImageMagick
+Requires:	ca-certificates-update
 Requires:	tcl >= 8.5.7
 # MSN Protocol 9 won't let you in without SSL anymore.
 Requires:	tcl-tls
@@ -45,11 +50,11 @@ Requires:	tcllib
 Requires:	tk >= 8.4
 Requires:	tk-BWidget >= 1.8.0-2
 Requires:	xdg-utils
+Obsoletes:	amsn-plugin-chameleon
 %if 0
 # new deps
 Requires:	tcl-snack
 Requires:	tclsoap
-Requires:	tcltls
 Requires:	tkdnd
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -93,11 +98,13 @@ snapshots with your webcam to use as your display picture.
 # undos some source files
 find -name '*.tcl' -print0 | xargs -0 sed -i -e 's,\r$,,'
 
-rm -r utils/BWidget-1.9.0
-rm -r skins/default/winicons
-rm -r skins/"Dark Matter 4.0"/winicons
-rm -r plugins/music/MusicWin
-rm plugins/music/*.scpt
+%{__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/*
 
 # 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
@@ -117,60 +124,74 @@ rm plugins/music/*.scpt
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
 # NOTE: enable debug allows us to keep debug symbols in -debuginfo package
 %configure \
 	--enable-debug \
 	CFLAGS="%{rpmcflags}"
+
 %{__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}}
 
-%{__make} install \
+%{__make} -j1 install \
 	DESTDIR=$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 -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}/{CREDITS,HELP,README}
-rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/lang/{*.*,LANG-HOWTO,sortlang}
+#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
+%{__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}/{CREDITS,HELP,README}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/lang/{*.*,LANG-HOWTO,sortlang}
 
 install -d $RPM_BUILD_ROOT%{tcl_sitearch}
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/linux/* $RPM_BUILD_ROOT%{tcl_sitearch}
-rmdir $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/linux
-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}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/utils/linux/* $RPM_BUILD_ROOT%{tcl_sitearch}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/utils/TkCximage $RPM_BUILD_ROOT%{tcl_sitearch}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/utils/webcamsn $RPM_BUILD_ROOT%{tcl_sitearch}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/utils/tcl_siren $RPM_BUILD_ROOT%{tcl_sitearch}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/utils/tclISF $RPM_BUILD_ROOT%{tcl_sitearch}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/utils/gupnp $RPM_BUILD_ROOT%{tcl_sitearch}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/utils/farsight $RPM_BUILD_ROOT%{tcl_sitearch}
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}/utils/asyncresolver $RPM_BUILD_ROOT%{tcl_sitearch}
 
 mv $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_desktopdir}}/%{name}.desktop
 mv $RPM_BUILD_ROOT%{_datadir}/%{name}/desktop-icons/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor
-rm -r $RPM_BUILD_ROOT%{_datadir}/%{name}/desktop-icons
-rm $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
+%{__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
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/utils/*/test.tcl
 
 %find_lang %{name}
 
-grep /plugins/ %{name}.lang > %{name}-plugins.lang
+%{__grep} /plugins/ %{name}.lang > %{name}-plugins.lang
 sed -i -e '/plugins/d' %{name}.lang
 
 %clean
@@ -192,12 +213,13 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.tcl
 %{_datadir}/%{name}/hotmlog.htm
+%{_datadir}/%{name}/msnp2p
 
 # langlist explains the language codes used
 %{_datadir}/%{name}/langlist
 
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/skins
+%dir %{_datadir}/%{name}/skins
 %{_datadir}/%{name}/utils
 
 %{_iconsdir}/hicolor/*/apps/*.png
@@ -208,23 +230,49 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{tcl_sitearch}/*/*.so
 %dir %{tcl_sitearch}/capture/libng
 %dir %{tcl_sitearch}/capture/libng/plugins
+%attr(755,root,root) %{tcl_sitearch}/capture/libng/*.so
 %attr(755,root,root) %{tcl_sitearch}/capture/libng/plugins/*.so
 
 %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
+%{_datadir}/%{name}/plugins/ebuddykiller
+
+# 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
@@ -240,24 +288,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