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

diff --git a/amsn.spec b/amsn.spec
index 3ae169c..1d031ce 100644
--- a/amsn.spec
+++ b/amsn.spec
@@ -6,21 +6,22 @@ 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.4
+Version:	0.98.9
 Release:	1
 License:	GPL
 Group:		Applications/Communications
-Source0:	http://downloads.sourceforge.net/project/amsn/amsn/%{version}/%{name}-%{version}-src.tar.gz
-# Source0-md5:	3cf69c4a7773888cea854927c83b9cfb
+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:		useV4L2.patch
-Patch3:		%{name}-bwidget.patch
-Patch4:		ca-certificates.patch
-Patch6:		%{name}-disable-autoupdate.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
@@ -123,13 +124,16 @@ find -name '*.tcl' -print0 | xargs -0 sed -i -e 's,\r$,,'
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch6 -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
 
@@ -137,10 +141,10 @@ find -name '*.tcl' -print0 | xargs -0 sed -i -e 's,\r$,,'
 #%{__cc} plugins/amsnplus/snapshot.c -o plugins/amsnplus/snapshot %{rpmcflags} %{rpmldflags} `imlib-config --cflags` `imlib-config --libs`
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
+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
@@ -162,15 +166,14 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/amsn-remote-CLI $RPM_BUILD_ROOT%{_bindir}/
 %{__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
@@ -210,6 +213,7 @@ 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
@@ -226,6 +230,7 @@ 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