SPECS: mldonkey.spec - enable newgui2 - remove build hacks which s...

glen glen at pld-linux.org
Sun Apr 16 13:22:51 CEST 2006 

Author: glen                         Date: Sun Apr 16 11:22:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- enable newgui2
- remove build hacks which seem unneccessary

---- Files affected:
SPECS:
   mldonkey.spec (1.141 -> 1.142) 

---- Diffs:

================================================================
Index: SPECS/mldonkey.spec
diff -u SPECS/mldonkey.spec:1.141 SPECS/mldonkey.spec:1.142
--- SPECS/mldonkey.spec:1.141	Sun Apr 16 12:20:06 2006
+++ SPECS/mldonkey.spec	Sun Apr 16 13:22:45 2006
@@ -16,13 +16,13 @@
 %bcond_without	donkey		# without eDonkey support
 %bcond_without	bittorrent	# without BitTorrent support
 %bcond_without	filetp		# without fileTP support
-%bcond_with	gui		# with mlgui
+%bcond_without	gui		# with mlgui
 
 %ifarch alpha
 %undefine with_gui
 %endif
 
-%define ocaml_ver	1:3.09.1
+%define ocaml_ver	3.09.1
 Summary:	eDonkey 2000 p2p network client
 Summary(pl):	Klient sieci p2p eDonkey 2000
 Name:		mldonkey
@@ -46,16 +46,18 @@
 Patch0:		%{name}-configwin.patch
 Patch1:		%{name}-newgtk.patch
 # PatchPack from http://download.berlios.de/pub/mldonkey/spiralvoice/patchpacks/
-#PatchX:		%{name}-patch_pack30%{patch_pack}.gz
+#PatchX: %{name}-patch_pack30%{patch_pack}.gz
 URL:		http://www.nongnu.org/mldonkey/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
-%{?with_gui:BuildRequires:	gtk+-devel}
+%{?with_gui:BuildRequires:	gd-devel}
+%{?with_gui:BuildRequires:	gtk+2-devel}
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
-BuildRequires:	ocaml-camlp4 >= %{ocaml_ver}
-%{?with_gui:BuildRequires:	ocaml-lablgtk-devel >= 1:1.2.6}
+BuildRequires:	ocaml-camlp4 >= 1:%{ocaml_ver}
+%{?with_gui:BuildRequires:	ocaml-lablgtk2-devel}
+%{?with_gui:BuildRequires:	ocaml-lablgtk2-rsvg-devel}
 BuildRequires:	perl-base
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
@@ -82,20 +84,20 @@
 used to exchange big files on the Internet. It is written in a
 wonderful language, called Objective-Caml, and present most features
 of the basic Windows donkey client, plus some more:
-  - It should work on most UNIX-compatible platforms.
-  - You can remotely command your client, either by telnet, on a WEB
-    browser, or with the GTK+ interface.
-  - You can connect to several servers, and each search will query all
-    the connected servers.
-  - You can select MP3s by bitrates in queries (useful ?).
-  - You can select the name of a downloaded file before moving it to
-    your incoming directory.
-  - You can have several queries in the graphical user interface at the
-    same time.
-  - You can remember your old queries results in the command-line
-    interface.
-  - You can search in the history of all files you have seen on the
-    network.
+- It should work on most UNIX-compatible platforms.
+- You can remotely command your client, either by telnet, on a WEB
+  browser, or with the GTK+ interface.
+- You can connect to several servers, and each search will query all
+  the connected servers.
+- You can select MP3s by bitrates in queries (useful ?).
+- You can select the name of a downloaded file before moving it to
+  your incoming directory.
+- You can have several queries in the graphical user interface at the
+  same time.
+- You can remember your old queries results in the command-line
+  interface.
+- You can search in the history of all files you have seen on the
+  network.
 
 It can also access other peer-to-peer networks:
 - Direct Connect
@@ -111,25 +113,25 @@
 protokołowi pobierania danych z wielu źródeł. Klient ten został
 napisany w języku Objective-Caml i ma większość cech podstawowego
 klienta windowsowego, a ponadto:
- - działa na większości platform uniksowych,
- - pozwala zdalnie sterować klientem przez interfejs telnet, WWW lub
-   GTK+,
- - można łączyć się z kilkoma serwerami, wtedy każde przeszukiwanie
-   odpyta połączone serwery,
- - można wybierać pliki MP3 po bitrate w zapytaniach,
- - można wybierać nazwę pliku do ściągnięcia przed przejściem do
-   katalogu incoming,
- - można jednocześnie wykonywać kilka zapytań w graficznym interfejsie,
- - można zapamiętać wyniki zapytań w interfejsie z linii poleceń,
- - można przeszukiwać historię wszystkich plików widzianych w sieci.
+- działa na większości platform uniksowych,
+- pozwala zdalnie sterować klientem przez interfejs telnet, WWW lub
+  GTK+,
+- można łączyć się z kilkoma serwerami, wtedy każde przeszukiwanie
+  odpyta połączone serwery,
+- można wybierać pliki MP3 po bitrate w zapytaniach,
+- można wybierać nazwę pliku do ściągnięcia przed przejściem do
+  katalogu incoming,
+- można jednocześnie wykonywać kilka zapytań w graficznym interfejsie,
+- można zapamiętać wyniki zapytań w interfejsie z linii poleceń,
+- można przeszukiwać historię wszystkich plików widzianych w sieci.
 
 Klient umożliwia także dostęp do innych sieci peer-to-peer:
- - Direct Connect,
- - Open Napster,
- - Gnutella LimeWire,
- - Soulseek,
- - Audio Galaxy,
- - OpenFT.
+- Direct Connect,
+- Open Napster,
+- Gnutella LimeWire,
+- Soulseek,
+- Audio Galaxy,
+- OpenFT.
 
 %package gui
 Summary:	Graphical frontend for mldonkey based on GTK+
@@ -189,21 +191,11 @@
 %patch1 -p1
 
 %build
-cd config
-%{__autoconf}
-cd ..
 cp -f /usr/share/automake/config.sub src/applets/kde/admin
 cp -f /usr/share/automake/config.sub config
 
-mkdir -p build
-rm -f icons/big/*.ml_icon
-rm -f icons/small/*.ml_icon
-rm -f icons/*.ml_icon
-rm -f *.cma *.cmxa *.a
-rm -f mlgnut mlnap mlbt mldonkey mlslsk mldonkey_gui*
-rm -f build/*.cma build/*.cmxa build/*.a
-touch .depend
 cd config
+%{__autoconf}
 %configure \
 	--enable-ocamlver=%{ocaml_ver} \
 	--enable-pthread \
@@ -219,10 +211,11 @@
 	%{?with_donkey:--en}%{!?with_donkey:--dis}able-donkey \
 	%{?with_bittorrent:--en}%{!?with_bittorrent:--dis}able-bittorrent \
 	%{?with_filetp:--en}%{!?with_filetp:--dis}able-filetp \
-	%{?with_gui:--en}%{!?with_gui:--dis}able-gui
+	%{?with_gui:--en}%{!?with_gui:--dis}able-gui%{?with_gui:=newgui2}
 
 cd ..
-%{__make} opt utils
+%{__make}
+%{__make} utils
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -239,7 +232,6 @@
 install mlguistarter $RPM_BUILD_ROOT%{_bindir}/mlguistarter
 install mlchat $RPM_BUILD_ROOT%{_bindir}/mlchat
 install mlim $RPM_BUILD_ROOT%{_bindir}/mlim
-install mlprogress $RPM_BUILD_ROOT%{_bindir}/mlprogress
 install distrib/mldonkey_previewer $RPM_BUILD_ROOT%{_bindir}/mldonkey_previewer
 %endif
 
@@ -331,7 +323,6 @@
 %attr(755,root,root) %{_bindir}/mlchat
 %attr(755,root,root) %{_bindir}/mlim
 %attr(755,root,root) %{_bindir}/mlgui
-%attr(755,root,root) %{_bindir}/mlprogress
 %attr(755,root,root) %{_bindir}/mlnet+gui
 %attr(755,root,root) %{_bindir}/mlguistarter
 %attr(755,root,root) %{_bindir}/mldonkey_previewer
@@ -360,6 +351,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.142  2006/04/16 11:22:45  glen
+- enable newgui2
+- remove build hacks which seem unneccessary
+
 Revision 1.141  2006/04/16 10:20:06  glen
 - use epoch in ocaml macro
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mldonkey.spec?r1=1.141&r2=1.142&f=u

More information about the pld-cvs-commit mailing list