[ldc/f13/master] some fix

MERCIER Jonathan bioinfornatics at fedoraproject.org
Mon Aug 30 18:18:25 UTC 2010


commit 9a02305f438ce5cd3ce846cc590bb2f0c3c3826d
Author: bioinfornatics <bioinfornatics at gmail.com>
Date:   Mon Aug 30 20:17:37 2010 +0200

    some fix

 .gitignore |    1 +
 ldc.spec   |   11 +++++++----
 sources    |    2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 31e5d8d..cf87e6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 ldc-20100609hg1653.tar.xz
 ldc-20100609hg1654.tar.xz
 ldc-20100804hg1655.tar.xz
+/ldc-20100804hg1655.tar.xz
diff --git a/ldc.spec b/ldc.spec
index e66dca2..289760b 100644
--- a/ldc.spec
+++ b/ldc.spec
@@ -8,8 +8,8 @@
 
 Name:           ldc
 Version:        0.9.2
-Release:        16.%{alphatag}%{hg_revision}%{?dist}
-Summary:        It is a compiler for the D programming language
+Release:        17.%{alphatag}%{hg_revision}%{?dist}
+Summary:        A compiler for the D programming language
 
 Group:          Development/Languages
 # The DMD frontend in dmd/* GPL version 1 or artistic license
@@ -80,12 +80,12 @@ sed -i -e   "s|-I.*/../tango\"|-I /usr/include/d/tango\"|"
     -e      "/^.*-I.*%{name}-%{alphatag}%{hg_revision}\/..\/tango\/user.*$/d"           \
     -e      "/^.*-I.*%{name}-%{alphatag}%{hg_revision}\/..\/tango\/lib\/common.*$/d"    \
     -e      "s|-I.*/../tango/tango/core/vendor|-I /usr/include/d/tango/core/vendor|"   \
-    -e      "s|-L-L\%\%ldcbinarypath\%\%/../lib|-L-L%{_libdir}/d|"                      \
+    -e      "s|-L-L\%\%ldcbinarypath\%\%/../lib|-L-L%{_libdir}|"                      \
     -e      "s|-defaultlib=tango-user-ldc|-defaultlib=tango|"                           \
     -e      "s|-debuglib=tango-user-ldc|-debuglib=tango|"                               \
     -e      "13a \ \ \ \ \ \ \ \ \"-I /usr/include/d/\"," %{buildroot}%{_sysconfdir}/ldc.conf
 
-sed -i "s|DFLAGS.*|DFLAGS=-I/usr/include/d -L-L %{_libdir}/d -d-version=Tango -defaultlib=tango -debuglib=tango|" %{buildroot}%{_sysconfdir}/ldc.rebuild.conf
+sed -i "s|DFLAGS.*|DFLAGS=-I/usr/include/d -L-L %{_libdir} -d-version=Tango -defaultlib=tango -debuglib=tango|" %{buildroot}%{_sysconfdir}/ldc.rebuild.conf
 
 chmod 755 %{buildroot}%{_bindir}/ldmd
 
@@ -102,6 +102,9 @@ rm -rf %{buildroot}
 %config(noreplace)  %{_sysconfdir}/rpm/macros.ldc
 
 %changelog
+* Thu Aug 26 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 0.9.2-17.20100609hg1655
+- use %%{_libdir} instead %%{_libdir}/d
+
 * Fri Aug 12 2010 Jonathan MERCIER <bioinfornatics at gmail.com> 0.9.2-16.20100609hg1655
 - fix minor bug in /etc/ldc.conf
 
diff --git a/sources b/sources
index 842a1a9..6a08dc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5869206cf9d7c0beee73be8a0bbdb6d7  ldc-20100804hg1655.tar.xz
+b4400e56746beedd9a26c302e4e2837a  ldc-20100804hg1655.tar.xz


More information about the scm-commits mailing list