rpms/amsn/F-8 .cvsignore, 1.3, 1.4 amsn.spec, 1.16, 1.17 sources, 1.3, 1.4
Sander Hoentjen (tjikkun)
fedora-extras-commits at redhat.com
Wed Dec 26 12:48:24 UTC 2007
- Previous message: rpms/libHX/devel .cvsignore, 1.2, 1.3 libHX.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/mfiler2/F-7 .cvsignore, 1.9, 1.10 mfiler2.spec, 1.8, 1.9 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tjikkun
Update of /cvs/pkgs/rpms/amsn/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10661
Modified Files:
.cvsignore amsn.spec sources
Log Message:
update to 0.97 release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/F-8/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 2 Nov 2006 22:26:32 -0000 1.3
+++ .cvsignore 26 Dec 2007 12:47:49 -0000 1.4
@@ -1 +1 @@
-amsn-0.96.tar.bz2
+amsn-0.97.tar.bz2
Index: amsn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/F-8/amsn.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- amsn.spec 21 Nov 2007 09:36:58 -0000 1.16
+++ amsn.spec 26 Dec 2007 12:47:49 -0000 1.17
@@ -2,20 +2,20 @@
%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
Name: amsn
-Version: 0.96
-Release: 11%{?dist}
+Version: 0.97
+Release: 1%{?dist}
Summary: MSN Messenger clone for Linux, Mac and Windows
Group: Applications/Internet
-License: GPL
+License: GPLv2
URL: http://www.amsn-project.net/
Source0: http://dl.sourceforge.net/amsn/%{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf, desktop-file-utils, tk-devel, which, libpng-devel, libjpeg-devel
+BuildRequires: tcl(abi) = %{tcl_version}
Requires: tcl(abi) = %{tcl_version}
Requires: tcltls, tclsoap, tcllib, bwidget, tkdnd, xdg-utils, alsa-utils
-Patch1: amsn-0.96-system-bwidget.patch
%description
This is an MSN Messenger clone for Unix, Windows, and Macintosh.
@@ -34,9 +34,7 @@
%prep
%setup -q
-%patch1 -p1 -b .1-system-bwidget
-rm -r utils/TkCximage/src/{jpeg,png,zlib}
-rm -r utils/BWidget-1.7.0
+rm -r utils/bwidget1.8.0
rm -r skins/default/winicons
# this can go after tcl package includes tcl_sitearch in path
@@ -46,7 +44,7 @@
%{__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# utils/bwidget1.8.0##' Makefile.in
%{__sed} -i 's#mozilla#xdg-open#' config.tcl
%{__sed} -i 's#my_filemanager open#xdg-open#' config.tcl
%{__sed} -i 's#openfilecommand ""#openfilecommand "xdg-open \\$file"#' config.tcl
@@ -63,7 +61,7 @@
%install
rm -rf ${RPM_BUILD_ROOT}
-make rpm-install INSTALL_PREFIX=${RPM_BUILD_ROOT}
+make install DESTDIR=${RPM_BUILD_ROOT}
mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/amsn ${RPM_BUILD_ROOT}/%{_bindir}/amsn
mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/amsn-remote ${RPM_BUILD_ROOT}/%{_bindir}/amsn-remote
mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/amsn-remote-CLI ${RPM_BUILD_ROOT}/%{_bindir}/amsn-remote-CLI
@@ -85,15 +83,16 @@
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}/
+mv ${RPM_BUILD_ROOT}/%{_datadir}/%{name}/utils/tcl_siren ${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/
-
-desktop-file-install --vendor fedora \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- --add-category X-Fedora \
- --delete-original \
- ${RPM_BUILD_ROOT}%{_datadir}/%{name}/amsn.desktop
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/icons/
+mv ${RPM_BUILD_ROOT}%{_datadir}/amsn/desktop-icons/ ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/
+rm ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
+
+desktop-file-install --vendor="fedora" \
+ --dir="${RPM_BUILD_ROOT}%{_datadir}/applications" \
+ --delete-original \
+ ${RPM_BUILD_ROOT}%{_datadir}/applications/amsn.desktop
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -101,13 +100,13 @@
%files
%defattr(-,root,root,-)
-%doc AGREEMENT CREDITS docs/ FAQ GNUGPL HELP INSTALL README remote.help TODO lang/LANG-HOWTO
+%doc AGREEMENT CREDITS docs/ FAQ FAQ.html GNUGPL HELP INSTALL README remote.help TODO lang/LANG-HOWTO
%{_bindir}/amsn
%{_bindir}/amsn-remote
%{_bindir}/amsn-remote-CLI
%{_datadir}/%{name}/
%{_datadir}/applications/fedora-amsn.desktop
-%{_datadir}/icons/hicolor/48x48/apps/msn.png
+%{_datadir}/icons/hicolor/*
%{tcl_sitearch}/*
%exclude %{_datadir}/%{name}/plugins/*
@@ -129,6 +128,9 @@
%changelog
+* Wed Dec 24 2007 Sander Hoentjen <sander at hoentjen.eu> - 0.97-1
+- Update to 0.97
+
* Wed Nov 21 2007 Sander Hoentjen <sander at hoentjen.eu> - 0.96-11
- Fix undefined tcl_version
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/amsn/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 2 Nov 2006 22:26:32 -0000 1.3
+++ sources 26 Dec 2007 12:47:49 -0000 1.4
@@ -1 +1 @@
-3df6b0d34ef1997a47c0b8af29b2547a amsn-0.96.tar.bz2
+493627afc2dc38d94500499e9ec34404 amsn-0.97.tar.bz2
- Previous message: rpms/libHX/devel .cvsignore, 1.2, 1.3 libHX.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message: rpms/mfiler2/F-7 .cvsignore, 1.9, 1.10 mfiler2.spec, 1.8, 1.9 sources, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list