]> git.pld-linux.org Git - packages/amsn.git/blobdiff - amsn.spec
projects / packages / amsn.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- updated to 0.98.9
[packages/amsn.git] / amsn.spec
diff --git a/amsn.spec b/amsn.spec
index 55304b30ebc403304bc6f284c14f7a69238808ba..1d031ce08125c5c1f0ce2131aaf4d4a661dfddcc 100644 (file)
--- 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?
 # - use mv for language codes fix, instead handling specially in find-lang.sh, send to upstream
-# - use ca-certificatesc
 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.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
-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
@@ -41,6 +42,7 @@ Requires(post,postun):        hicolor-icon-theme
 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
@@ -53,7 +55,6 @@ Obsoletes:    amsn-plugin-chameleon
 # new deps
 Requires:      tcl-snack
 Requires:      tclsoap
-Requires:      tcltls
 Requires:      tkdnd
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -97,13 +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 plugins/music/MusicWin
-rm plugins/music/*.scpt
-rm plugins/amsnplus/snapshot
+%{__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/*
+%{__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
@@ -122,13 +123,17 @@ rm -r skins/*
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch6 -p1
+%patch4 -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
 
@@ -139,7 +144,7 @@ rm -r skins/*
 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
@@ -149,45 +154,44 @@ mv $RPM_BUILD_ROOT%{_datadir}/%{name}/amsn-remote-CLI $RPM_BUILD_ROOT%{_bindir}/
 #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}
+%{__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}
+%{__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
@@ -209,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
@@ -225,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
MSN Messenger clone for Linux
This page took 0.073177 seconds and 4 git commands to generate.