[tango/f17] fix build with dmdfe 2.058

[MERCIER Jonathan]

commit e5e5d2fb9e02349a86cdd1820a47f635b8edcb2e
Author: Jonathan MERCIER <bioinfornatics at gmail.com>
Date:   Fri Feb 17 03:11:49 2012 +0100

    fix build with dmdfe 2.058

 .gitignore |    1 +
 sources    |    3 ++-
 tango.spec |   56 ++++++++++++++++++++++++++++++++------------------------
 3 files changed, 35 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 892a630..ce11172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /tango-20111231git7048209.xz
 /DdocToDevhelp
 /tango-20120206gitc6be365.xz
+/tango-20120215git7aec6a1.xz
diff --git a/sources b/sources
index e622a5d..06f927b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-6a0330a10714b3490701f98978c7f93e  tango-20120206gitc6be365.xz
+3a711395c43a213fd5c140bd9419a713  tango-20120215git7aec6a1.xz
+d4589c353570552e2d5b8adf87e492f7  DdocToDevhelp
diff --git a/tango.spec b/tango.spec
index 398df38..b182eba 100644
--- a/tango.spec
+++ b/tango.spec
@@ -1,5 +1,5 @@
-%global     alphatag            20120206
-%global     tango_revision      gitc6be365
+%global     alphatag            20120215
+%global     tango_revision      git7aec6a1
 %global     debug_package       %{nil}
 
 # The source for this package was pulled from upstream's git.
@@ -11,7 +11,7 @@
 
 Name:           tango
 Version:        2
-Release:        2.%{alphatag}%{tango_revision}%{?dist}
+Release:        4.%{alphatag}%{tango_revision}%{?dist}
 Summary:        The Developer's Library for D
 
 Group:          Development/Libraries
@@ -22,7 +22,7 @@ Group:          Development/Libraries
 License:        AFL or BSD
 URL:            http://www.dsource.org/projects/tango
 Source0:        %{name}-%{alphatag}%{tango_revision}.xz
-#Source1:        DdocToDevhelp
+Source1:        DdocToDevhelp
 
 BuildRequires:  ldc, ldc-phobos-devel, ldc-druntime-devel
 BuildRequires:  gcc, ruby
@@ -53,9 +53,10 @@ a une documentation de bonne qualité autant que les fonctionnalité, haut de
 gamme qu'elle propose.
 
 %package devel
-Provides:       %{name}-static =  %{version}-%{release}
 Summary:        Development files for %{name}
 Group:          Development/Libraries
+Provides:       %{name}-static =  %{version}-%{release}
+Requires:       %{name}%{?_isa} =  %{version}-%{release}
 
 %description devel
 Tango is a cross-platform open-source software library, written in the D
@@ -125,8 +126,9 @@ Exemple en:
 Summary:        Support for enable autocompletion in geany
 Group:          Development/Tools
 Requires:       %{name} =  %{version}-%{release}
-BuildRequires:  geany
 Requires:       geany
+BuildRequires:  geany
+BuildArch:      noarch
 
 %description geany-tags
 Enable autocompletion for tango library in geany (IDE)
@@ -134,21 +136,21 @@ Enable autocompletion for tango library in geany (IDE)
 %description -l fr geany-tags
 Active l'autocompletion pour pour la bibliothèque tango dans geany (IDE)
 
-#%package devhelp
-#Summary:        tango user and reference manuals
-#Group:          Development/Tools
-#Requires:       %{name} =  %{version}-%{release}
-#BuildArch:      noarch
-#BuildRequires:  python, python-BeautifulSoup
-#Requires:       devhelp
+%package devhelp
+Summary:        tango user and reference manuals
+Group:          Development/Tools
+Requires:       %{name} =  %{version}-%{release}
+Requires:       devhelp
+BuildRequires:  python, python-BeautifulSoup
+BuildArch:      noarch
 
-#%description devhelp
-#User Manual and Reference, Manual are provided in HTML format. You can use
-#devhelp to browse it.
+%description devhelp
+User Manual and Reference, Manual are provided in HTML format. You can use
+devhelp to browse it.
 
-#%description -l fr devhelp
-#Manuel et référence, le manuel est fournit au format HTML. Vous pouez utilisez
-#devhelp pour le parcourir.
+%description -l fr devhelp
+Manuel et référence, le manuel est fournit au format HTML. Vous pouez utilisez
+devhelp pour le parcourir.
 
 
 %prep
@@ -164,7 +166,7 @@ mkdir geany_config
 
 %build
 #./build/script/bob.rb -v -r ldc -c ldc  -p linux . 
-make %{?_smp_mflags} -f build/Makefile DCFLAGS+="%{_d_optflags}" LIBDIR=%{_libdir} static-lib header  pkgfile-static
+make %{?_smp_mflags} -f build/Makefile DCFLAGS+="%{_d_optflags}" LIBDIR=%{_libdir} all
 
 # generate geany tags
 geany -c geany_config -g tango.d.tags $(find tango/ -name "*.d")
@@ -182,8 +184,8 @@ make %{?_smp_mflags} -f build/Makefile DCFLAGS+="%{_d_optflags}" DESTDIR=%{build
 install -m0755 tango.d.tags %{buildroot}/%{_datadir}/geany/tags/
 
 # Devhelp
-#python %{SOURCE1} -n Tango -s %{buildroot}%{_d_includedir}/%{name}/ -p %{buildroot}/%{_datadir}
-#find %{buildroot}/%{_datadir}/devhelp/books/Tango -name "*.html" | xargs sed -i "s|%{buildroot}||g" 
+python %{SOURCE1} -n Tango -s %{buildroot}%{_d_includedir}/%{name}/ -p %{buildroot}/%{_datadir}
+find %{buildroot}/%{_datadir}/devhelp/books/Tango -name "*.html" | xargs sed -i "s|%{buildroot}||g" 
 
 %files devel
 %doc README.md LICENSE.txt
@@ -197,10 +199,16 @@ install -m0755 tango.d.tags %{buildroot}/%{_datadir}/geany/tags/
 %files geany-tags
 %{_datadir}/geany/tags/%{name}.d.tags
 
-#%files devhelp
-#%{_datadir}/devhelp/books/Tango
+%files devhelp
+%{_datadir}/devhelp/books/Tango
 
 %changelog
+* Thu Feb 16 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-4.20120206gitc6be365
+- update to latest tango rev who fix build with dmdfe 2.058
+
+* Thu Feb 16 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-3.20120206gitc6be365
+- Rebuild against latest ldc release
+
 * Mon Feb 06 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-2.20120206gitfcb803f
 - update to latest git rev c6be365