[ldc] fix doc for devhelp
MERCIER Jonathan
bioinfornatics at fedoraproject.org
Thu Jan 5 10:26:43 UTC 2012
commit 8a9d4bc3f07abb1b5bd87f49bfb61f0abd5447ff
Author: Jonathan MERCIER <bioinfornatics at gmail.com>
Date: Thu Jan 5 11:25:32 2012 +0100
fix doc for devhelp
ldc.spec | 20 +++++++++++---------
sources | 2 +-
2 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/ldc.spec b/ldc.spec
index 3cb6d87..95d3f92 100644
--- a/ldc.spec
+++ b/ldc.spec
@@ -23,7 +23,7 @@
Name: ldc
Version: 2
-Release: 9.%{alphatag}%{?dist}
+Release: 10.%{alphatag}%{?dist}
Summary: A compiler for the D programming language
Group: Development/Languages
@@ -157,7 +157,8 @@ Active l'autocompletion pour pour la bibliothèque phobos dans geany (IDE)
Summary: Phobos user and reference manuals
Group: Development/Tools
Requires: %{name} = %{version}-%{release}
-BuildRequires: python
+BuildArch: noarch
+BuildRequires: python, python-BeautifulSoup
Requires: devhelp
%description phobos-devhelp
@@ -166,7 +167,7 @@ devhelp to browse it.
%description -l fr phobos-devhelp
Manuel et référence, le manuel est fournit au format HTML. Vous pouez utilisez
-devhelp pour le parcourir
+devhelp pour le parcourir.
%prep
%setup -q -n %{name}-%{alphatag}
@@ -175,8 +176,6 @@ devhelp pour le parcourir
find . -type f -exec sed -i 's/\r//g' {} \;
# temp geany config directory for allow geany to generate tags
mkdir geany_config
-# fix install
-# sed -i "81a \ \ \ \ file(COPY \${RUNTIME_DIR}/src/core/bitop.d DESTINATION \${PROJECT_BINARY_DIR}/import/core/ )" runtime/CMakeLists.txt
%build
%cmake -DMULTILIB:BOOL=OFF -DBUILD_SHARED_LIBS:BOOL=ON -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/d .
@@ -185,21 +184,21 @@ make %{?_smp_mflags} VERBOSE=2 phobos2
# generate geany tags
geany -c geany_config -g phobos.d.tags $(find runtime/phobos/std -name "*.d")
+find import -name "*.di" | xargs sed -i "s|%{_buildir}/%{name}-%{alphatag}/runtime/druntime/src|/usr/include/d|g"
+
%install
rm -rf %{buildroot}
make %{?_smp_mflags} install DESTDIR=%{buildroot}
mkdir -p %{buildroot}/%{_sysconfdir}/rpm
mkdir -p %{buildroot}/%{_includedir}/d/ldc
mkdir -p %{buildroot}/%{_datadir}/geany/tags/
-mkdir -p %{buildroot}/%{_datadir}/devhelp/books/Phobos
+
# macros for D package
install --mode=0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.ldc
# geany tags
install -m0755 phobos.d.tags %{buildroot}/%{_datadir}/geany/tags/
%{SOURCE4} -n Phobos -s %{buildroot}/%{_includedir}/d/std/ -p %{buildroot}/%{_datadir}
-
-%clean
-rm -rf %{buildroot}
+find %{buildroot}/%{_datadir}/devhelp/books/Phobos -name "*.html" | xargs sed -i "s|%{buildroot}||g"
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -248,6 +247,9 @@ rm -rf %{buildroot}
%{_datadir}/devhelp/books/Phobos
%changelog
+* Fri Jan 5 2012 Jonathan MERCIER <bioinfornatics at fedoraproject.org> - 2-10.20111206gitfa5fb92
+- fix doc for devhelp
+
* Fri Dec 9 2011 Jonathan MERCIER <bioinfornatics at fedoraproject.org> - 2-9.20111206gitfa5fb92
- Add doc for devhelp
diff --git a/sources b/sources
index b4a63c7..503b214 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
9a95822ae7fefb6c266fd6e96c661dd3 ldc-phobos-20111206git2bebc8f.xz
d33f4c6fa8996369713f78b61ce07cf6 ldc-20111206gitfa5fb92.xz
76175ce1c81e0de72618f52424d6ef56 ldc-druntime-20111206git24e79c6.xz
-2ebfc9aef7ae79bb663dfaab59baa7c8 DdocToDevhelp
+7f337f892b714673e304cc25d39b521d DdocToDevhelp
2207fd2545a5fc62c93e3ba72c89c4ca macros.ldc
More information about the scm-commits
mailing list