Use %{_prefix}/lib/gcc instead of %{_libdir}/gcc

1 files changed, 59 insertions, 65 deletions

diff --git a/cygwin-gcc.spec b/cygwin-gcc.spec
index 6eaa364..6a2d90c 100644
--- a/cygwin-gcc.spec
+++ b/cygwin-gcc.spec
@@ -7,7 +7,7 @@
 %global gcc_version %{gcc_major}.%{gcc_minor}.%{gcc_micro}
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %%{release}, append them after %%{gcc_release} on Release: line.
-%global gcc_release 2
+%global gcc_release 3
 
 %global build_ada 0
 # building cross-gnat requires matching X.Y version of native gnat
@@ -27,7 +27,6 @@ Summary:        Cygwin GCC cross-compiler
 License:        GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions
 Group:          Development/Languages
 URL:            http://gcc.gnu.org
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  texinfo
 BuildRequires:  cygwin32-filesystem
@@ -214,12 +213,8 @@ enablelada=,ada
 CC="%{__cc} ${RPM_OPT_FLAGS}" \
 ../configure \
   --prefix=%{_prefix} \
-  --bindir=%{_bindir} \
-  --includedir=%{_includedir} \
-  --libdir=%{_libdir} \
   --mandir=%{_mandir} \
   --infodir=%{_infodir} \
-  --datadir=%{_datadir} \
   --build=%_build --host=%_host \
   --target=%{cygwin32_target} \
   --with-arch=i686 --with-tune=generic \
@@ -253,8 +248,6 @@ popd
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 pushd build_cyg32
 make DESTDIR=$RPM_BUILD_ROOT install
 
@@ -273,8 +266,8 @@ ln -sf ..%{_prefix}/bin/%{cygwin32_target}-cpp \
 # libtool installs DLL files of runtime libraries into $(libdir)/../bin,
 # but we need them in cygwin32_bindir.
 mkdir -p $RPM_BUILD_ROOT%{cygwin32_bindir}
-mv $RPM_BUILD_ROOT%{_libdir}/gcc/%{cygwin32_target}/*.dll \
-  $RPM_BUILD_ROOT%{_libdir}/gcc/%{cygwin32_target}/%{gcc_version}/*.dll \
+mv $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{cygwin32_target}/*.dll \
+  $RPM_BUILD_ROOT%{_prefix}/lib/gcc/%{cygwin32_target}/%{gcc_version}/*.dll \
   $RPM_BUILD_ROOT%{cygwin32_bindir}
 
 # Don't want the *.la files.
@@ -297,34 +290,34 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{cygwin32_target}-gcc-nm
 %{_bindir}/%{cygwin32_target}-gcc-ranlib
 %{_bindir}/%{cygwin32_target}-gcov
-%dir %{_libdir}/gcc/%{cygwin32_target}
-%dir %{_libdir}/gcc/%{cygwin32_target}/%{version}
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/crtbegin.o
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/crtend.o
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/crtfastmath.o
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libatomic.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libatomic.dll.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libgcc.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libgcc_eh.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libgcc_s.dll.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libgcov.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libgomp.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libgomp.dll.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libgomp.spec
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libquadmath.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libquadmath.dll.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libssp.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libssp_nonshared.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libssp.dll.a
-%dir %{_libdir}/gcc/%{cygwin32_target}/%{version}/include
-%dir %{_libdir}/gcc/%{cygwin32_target}/%{version}/include/ssp
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/include/[^j]*.h
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/include/ssp/*.h
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/include-fixed/
-%dir %{_libdir}/gcc/%{cygwin32_target}/%{version}/install-tools
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/install-tools/*
+%dir %{_prefix}/lib/gcc/%{cygwin32_target}
+%dir %{_prefix}/lib/gcc/%{cygwin32_target}/%{version}
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/crtbegin.o
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/crtend.o
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/crtfastmath.o
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libatomic.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libatomic.dll.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libgcc.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libgcc_eh.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libgcc_s.dll.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libgcov.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libgomp.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libgomp.dll.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libgomp.spec
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libquadmath.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libquadmath.dll.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libssp.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libssp_nonshared.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libssp.dll.a
+%dir %{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/include
+%dir %{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/include/ssp
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/include/[^j]*.h
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/include/ssp/*.h
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/include-fixed/
+%dir %{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/install-tools
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/install-tools/*
 %dir %{_libexecdir}/gcc/%{cygwin32_target}/%{version}/install-tools
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/plugin/
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/plugin/
 %{_libexecdir}/gcc/%{cygwin32_target}/%{version}/install-tools/*
 %{_libexecdir}/gcc/%{cygwin32_target}/%{version}/liblto_plugin.so
 %{_libexecdir}/gcc/%{cygwin32_target}/%{version}/lto1
@@ -346,8 +339,8 @@ rm -rf $RPM_BUILD_ROOT
 /lib/%{cygwin32_target}-cpp
 %{_bindir}/%{cygwin32_target}-cpp
 %{_mandir}/man1/%{cygwin32_target}-cpp.1*
-%dir %{_libdir}/gcc/%{cygwin32_target}
-%dir %{_libdir}/gcc/%{cygwin32_target}/%{version}
+%dir %{_prefix}/lib/gcc/%{cygwin32_target}
+%dir %{_prefix}/lib/gcc/%{cygwin32_target}/%{version}
 %{_libexecdir}/gcc/%{cygwin32_target}/%{version}/cc1
 
 
@@ -355,14 +348,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/%{cygwin32_target}-g++
 %{_bindir}/%{cygwin32_target}-c++
 %{_mandir}/man1/%{cygwin32_target}-g++.1*
-%dir %{_libdir}/gcc/%{cygwin32_target}/%{version}/include/c++
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/include/c++/[^gjos]*
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/include/c++/os*
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/include/c++/s[^u]*
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libstdc++.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libstdc++.dll.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libstdc++.dll.a-gdb.py
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libsupc++.a
+%dir %{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/include/c++
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/include/c++/[^gjos]*
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/include/c++/os*
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/include/c++/s[^u]*
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libstdc++.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libstdc++.dll.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libstdc++.dll.a-gdb.py
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libsupc++.a
 %{_libexecdir}/gcc/%{cygwin32_target}/%{version}/cc1plus
 %{_libexecdir}/gcc/%{cygwin32_target}/%{version}/collect2
 %dir %{_datadir}/gcc-%{gcc_version}/%{cygwin32_target}/python
@@ -371,33 +364,30 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files -n cygwin32-gcc-objc
-%defattr(-,root,root,-)
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/include/objc/
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libobjc.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libobjc.dll.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/include/objc/
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libobjc.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libobjc.dll.a
 %{_libexecdir}/gcc/%{cygwin32_target}/%{version}/cc1obj
 %{cygwin32_bindir}/cygobjc-4.dll
 
 
 %files -n cygwin32-gcc-objc++
-%defattr(-,root,root,-)
 %{_libexecdir}/gcc/%{cygwin32_target}/%{version}/cc1objplus
 
 
 %files -n cygwin32-gcc-gfortran
-%defattr(-,root,root,-)
 %{_bindir}/%{cygwin32_target}-gfortran
 %{_mandir}/man1/%{cygwin32_target}-gfortran.1*
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libcaf_single.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libgfortran.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libgfortran.dll.a
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libgfortran.spec
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/libgfortranbegin.a
-%dir %{_libdir}/gcc/%{cygwin32_target}/%{version}/finclude
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/finclude/omp_lib.f90
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/finclude/omp_lib.h
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/finclude/omp_lib.mod
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/finclude/omp_lib_kinds.mod
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libcaf_single.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libgfortran.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libgfortran.dll.a
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libgfortran.spec
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/libgfortranbegin.a
+%dir %{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/finclude
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/finclude/omp_lib.f90
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/finclude/omp_lib.h
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/finclude/omp_lib.mod
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/finclude/omp_lib_kinds.mod
 %{_libexecdir}/gcc/%{cygwin32_target}/%{version}/f951
 %{cygwin32_bindir}/cyggfortran-3.dll
 
@@ -406,8 +396,8 @@ rm -rf $RPM_BUILD_ROOT
 %files -n cygwin32-gcc-gnat
 %{_bindir}/%{cygwin32_target}-gnat*
 #%%{_mandir}/man1/%%{cygwin32_target}-gnat*.1*
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/adainclude/
-%{_libdir}/gcc/%{cygwin32_target}/%{version}/adalib/
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/adainclude/
+%{_prefix}/lib/gcc/%{cygwin32_target}/%{version}/adalib/
 %{_libexecdir}/gcc/%{cygwin32_target}/%{version}/gnat1
 #%%{cygwin32_bindir}/cyggnarl-4.7.dll
 #%%{cygwin32_bindir}/cyggnat-4.7.dll
@@ -415,6 +405,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 30 2014 Yaakov Selkowitz <yselkowitz@cygwin.com> - 4.8.3-3
+- Use %%{_prefix}/lib/gcc instead of %%{_libdir}/gcc
+- Cleanup spec
+
 * Fri Jul 25 2014 Yaakov Selkowitz <yselkowitz@cygwin.com> - 4.8.3-2
 - Add patch to fix libgcc deregistration on x86