[tango] new rev

Wed Oct 3 20:13:49 UTC 2012

commit 3da89411fd0021e95115536244ceed77a9f92832
Author: Jonathan MERCIER <bioinfornatics at gmail.com>
Date:   Wed Oct 3 22:13:36 2012 +0200

    new rev

 .gitignore |    1 +
 sources    |    3 +-
 tango.spec |   90 +++++++++++++++++++++++++++++------------------------------
 3 files changed, 46 insertions(+), 48 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index ce11172..35022a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /DdocToDevhelp
 /tango-20120206gitc6be365.xz
 /tango-20120215git7aec6a1.xz
+/tango-20120821git7b92443.tar.xz
diff --git a/sources b/sources
index 06f927b..bfaed1f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-3a711395c43a213fd5c140bd9419a713  tango-20120215git7aec6a1.xz
-d4589c353570552e2d5b8adf87e492f7  DdocToDevhelp
+1b5487933e112dad313b1138450a309b  tango-20120821git7b92443.tar.xz
diff --git a/tango.spec b/tango.spec
index e5e2c21..b1a0e17 100644
--- a/tango.spec
+++ b/tango.spec
@@ -1,5 +1,5 @@
-%global     alphatag            20120215
-%global     tango_revision      git7aec6a1
+%global     alphatag            20120821
+%global     tango_revision      git7b92443
 %global     debug_package       %{nil}
 
 # The source for this package was pulled from upstream's git.
@@ -7,11 +7,11 @@
 # cd Tango-D2; git rev-parse --short HEAD            -> for tango_rev
 # git clone git://github.com/SiegeLord/Tango-D2.git
 # cd Tango-D2; git checkout %%tango_rev  
-# git archive --prefix=tango-%%{alphatag}/ HEAD | xz > ../tango-%%{alphatag}.xz
+# git archive --prefix=tango-%%{alphatag}/ HEAD --format=tar | xz > ../tango-%%{alphatag}.xz
 
 Name:           tango
 Version:        2
-Release:        6.%{alphatag}%{tango_revision}%{?dist}
+Release:        11.%{alphatag}%{tango_revision}%{?dist}
 Summary:        The Developer's Library for D
 
 Group:          Development/Libraries
@@ -21,11 +21,10 @@ Group:          Development/Libraries
 # unwelcome restriction, in which case the AFL is the correct license to apply. 
 License:        AFL or BSD
 URL:            http://www.dsource.org/projects/tango
-Source0:        %{name}-%{alphatag}%{tango_revision}.xz
-Source1:        DdocToDevhelp
+Source0:        %{name}-%{alphatag}%{tango_revision}.tar.xz
 
 BuildRequires:  ldc, ldc-phobos-devel, ldc-druntime-devel
-BuildRequires:  gcc, ruby
+BuildRequires:  gcc, make
 
 %description
 Tango is a cohesive and comprehensive library for the D programming language,
@@ -55,7 +54,7 @@ gamme qu'elle propose.
 %package devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries
-Provides:       %{name}-static =  %{version}-%{release}
+
 Requires:       %{name}%{?_isa} =  %{version}-%{release}
 
 %description devel
@@ -136,77 +135,76 @@ 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}
-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 -l fr devhelp
-Manuel et référence, le manuel est fournit au format HTML. Vous pouez utilisez
-devhelp pour le parcourir.
-
-
 %prep
 %setup -q -n %{name}-%{alphatag}%{tango_revision}
 # remove binaries
 rm -rf ./build/bin/*
 # fix end of line
 find . -type f \( -name "*.d" -or -name "*.xml" \) -exec sed -i 's/\r//' {} \;
-# fix compiler to call
-#sed -i 's/ldmd/ldmd2/g' ./build/script/bob.rb
 # temp geany config directory for allow geany to generate tags
 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} all
+make %{?_smp_mflags} -f build/Makefile DCFLAGS+="%{_d_optflags}" LIBDIR=%{_libdir} DCFLAGS_IMPORT="-Itango" all-shared
 
 # generate geany tags
 geany -c geany_config -g tango.d.tags $(find tango/ -name "*.d")
 
 %install
-mkdir -p                %{buildroot}%{_libdir}/
-mkdir -p                %{buildroot}%{_datadir}/pkgconfig
-mkdir -p                %{buildroot}%{_d_includedir}/%{name}
-mkdir -p                %{buildroot}/%{_datadir}/geany/tags/
+mkdir -p %{buildroot}%{_libdir}/
+mkdir -p %{buildroot}%{_datadir}/pkgconfig
+mkdir -p %{buildroot}%{_d_includedir}/%{name}
+mkdir -p %{buildroot}/%{_datadir}/geany/tags/
 
 # Tango
-make %{?_smp_mflags} -f build/Makefile DCFLAGS+="%{_d_optflags}" DESTDIR=%{buildroot} DATA_DIR=%{_datadir} INCLUDE_DIR=%{_d_includedir} LIB_DIR=%{_libdir} install-static-lib install-header install-pkgfile
+make %{?_smp_mflags} -f build/Makefile DCFLAGS+="%{_d_optflags} -d" DESTDIR=%{buildroot} DATA_DIR=%{_datadir} INCLUDE_DIR=%{_d_includedir} LIB_DIR=%{_libdir} install-shared 
+pushd %{buildroot}%{_libdir}/
+ln -s libtango-ldc.so.2 libtango-ldc.so.2.0.0
+ln -s libtango-ldc.so.2 libtango-ldc.so
+popd
 
 # Geany tag
 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" 
+%files
+%{_libdir}/lib%{name}-ldc.so.2
+%{_libdir}/lib%{name}-ldc.so.2.0.0
 
 %files devel
-%doc README.md LICENSE.txt
-%{_libdir}/lib%{name}-ldc.a
+%{_libdir}/lib%{name}-ldc.so
 %{_d_includedir}/%{name}
 %{_datadir}/pkgconfig/%{name}.pc
 
 %files doc
-%doc doc/example
+%doc doc/example README.md LICENSE.txt
+%{_docdir}/%{name}/
+
 
 %files geany-tags
 %{_datadir}/geany/tags/%{name}.d.tags
 
-%files devhelp
-%{_datadir}/devhelp/books/Tango
 
 %changelog
-* Sun Aug 12 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-6.20120215git7aec6a1
-- rebuild
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2-5.20120215git7aec6a1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Wed Oct 03 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-11.20120821git7b92443
+- update
+
+* Sun Aug 12 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-10.20120731gitb4c308f5
+- Update to nex rev
+
+* Thu Jun 14 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-9.20120421gitb3f47b9
+- rebuild dmdfe 2.059
+
+* Thu Jun 14 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-8.20120421gitb3f47b9
+- rebuild dmdfe 2.059
+
+* Sun Jun 10 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-7.20120421gitb3f47b9
+- rebuilt
+
+* Wed Jun 06 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-6.20120421gitb3f47b9
+- fix spec file
+
+* Fri May 25 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-5.2012021gitb3f47b9
+- update to latest tango rev, with dmdfe 2.059
 
 * 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
