Remove *-libs.

Install to sys-root/mingw.
Cosmetics.

4 files changed, 10 insertions, 56 deletions

diff --git a/contrib/crossrpms/mingw32/libs.add b/contrib/crossrpms/mingw32/libs.add
index 0e86782965..25823f2d0f 100644
--- a/contrib/crossrpms/mingw32/libs.add
+++ b/contrib/crossrpms/mingw32/libs.add
@@ -1,14 +1,10 @@
-#
-# spec file for package @tool_target@
-# 
-
 %define mingw32_version @MINGW32_VERS@
 %define mingw32_rpmvers %{expand: %(echo @MINGW32_VERS@ | tr - _)} 
 
 %define _use_internal_dependency_generator 0
 %define __debug_install_post %{nil}
 
-Name:         @tool_target@
+Name:         @rpmprefix@@tool_target@
 Release:      @MINGW32_RPMREL@%{?dist}
 License:      GPL
 Group:        Development/Tools
@@ -20,7 +16,7 @@ Version:      	%mingw32_rpmvers
 Summary:      	MinGW Libraries
 
 Source0:	http://dl.sourceforge.net/sourceforge/mingw/mingw-runtime-%{mingw32_version}.tar.gz
-NoSource:	0
+%{?!_with_sources:NoSource:	0}
 
 %description
 Mingw libraries.
@@ -32,14 +28,8 @@ Mingw libraries.
   rm -rf @tool_target@
 
   # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root/usr
-  cp -a include lib @tool_target@/sys-root/usr
-
-  # Setup sys-lib and sys-include (Required by gcc < 3.4)
-  mkdir -p @tool_target@/lib
-  cp -a @tool_target@/sys-root/usr/lib/* @tool_target@/lib
-  mkdir -p @tool_target@/include
-  cp -a @tool_target@/sys-root/usr/include/* @tool_target@/include
+  mkdir -p @tool_target@/sys-root/mingw
+  cp -a include lib @tool_target@/sys-root/mingw
 
 %install
   rm -rf $RPM_BUILD_ROOT
diff --git a/contrib/crossrpms/mingw32/target-libs.add b/contrib/crossrpms/mingw32/target-libs.add
index b3d73c8b79..0550fc7c07 100644
--- a/contrib/crossrpms/mingw32/target-libs.add
+++ b/contrib/crossrpms/mingw32/target-libs.add
@@ -1,22 +1,9 @@
-%package libs
-Group: Development/Tools
-Summary: @tool_target@ target files for gcc < 3.4
-
-%description libs
-MinGW target files or gcc < 3.4
-
-%files libs
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/include
-%{_prefix}/@tool_target@/lib
-
 %package sys-root
 Group: Development/Tools
 Summary: @tool_target@ target files for gcc >= 3.4
 
 %description sys-root
-MinGW target files for gcc >= 3.4
+@tool_target@ target files for gcc >= 3.4
 
 %files sys-root
 %defattr(-,root,root,-)
diff --git a/contrib/crossrpms/mingw32/target-w32api.add b/contrib/crossrpms/mingw32/target-w32api.add
index b3d73c8b79..0550fc7c07 100644
--- a/contrib/crossrpms/mingw32/target-w32api.add
+++ b/contrib/crossrpms/mingw32/target-w32api.add
@@ -1,22 +1,9 @@
-%package libs
-Group: Development/Tools
-Summary: @tool_target@ target files for gcc < 3.4
-
-%description libs
-MinGW target files or gcc < 3.4
-
-%files libs
-%defattr(-,root,root,-)
-%dir %{_prefix}/@tool_target@
-%{_prefix}/@tool_target@/include
-%{_prefix}/@tool_target@/lib
-
 %package sys-root
 Group: Development/Tools
 Summary: @tool_target@ target files for gcc >= 3.4
 
 %description sys-root
-MinGW target files for gcc >= 3.4
+@tool_target@ target files for gcc >= 3.4
 
 %files sys-root
 %defattr(-,root,root,-)
diff --git a/contrib/crossrpms/mingw32/w32api.add b/contrib/crossrpms/mingw32/w32api.add
index c989d58075..e38badfc78 100644
--- a/contrib/crossrpms/mingw32/w32api.add
+++ b/contrib/crossrpms/mingw32/w32api.add
@@ -1,14 +1,10 @@
-#
-# spec file for package @tool_target@
-# 
-
 %define w32api_version @W32API_VERS@
 %define w32api_rpmvers %{expand: %(echo @W32API_VERS@ | tr - _)} 
 
 %define _use_internal_dependency_generator 0
 %define __debug_install_post %{nil}
 
-Name:         @tool_target@-w32api
+Name:         @rpmprefix@@tool_target@-w32api
 Release:      @W32API_RPMREL@%{?dist}
 License:      GPL
 Group:        Development/Tools
@@ -20,7 +16,7 @@ Version:      	%w32api_rpmvers
 Summary:      	MinGW Libraries
 
 Source0:	http://dl.sourceforge.net/sourceforge/mingw/w32api-%{w32api_version}.tar.gz
-NoSource:	0
+%{?!_with_sources:NoSource:	0}
 
 %description
 Mingw libraries.
@@ -32,14 +28,8 @@ Mingw libraries.
   rm -rf @tool_target@
 
   # Setup sys-root (Usable for gcc >= 3.4)
-  mkdir -p @tool_target@/sys-root/usr
-  cp -a include lib @tool_target@/sys-root/usr
-
-  # Setup sys-lib and sys-include (Required by gcc < 3.4)
-  mkdir -p @tool_target@/lib
-  cp -a @tool_target@/sys-root/usr/lib/* @tool_target@/lib
-  mkdir -p @tool_target@/include
-  cp -a @tool_target@/sys-root/usr/include/* @tool_target@/include
+  mkdir -p @tool_target@/sys-root/mingw
+  cp -a include lib @tool_target@/sys-root/mingw
 
 %install
   rm -rf $RPM_BUILD_ROOT