- disable autoupdate patch from debian

[packages/amsn.git] / amsn.spec

diff --git a/amsn.spec b/amsn.spec
index 6fe5400f203e11e1d5afc4d0a1a4922de2923a45..b14309f7bee51cdecea77b024e3dc06d43acce8c 100644 (file)
--- a/amsn.spec
+++ b/amsn.spec
@@ -7,7 +7,7 @@ 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
+Release:       4
 License:       GPL
 Group:         Applications/Communications
 Source0:       http://downloads.sourceforge.net/amsn/%{name}-%{version}.tar.gz
@@ -19,6 +19,7 @@ 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
 BuildRequires: gupnp-igd-devel
@@ -36,6 +37,8 @@ BuildRequires:        which
 BuildRequires: xorg-lib-libICE-devel
 BuildRequires: xorg-lib-libSM-devel
 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:      tcl >= 8.5.7
@@ -45,6 +48,13 @@ Requires:    tcllib
 Requires:      tk >= 8.4
 Requires:      tk-BWidget >= 1.8.0-2
 Requires:      xdg-utils
+%if 0
+# new deps
+Requires:      tcl-snack
+Requires:      tclsoap
+Requires:      tcltls
+Requires:      tkdnd
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                find_lang       %{SOURCE1} %{buildroot}
@@ -87,9 +97,11 @@ snapshots with your webcam to use as your display picture.
 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
+
+# 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
@@ -110,6 +122,7 @@ rm -r plugins/music/MusicWin
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 # NOTE: enable debug allows us to keep debug symbols in -debuginfo package
@@ -143,6 +156,7 @@ 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}
@@ -188,7 +202,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/langlist
 
 %dir %{_datadir}/%{name}/plugins
-%{_datadir}/%{name}/skins
+%dir %{_datadir}/%{name}/skins
 %{_datadir}/%{name}/utils
 
 %{_iconsdir}/hicolor/*/apps/*.png
@@ -241,7 +255,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/plugins/music/*.xml
 %{_datadir}/%{name}/plugins/music/*.txt
 %{_datadir}/%{name}/plugins/music/info*
-%{_datadir}/%{name}/plugins/music/display_and_send.scpt
 %{_datadir}/%{name}/plugins/music/pixmaps
 
 %dir %{_datadir}/%{name}/plugins/remind