packages: crossmingw64-gcc/crossmingw64-gcc.spec - dlls in the right place, ...

[pluto]

Author: pluto                        Date: Sun Apr 10 09:54:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dlls in the right place, release 1.

---- Files affected:
packages/crossmingw64-gcc:
   crossmingw64-gcc.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: packages/crossmingw64-gcc/crossmingw64-gcc.spec
diff -u packages/crossmingw64-gcc/crossmingw64-gcc.spec:1.21 packages/crossmingw64-gcc/crossmingw64-gcc.spec:1.22
--- packages/crossmingw64-gcc/crossmingw64-gcc.spec:1.21	Sun Apr 10 11:21:32 2011
+++ packages/crossmingw64-gcc/crossmingw64-gcc.spec	Sun Apr 10 11:54:50 2011
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-# TODO: host _bindir is not the place for Win64 .dll!
 #
 # Conditional build:
 %bcond_with	bootstrap	# bootstrap build (only C compiler with static runtime)
@@ -12,7 +11,7 @@
 Summary(tr.UTF-8):	GNU geliştirme araçları - Mingw64 gcc
 Name:		crossmingw64-gcc
 Version:	4.6.0
-Release:	0.1
+Release:	1
 Epoch:		1
 License:	GPL v3+
 Group:		Development/Languages
@@ -158,13 +157,6 @@
 
 install gcc/specs $RPM_BUILD_ROOT%{gcclib}
 
-%if %{without bootstrap}
-if [ ! -f "$RPM_BUILD_ROOT%{_bindir}/libgcc_s_sjlj-1.dll" ]; then
-	echo "libgcc_s_sjlj-1.dll install still broken?"
-	install %{target}/libgcc/shlib/libgcc_s_sjlj-1.dll $RPM_BUILD_ROOT%{_bindir}
-fi
-%endif
-
 cd ..
 
 gccdir=$RPM_BUILD_ROOT%{gcclib}
@@ -237,7 +229,7 @@
 %{gcclib}/*.o
 %{gcclib}/libgcc.a
 %if %{without bootstrap}
-%{_bindir}/libgcc_s_sjlj-1.dll
+%{arch}/lib/libgcc_s_sjlj-1.dll
 %{gcclib}/libgcc_eh.a
 %endif
 %{gcclib}/libgcov.a
@@ -258,7 +250,7 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{target}-[cg]++
 %attr(755,root,root) %{gcclib}/cc1plus
-%{_bindir}/libstdc++-6.dll
+%{arch}/lib/libstdc++-6.dll
 %{arch}/lib/libstdc++.a
 %{arch}/lib/libstdc++.la
 %{arch}/lib/libsupc++.a
@@ -273,6 +265,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2011/04/10 09:54:50  pluto
+- dlls in the right place, release 1.
+
 Revision 1.21  2011/04/10 09:21:32  pluto
 - updated to 4.6.0 (release 0.1 for bootstrap).
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/crossmingw64-gcc/crossmingw64-gcc.spec?r1=1.21&r2=1.22&f=u