SPECS: amsn.spec - up to 0.97 (by Darek Moszkowicz) - libng_plugin_init.pat...

Sun Oct 26 08:58:23 CET 2008

Author: duddits                      Date: Sun Oct 26 07:58:23 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 0.97 (by Darek Moszkowicz)
- libng_plugin_init.patch obsoleted
- BR/R updated
- should work fine now

---- Files affected:
SPECS:
   amsn.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/amsn.spec
diff -u SPECS/amsn.spec:1.18 SPECS/amsn.spec:1.19

--- SPECS/amsn.spec:1.18	Wed Apr  4 13:36:31 2007
+++ SPECS/amsn.spec	Sun Oct 26 08:58:17 2008
@@ -1,35 +1,30 @@
 # $Revision$, $Date$
-# TODO
-# - check that the killed precompiled libraries are not needed (use some system ones)
-# - probable -L poisoning:
-# /usr/bin/ld: skipping incompatible /usr/lib/libm.so when searching for -lm
-# /usr/bin/ld: skipping incompatible /usr/lib/libc.so when searching for -lc
 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.96
-Release:	0.2
+Version:	0.97
+Release:	0.1
 Epoch:		0
 License:	GPL
 Group:		Applications/Communications
 Source0:	http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.gz
-# Source0-md5:	e0e9d304c8221048de4d1c3723d7d38a
+# Source0-md5:	0ae903f6cac24c042f4ef74b5015ea88
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-libng_plugin_init.patch
 URL:		http://amsn.sourceforge.net/
 BuildRequires:	libpng-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	sed >= 4.0
-BuildRequires:	tcl-devel >= 8.3
-BuildRequires:	tk-devel >= 8.3
+BuildRequires:	tcl-devel >= 8.4
+BuildRequires:	tk-devel >= 8.4
+Requires(post,postun):	hicolor-icon-theme
 # IM's convert is needed to display pictures (buddy icons).
 Requires:	ImageMagick
-Requires:	tcl >= 8.3
+Requires:	tcl >= 8.4
 # MSN Protocol 9 won't let you in without SSL anymore.
 Requires:	tcl-tls
-Requires:	tk >= 8.3
+Requires:	tk >= 8.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -65,17 +60,9 @@
 find -name '*.tcl' -print0 | xargs -0 sed -i -e 's,\r$,,'
 
 %patch0 -p1
-%patch1 -p1
 
-# precompiled ELF 32 library
-rm -f utils/Tclxml/libTclxml3.1.so
-# Mach-O executable ppc
-rm -f sndplay
-
-# MS-DOS executable PE  for MS Windows (DLL) (GUI) Intel 80386 32-bit
-rm -f utils/*/*.dll utils/*/*/*.dll
-# MS-DOS executable PE  for MS Windows (GUI) Intel 80386 32-bit
-rm -f utils/*/*.exe utils/*/*/*.exe
+# MS-DOS executable PE for MS Windows (GUI) Intel 80386 32-bit
+rm -f utils/*/*/*.exe
 
 %build
 %configure \
@@ -84,7 +71,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -d $RPM_BUILD_ROOT{%{_iconsdir}/hicolor/,%{_pixmapsdir},%{_desktopdir}}
 
 # FIXME: FHS?
 %{__make} install \
@@ -93,41 +80,50 @@
 	dstdir=$RPM_BUILD_ROOT%{_libdir} \
 	slnkdir=$RPM_BUILD_ROOT%{_bindir}
 
-install -d $RPM_BUILD_ROOT%{_desktopdir}
 install %{name}.desktop $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 rm -f $RPM_BUILD_ROOT%{_libdir}/applications/amsn.desktop
 
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pixmaps
+ln -s %{_iconsdir}/hicolor/48x48/apps/%{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
+
 for f in amsn{,-remote{,-CLI}}; do
 	rm $RPM_BUILD_ROOT%{_bindir}/$f
 	ln -s ../%{_lib}/%{name}/$f $RPM_BUILD_ROOT%{_bindir}
 done
 
 # remove junk
-rm -rf $RPM_BUILD_ROOT%{_libdir}/doc/amsn-0.91
-rm -rf $RPM_BUILD_ROOT%{_libdir}/amsn/amsn.{desktop,spec,debianmenu}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/amsn/amsn.desktop
 # docs in docs
 rm -rf $RPM_BUILD_ROOT%{_libdir}/amsn/docs
-rm -rf $RPM_BUILD_ROOT%{_libdir}/amsn/{AGREEMENT,CREDITS,GNUGPL,INSTALL,README,HELP,FAQ,TODO,Makefile,cvs_date}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/amsn/{AGREEMENT,CREDITS,GNUGPL,INSTALL,README,HELP,FAQ,TODO}
 rm -rf $RPM_BUILD_ROOT%{_libdir}/amsn/utils/*/test.tcl
-# random binary for PPC
-rm -rf $RPM_BUILD_ROOT%{_libdir}/amsn/sndplay
 
-mv $RPM_BUILD_ROOT%{_libdir}/icons $RPM_BUILD_ROOT%{_iconsdir}
+mv $RPM_BUILD_ROOT%{_libdir}/amsn/desktop-icons/* $RPM_BUILD_ROOT%{_iconsdir}/hicolor/
+rm -rf $RPM_BUILD_ROOT%{_libdir}/amsn/desktop-icons
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_icon_cache hicolor
+
+%postun
+%update_icon_cache hicolor
+
 %files
 %defattr(644,root,root,755)
 %doc FAQ GNUGPL HELP README TODO CREDITS
 %attr(755,root,root) %{_bindir}/*
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/a[!m]*
+%{_libdir}/%{name}/amsn[!-]*
 %{_libdir}/%{name}/[!a]*
-%attr(755,root,root) %{_libdir}/%{name}/amsn*
+%attr(755,root,root) %{_libdir}/%{name}/amsn
+%attr(755,root,root) %{_libdir}/%{name}/amsn-remote*
 
-%{_iconsdir}/hicolor/*/*.png
+%{_iconsdir}/hicolor/*/apps/*.png
 %{_desktopdir}/%{name}.desktop
+%{_pixmapsdir}/%{name}.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -135,6 +131,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2008/10/26 07:58:17  duddits
+- up to 0.97 (by Darek Moszkowicz)
+- libng_plugin_init.patch obsoleted
+- BR/R updated
+- should work fine now
+
 Revision 1.18  2007/04/04 11:36:31  glen
 - more todo, rel down
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/amsn.spec?r1=1.18&r2=1.19&f=u

