[tango] Update to Tango 2
MERCIER Jonathan
bioinfornatics at fedoraproject.org
Sat Jan 7 18:19:20 UTC 2012
commit b75b82a4254843feea7b0830c2b821a54c51db3a
Author: Jonathan MERCIER <bioinfornatics at gmail.com>
Date: Sat Jan 7 19:19:16 2012 +0100
Update to Tango 2
.gitignore | 2 +
sources | 3 +-
tango.spec | 116 ++++++++++++++++++++++++++++++++++++++++++-----------------
3 files changed, 86 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c968494..8dc0fd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/tango-20100826svn5543.tar.xz
/tango-20100919svn5561.tar.xz
/tango-20101012svn5569.tar.xz
+/tango-20111231git7048209.xz
+/DdocToDevhelp
diff --git a/sources b/sources
index 457099c..4e0db49 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-9b7ec01de018620c5b8b68ec8e543bd8 tango-20101012svn5569.tar.xz
+1d4dbd80924cfb61c509c0bcf81b48d6 tango-20111231git7048209.xz
+d4589c353570552e2d5b8adf87e492f7 DdocToDevhelp
diff --git a/tango.spec b/tango.spec
index 12cf2d8..7e0ba2e 100644
--- a/tango.spec
+++ b/tango.spec
@@ -1,15 +1,17 @@
-%global alphatag 20101012
-%global svn_revision svn5569
-%global debug_package %{nil}
+%global alphatag 20111231
+%global tango_revision git7048209
+%global debug_package %{nil}
-# The source for this package was pulled from upstream's subversion (svn).
+# The source for this package was pulled from upstream's git.
# Use the following commands to generate the tarball:
-# svn export -r 5569 http://svn.dsource.org/projects/tango/trunk tango-20101012svn5569
-# tar -cJvf tango-20101012svn5569.tar.xz tango-20101012svn5569
+# 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
Name: tango
-Version: 0.99.9
-Release: 22.%{alphatag}%{svn_revision}%{?dist}
+Version: 2
+Release: 1.%{alphatag}%{tango_revision}%{?dist}
Summary: The Developer's Library for D
Group: Development/Libraries
@@ -19,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}%{svn_revision}.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: %{name}-%{alphatag}%{tango_revision}.xz
+Source1: DdocToDevhelp
-BuildRequires: ldc
-BuildRequires: ruby
+BuildRequires: ldc, gcc, ruby
%description
Tango is a cohesive and comprehensive library for the D programming language,
@@ -82,8 +83,6 @@ représente un facteur important pour utiliser cette bibliothèque, et ce projet
a une documentation de bonne qualité autant que les fonctionnalité, haut de
gamme qu'elle propose.
-
-
%package doc
Summary: Documentation and examples for %{name}
Group: Documentation
@@ -121,40 +120,90 @@ Exemple en:
- teste et xml
- système virtuel de fichier
+%package geany-tags
+Summary: Support for enable autocompletion in geany
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
+BuildRequires: geany
+Requires: geany
+
+%description geany-tags
+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
+
+%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}%{svn_revision}
+%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 -o "%{_d_optflags}" -p linux .
+./build/script/bob.rb -v -r ldc -c ldc -p linux .
+#ldc2 ./build/src/bob.d -of./build/bin/bob
+#./build/bin/bob -c ldc2 -o "%{_d_optflags}" -p linux -d
+#objects=$(find -name "*.o" )
+#gcc -shared ${objects} -o libtango.so
+
+# generate geany tags
+geany -c geany_config -g tango.d.tags $(find tango/ -name "*.d")
%install
-rm -rf %{buildroot}
-rm -rf %{name}/core/rt
-mkdir -p %{buildroot}%{_libdir}/
-mkdir -p %{buildroot}%{_d_includedir}/%{name}
+mkdir -p %{buildroot}%{_libdir}/
+mkdir -p %{buildroot}%{_d_includedir}/%{name}
+mkdir -p %{buildroot}/%{_datadir}/geany/tags/
-cp -p ./libtango.a %{buildroot}%{_libdir}/libtango.a
+# Tango
+cp -p ./lib%{name}.a %{buildroot}%{_libdir}/lib%{name}.a
cp -rp %{name}/* %{buildroot}%{_d_includedir}/%{name}/
-cp -rp object.di %{buildroot}%{_d_includedir}/
-%clean
-rm -rf %{buildroot}
+# Geany tag
+install -m0755 tango.d.tags %{buildroot}/%{_datadir}/geany/tags/
+
+# Devhelp
+%{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
-%defattr(-,root,root,-)
-%doc README.txt LICENSE.txt
-%{_libdir}/libtango.a
-%{_d_includedir}/%{name}
-%{_d_includedir}/object.di
+%doc README_tango.txt LICENSE.txt
+%{_libdir}/lib%{name}.a
+%{_d_includedir}/%{name}
+
%files doc
-%defattr(-,root,root,-)
%doc doc/example
+%files geany-tags
+%{_datadir}/geany/tags/%{name}.d.tags
+
+%files devhelp
+%{_datadir}/devhelp/books/Tango
+
%changelog
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.9-22.20101012svn5569
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* Sat Jan 7 2012 Jonathan MERCIER <bioinfornatics at gmail.com> 2-1.20111231git7048209
+- Update Tango to new major release D2 support
* Wed Oct 13 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 0.99.9-21.20101012svn5569
- Update to revision 5569
@@ -190,8 +239,7 @@ rm -rf %{buildroot}
- merge doc and example
* Tue Aug 03 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 0.99.9-11.20100802svn5515
-- replace rm -rf
-%%{name}/core/rt/compiler with rm -rf %%{name}/core/rt
+- replace rm -rf %%{name}/core/rt/compiler with rm -rf %%{name}/core/rt
- add package for doc and example
* Mon Aug 02 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 0.99.9-10.20100802svn5515
More information about the scm-commits
mailing list