[tango] New release
MERCIER Jonathan
bioinfornatics at fedoraproject.org
Mon Feb 6 14:14:10 UTC 2012
commit 68d7a75f4b3b76d19c3480fe581d492adc912296
Author: Jonathan MERCIER <bioinfornatics at gmail.com>
Date: Mon Feb 6 15:14:08 2012 +0100
New release
.gitignore | 1 +
sources | 3 +-
tango.spec | 61 ++++++++++++++++++++++++++++++-----------------------------
3 files changed, 33 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8dc0fd6..892a630 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/tango-20101012svn5569.tar.xz
/tango-20111231git7048209.xz
/DdocToDevhelp
+/tango-20120206gitc6be365.xz
diff --git a/sources b/sources
index 4e0db49..e622a5d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-1d4dbd80924cfb61c509c0bcf81b48d6 tango-20111231git7048209.xz
-d4589c353570552e2d5b8adf87e492f7 DdocToDevhelp
+6a0330a10714b3490701f98978c7f93e tango-20120206gitc6be365.xz
diff --git a/tango.spec b/tango.spec
index 6678a06..8b5b004 100644
--- a/tango.spec
+++ b/tango.spec
@@ -1,5 +1,5 @@
-%global alphatag 20111231
-%global tango_revision git7048209
+%global alphatag 20120206
+%global tango_revision gitc6be365
%global debug_package %{nil}
# The source for this package was pulled from upstream's git.
@@ -11,7 +11,7 @@
Name: tango
Version: 2
-Release: 1.%{alphatag}%{tango_revision}%{?dist}
+Release: 2.%{alphatag}%{tango_revision}%{?dist}
Summary: The Developer's Library for D
Group: Development/Libraries
@@ -134,21 +134,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}
+#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 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
@@ -158,40 +158,38 @@ 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
+#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 .
-#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
+#./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
# 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/
# Tango
-cp -p ./lib%{name}.a %{buildroot}%{_libdir}/lib%{name}.a
-cp -rp %{name}/* %{buildroot}%{_d_includedir}/%{name}/
+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
# 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"
+#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_tango.txt LICENSE.txt
-%{_libdir}/lib%{name}.a
+%doc README.md LICENSE.txt
+%{_libdir}/lib%{name}-ldc.a
%{_d_includedir}/%{name}
+%{_datadir}/pkgconfig/%{name}.pc
%files doc
%doc doc/example
@@ -199,10 +197,13 @@ find %{buildroot}/%{_datadir}/devhelp/books/Tango -name "*.html" | xargs sed -i
%files geany-tags
%{_datadir}/geany/tags/%{name}.d.tags
-%files devhelp
-%{_datadir}/devhelp/books/Tango
+#%files devhelp
+#%{_datadir}/devhelp/books/Tango
%changelog
+* Mon Feb 06 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-2.20120206gitfcb803f
+- update to latest git rev c6be365
+
* Sat Jan 7 2012 Jonathan MERCIER <bioinfornatics at gmail.com> 2-1.20111231git7048209
- Update Tango to new major release D2 support
More information about the scm-commits
mailing list