[ldc/f17] fix 32 build bug

MERCIER Jonathan bioinfornatics at fedoraproject.org
Wed Jun 6 14:10:15 UTC 2012


commit 07b754a2e7842d0ad82f9d05bfff3c6f01caf6d3
Author: Jonathan MERCIER <bioinfornatics at gmail.com>
Date:   Wed Jun 6 16:10:06 2012 +0200

    fix 32 build bug

 .gitignore |    3 +++
 ldc.spec   |   28 ++++------------------------
 sources    |    7 +++----
 3 files changed, 10 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 067decc..3d53e1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,6 @@ ldc-20100804hg1655.tar.xz
 /ldc-20120605git6ad085a.xz
 /ldc-phobos-20120605git2bc3677.xz
 /ldc-druntime-20120605git430c913.xz
+/ldc-20120606git260faae.xz
+/ldc-phobos-20120606git2bc3677.xz
+/ldc-druntime-20120606git430c913.xz
diff --git a/ldc.spec b/ldc.spec
index 6ff9e3c..d6c7ff9 100644
--- a/ldc.spec
+++ b/ldc.spec
@@ -1,6 +1,6 @@
 # debug info seem not works with D compiler
-%global     snapdate        20120605
-%global     ldc_rev         6ad085a
+%global     snapdate        20120606
+%global     ldc_rev         260faae
 %global     phobos_rev      2bc3677
 %global     druntime_rev    430c913
 %global     alphatag        %{snapdate}git%{ldc_rev}
@@ -35,7 +35,6 @@ Source0:        %{name}-%{alphatag}.xz
 Source1:        %{name}-phobos-%{phobostag}.xz
 Source2:        %{name}-druntime-%{druntimetag}.xz
 Source3:        macros.%{name}
-Source4:        DdocToDevhelp
 
 BuildRequires:  llvm-devel >= 3.0
 BuildRequires:  libconfig, libconfig-devel
@@ -153,22 +152,6 @@ Enable autocompletion for phobos library in geany (IDE)
 %description -l fr phobos-geany-tags
 Active l'autocompletion pour pour la bibliothèque phobos dans geany (IDE)
 
-%package phobos-devhelp
-Summary:        Phobos user and reference manuals
-Group:          Development/Tools
-Requires:       %{name} =  %{version}-%{release}
-BuildArch:      noarch
-BuildRequires:  python, python-BeautifulSoup
-Requires:       devhelp
-
-%description phobos-devhelp
-User Manual and Reference, Manual are provided in HTML format. You can use
-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.
-
 %prep
 %setup -q -n %{name}-%{alphatag}
 %setup -q -T -D -a 1 -n %{name}-%{alphatag}
@@ -198,8 +181,7 @@ find %{buildroot}/%{_includedir}/d/core -name "*.di" | xargs sed -i 's|/home/bui
 install --mode=0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.ldc
 # geany tags
 install -m0644 phobos.d.tags %{buildroot}/%{_datadir}/geany/tags/
-python  %{SOURCE4} -n Phobos -s %{buildroot}%{_includedir}/d/std/ -p %{buildroot}/%{_datadir}
-find %{buildroot}/%{_datadir}/devhelp/books/Phobos -name "*.html" | xargs sed -i "s|%{buildroot}||g" 
+
 
 %post   druntime    -p  /sbin/ldconfig
 %postun druntime    -p  /sbin/ldconfig
@@ -239,11 +221,9 @@ find %{buildroot}/%{_datadir}/devhelp/books/Phobos -name "*.html" | xargs sed -i
 %files phobos-geany-tags
 %{_datadir}/geany/tags/phobos.d.tags
 
-%files phobos-devhelp
-%{_datadir}/devhelp/books/Phobos
 
 %changelog
-* Sun Jun 03 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-20.20120602git6ad085a
+* Wed Jun 06 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-20.20120606git260faae
 - bump soname to 59
 
 * Sun Jun 03 2012 Jonathan MERCIER <bioinfornatics at gmail.com> - 2-18.20120602gitd24592b
diff --git a/sources b/sources
index d51f425..9e966fd 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,4 @@
-50710c8a539469e9f5865b2a8183469f  ldc-20120605git6ad085a.xz
-72271de8f33ae757d580080654a7bd9a  ldc-phobos-20120605git2bc3677.xz
-6c76b91ec9ba0d6cbe56ec3c527b8425  ldc-druntime-20120605git430c913.xz
+7bdb6dfabeb38e9c1abf8307262ac929  ldc-20120606git260faae.xz
+72271de8f33ae757d580080654a7bd9a  ldc-phobos-20120606git2bc3677.xz
+6c76b91ec9ba0d6cbe56ec3c527b8425  ldc-druntime-20120606git430c913.xz
 2207fd2545a5fc62c93e3ba72c89c4ca  macros.ldc
-68469857f4d68082d7500141c84f1c01  DdocToDevhelp


More information about the scm-commits mailing list