From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 16 Dec 2011 15:38:52 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9507da1155fc38b123e29da356e41f630f6ebf29;p=people%2Fpmueller%2Fipfire-3.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
	pth/pth.nm
---

9507da1155fc38b123e29da356e41f630f6ebf29
diff --cc gcc/gcc.nm
index f8129076d,8fd265ac8..575cd893d
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@@ -445,23 -289,13 +445,27 @@@ package
  		end
  	end
  
 -	package libquadmath-devel
 +	package gcc-plugin-devel
 +		summary = Support for compiling GCC plugins.
 +		description
 +			This package contains header files and other support files
 +			for compiling GCC plugins.  The GCC plugin ABI is currently
 +			not stable, so plugins must be rebuilt any time GCC is updated.
 +		end
 +
 +		requires
 +			gcc=%{thisver}
 +			gmp-devel>=4.1.2-8
 +			mpfr-devel>=2.2.1
 +			libmpc-devel>=0.8.1
 +		end
 +
  		files
 -			/usr/lib/libquadmath*.so
 +			/usr/lib/gcc/%{DISTRO_BUILDTARGET}/%{version}/plugin
  		end
  	end
+ 
+ 	package %{name}-debuginfo
+ 		template DEBUGINFO
+ 	end
  end