rpms/amsn/devel amsn.spec,1.10,1.11

[Sander Hoentjen (tjikkun)]

Author: tjikkun

Update of /cvs/extras/rpms/amsn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19966

Modified Files:
	amsn.spec 
Log Message:
bump for rebuild against tcl 8.4 and some other pending stuff



Index: amsn.spec
===================================================================
RCS file: /cvs/extras/rpms/amsn/devel/amsn.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- amsn.spec	2 Feb 2007 16:02:50 -0000	1.10
+++ amsn.spec	5 Mar 2007 10:12:20 -0000	1.11
@@ -1,6 +1,9 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
+
 Name:           amsn
 Version:        0.96
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        MSN Messenger clone for Linux, Mac and Windows
 
 Group:          Applications/Internet
@@ -10,8 +13,10 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf, desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
-Requires:       tcltls, tclsoap, tcllib, bwidget, tk >= 8.5, tkdnd, htmlview, sox
-Patch1: amsn-0.96-system-bwidget.patch
+#wait for tcl/tk package to implement before uncommenting:
+#Requires:       tcl(abi) = %{tcl_version}
+Requires:       tcltls, tclsoap, tcllib, bwidget, tk, tkdnd, htmlview, sox
+Patch1:         amsn-0.96-system-bwidget.patch
 
 %description
 This is an MSN Messenger clone for Unix, Windows, and Macintosh.
@@ -33,15 +38,19 @@
 %patch1 -p1 -b .1-system-bwidget
 rm -r utils/TkCximage/src/{jpeg,png,zlib}
 rm -r utils/BWidget-1.7.0
+rm -r skins/default/winicons
+
+# this can go after tcl package includes tcl_sitearch in path
+%{__sed} -i 's#lappend auto_path \[file join ${HOME} plugins\]#lappend auto_path \[file join \${HOME} plugins\] %{tcl_sitearch}#' amsn
 
 # for webcam to work these paths need to be added because we move libs around
-%{__sed} -i 's#\.\./libng/plugins#%{_libdir}/capture/libng/plugins#' utils/linux/capture/libng/grab-ng.c
-%{__sed} -i 's#\.\./libng/contrib-plugins#%{_libdir}/capture/libng/contrib-plugins#' utils/linux/capture/libng/grab-ng.c
+%{__sed} -i 's#\.\./libng/plugins#%{tcl_sitearch}/capture/libng/plugins#' utils/linux/capture/libng/grab-ng.c
+%{__sed} -i 's#\.\./libng/contrib-plugins#%{tcl_sitearch}/capture/libng/contrib-plugins#' utils/linux/capture/libng/grab-ng.c
 
 %{__sed} -i 's# utils/BWidget-1.7.0##' Makefile.in
 %{__sed} -i 's#mozilla#htmlview#' config.tcl
 %{__sed} -i 's#my_filemanager open#gnome-open#' config.tcl
-%{__sed} -i 's#set program_dir \[file dirname \[info script\]\]#set program_dir "/usr/share/amsn/"#' amsn amsn-remote amsn-remote-CLI
+%{__sed} -i 's#set program_dir \[file dirname \[info script\]\]#set program_dir "%{_datadir}/amsn/"#' amsn amsn-remote amsn-remote-CLI
 autoconf
 
 %build
@@ -69,10 +78,10 @@
 rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/{AGREEMENT,FAQ,GNUGPL,INSTALL,remote.help,TODO}
 rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/lang/{*.*,LANG-HOWTO,sortlang}
 
-mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}
-mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/linux/* ${RPM_BUILD_ROOT}/%{_libdir}/
-mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/TkCximage ${RPM_BUILD_ROOT}/%{_libdir}/
-mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/webcamsn ${RPM_BUILD_ROOT}/%{_libdir}/
+mkdir -p ${RPM_BUILD_ROOT}/%{tcl_sitearch}
+mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/linux/* ${RPM_BUILD_ROOT}/%{tcl_sitearch}/
+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}/
 
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/
 cp ${RPM_BUILD_ROOT}%{_datadir}/amsn/icons/48x48/msn.png ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/
@@ -96,11 +105,7 @@
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-amsn.desktop
 %{_datadir}/icons/hicolor/48x48/apps/msn.png
-%{_libdir}/traydock/
-%{_libdir}/capture/
-%{_libdir}/TkCximage/
-%{_libdir}/webcamsn/
-%{_libdir}/linflash/
+%{tcl_sitearch}/
 %exclude %{_datadir}/%{name}/plugins/*
 
 %files plugins
@@ -121,6 +126,12 @@
 
 
 %changelog
+* Sun Mar 4 2007 Sander Hoentjen <sander at hoentjen.eu> - 0.96-6
+- No versioned requires on tk anymore since it doesn't work with the epoch
+- bump for rebuild against reverted 8.4
+- added tcl macros from tcl guidelines draft
+- moved private extensions to sitelib
+
 * Fri Feb 2 2007 Sander Hoentjen <sander at hoentjen.eu> - 0.96-5
 - Bump because i messed up tagging