SPECS: xmule.spec - up to 1.12.2 - BR: cryptopp-devel - use extern...

[zboczuch]

Author: zboczuch                     Date: Mon Dec 19 21:06:17 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.12.2
- BR: cryptopp-devel - use extern libcryptopp due to compilation warnings
- updated BRs for 1.12.2
- "regenerate" POTFILES.in because it contains informations about files
  already removed from xMule's CVS
- update installed files
- update docs
- no need for xmule-types.patch - missing includes already in xMule's sources
- xmule-wx-config.patch - during install xMule still tries to call wx-config
  instead of wx-gtk2-ansi-config passed in configure script
- xmule-libcrypto.patch - xMule looks for libcrypto++.so or libcryptopp.so,
  but always tries to link against libcrypto++, fixed
- rel. 0.1 - it hangs after few minutes

---- Files affected:
SPECS:
   xmule.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SPECS/xmule.spec
diff -u SPECS/xmule.spec:1.32 SPECS/xmule.spec:1.33
--- SPECS/xmule.spec:1.32	Tue May 17 11:51:13 2005
+++ SPECS/xmule.spec	Mon Dec 19 22:06:09 2005
@@ -1,26 +1,29 @@
 # $Revision$, $Date$
+# TODO: it hanges after few minutes, hgw why.
 Summary:	Unix port of eMule client
 Summary(pl):	Uniksowy port klienta eMule
 Name:		xmule
-Version:	1.9.4
-Release:	1
+Version:	1.12.2
+Release:	0.1
 License:	GPL
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/xmule/%{name}-%{version}.tar.bz2
-# Source0-md5:	6a466ba740b55e6d283622aa84570921
+# Source0-md5:	372c02793f8282312a1370443420fda7
 Patch0:		%{name}-pl_typos.patch
 Patch1:		%{name}-desktop.patch
-Patch2:		%{name}-types.patch
-Patch3:		%{name}-locale_names.patch
-Patch4:		%{name}-configure.patch
-URL:		http://www.xmule.org/
+Patch2:		%{name}-locale_names.patch
+Patch3:		%{name}-configure.patch
+Patch4:		%{name}-wx-config.patch
+Patch5:		%{name}-libcrypto.patch
+URL:		http://www.xmule.ws/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1:1.7.3
 BuildRequires:	bison
+BuildRequires:	cryptopp-devel
 BuildRequires:	expat-devel
-BuildRequires:	gettext-devel >= 0.11.5
-BuildRequires:	gtk+2-devel >= 2.0.0
-BuildRequires:	wxGTK2-devel >= 2.6.0
+BuildRequires:	gettext-devel >= 0.14.5
+BuildRequires:	gtk+2-devel >= 2.0.3
+BuildRequires:	wxGTK2-devel >= 2.6.2
 BuildRequires:	libstdc++-devel
 Requires:	wget
 Obsoletes:	aMule
@@ -40,10 +43,13 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 mv -f po/{ee,et}.po
 
 %build
+# Regenerate POTFILES.in because it wasn't actualized since 2004
+for i in src/*.cpp; do echo $i; done > po/POTFILES.in
 cp -f /usr/share/automake/config.sub .
 %{__gettextize}
 %{__aclocal}
@@ -58,7 +64,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir}}
-install {ed2k,xmule} $RPM_BUILD_ROOT%{_bindir}
+install {ed2k.xmule-2.0,xmule} $RPM_BUILD_ROOT%{_bindir}
+ln -sf %{_bindir}/ed2k.xmule-2.0 $RPM_BUILD_ROOT%{_bindir}/ed2k
 install xmule.desktop $RPM_BUILD_ROOT%{_desktopdir}/xmule.desktop
 install xmule.xpm $RPM_BUILD_ROOT%{_pixmapsdir}/xmule.xpm
 cd po
@@ -75,7 +82,7 @@
 
 %files -f xMule.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog ChangeLog-UNSTABLE README TODO
+%doc ChangeLog ChangeLog-UNSTABLE docs/{AUTHORS,ED2K-Links.HOWTO,README,TODO}
 %attr(755,root,root) %{_bindir}/*
 %{_pixmapsdir}/*
 %{_desktopdir}/%{name}.desktop
@@ -86,6 +93,21 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2005/12/19 21:06:09  zboczuch
+- up to 1.12.2
+- BR: cryptopp-devel - use extern libcryptopp due to compilation warnings
+- updated BRs for 1.12.2
+- "regenerate" POTFILES.in because it contains informations about files
+  already removed from xMule's CVS
+- update installed files
+- update docs
+- no need for xmule-types.patch - missing includes already in xMule's sources
+- xmule-wx-config.patch - during install xMule still tries to call wx-config
+  instead of wx-gtk2-ansi-config passed in configure script
+- xmule-libcrypto.patch - xMule looks for libcrypto++.so or libcryptopp.so,
+  but always tries to link against libcrypto++, fixed
+- rel. 0.1 - it hangs after few minutes
+
 Revision 1.32  2005/05/17 09:51:13  speedy
 - release 1, burn it baby...
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xmule.spec?r1=1.32&r2=1.33&f=u