Author: arvenil Date: Thu Apr 19 22:38:10 2007 GMT Module: SPECS Tag: AC-branch ---- Log message: - up to 2.8.4 (merged from HEAD) - added LDFLAG -L/usr/X11R6/lib
---- Files affected: SPECS: mldonkey.spec (1.153 -> 1.153.2.1) ---- Diffs: ================================================================ Index: SPECS/mldonkey.spec diff -u SPECS/mldonkey.spec:1.153 SPECS/mldonkey.spec:1.153.2.1 --- SPECS/mldonkey.spec:1.153 Mon Oct 2 00:02:22 2006 +++ SPECS/mldonkey.spec Fri Apr 20 00:38:00 2007 @@ -21,12 +21,12 @@ Summary: eDonkey 2000 p2p network client Summary(pl): Klient sieci p2p eDonkey 2000 Name: mldonkey -Version: 2.7.7 -Release: 2 +Version: 2.8.4 +Release: 1 License: GPL Group: Applications/Networking Source0: http://dl.sourceforge.net/mldonkey/%{name}-%{version}.tar.bz2 -# Source0-md5: d7b92ae3e8782a3c4adeb0e7870c07dc +# Source0-md5: dfe0bf768ea8cd2f5094b1cbc8d7469b Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.sh @@ -45,6 +45,8 @@ BuildRequires: ocaml-camlp4 >= 1:%{ocaml_ver} %{?with_gui:BuildRequires: ocaml-lablgtk2-devel} %{?with_gui:BuildRequires: ocaml-lablgtk2-rsvg-devel} +%{?with_gui:BuildRequires: librsvg-devel} +BuildRequires: cpp BuildRequires: perl-base BuildRequires: rpmbuild(macros) >= 1.268 BuildRequires: zlib-devel @@ -179,11 +181,12 @@ %patch1 -p1 %build -cp -f /usr/share/automake/config.sub src/applets/kde/admin cp -f /usr/share/automake/config.sub config cd config %{__autoconf} +LDFLAGS="%{rpmldflags} -L/usr/X11R6/lib" +export LDFLAGS %configure \ --enable-ocamlver=%{ocaml_ver} \ --enable-pthread \ @@ -217,8 +220,6 @@ install mlgui $RPM_BUILD_ROOT%{_bindir}/mlgui install mlnet+gui $RPM_BUILD_ROOT%{_bindir}/mlnet+gui install mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter -install mlchat $RPM_BUILD_ROOT%{_bindir}/mlchat -install mlim $RPM_BUILD_ROOT%{_bindir}/mlim install distrib/mldonkey_previewer $RPM_BUILD_ROOT%{_bindir}/mldonkey_previewer %endif @@ -296,7 +297,7 @@ %files %defattr(644,root,root,755) -%doc docs/* distrib/{Authors.txt,Bugs.txt,ChangeLog,ed2k_links.txt,FAQ.html,Todo.txt} +%doc docs/* distrib/{Authors.txt,Bugs.txt,ChangeLog,ed2k_links.txt,Todo.txt} %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mldonkey %attr(754,root,root) /etc/rc.d/init.d/mldonkey %attr(755,root,root) %{_bindir}/mlnet @@ -307,14 +308,12 @@ %if %{with gui} %files gui %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/mlchat -%attr(755,root,root) %{_bindir}/mlim %attr(755,root,root) %{_bindir}/mlgui %attr(755,root,root) %{_bindir}/mlnet+gui %attr(755,root,root) %{_bindir}/mlguistarter %attr(755,root,root) %{_bindir}/mldonkey_previewer %{_pixmapsdir}/* -%{_desktopdir}/* +%{_desktopdir}/*.desktop %endif %files submit @@ -338,6 +337,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.153.2.1 2007/04/19 22:38:00 arvenil +- up to 2.8.4 (merged from HEAD) +- added LDFLAG -L/usr/X11R6/lib + Revision 1.153 2006/10/01 22:02:22 glen - rel 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mldonkey.spec?r1=1.153&r2=1.153.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
