X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=gettext%2Fgettext.nm;h=7c7617bba11e0673e40c8fecf05afcf3a6d426c7;hb=df0e62db7f0c471e0d60a71adc1749996e9fbf9e;hp=0732fdffe8e069c3fd5f49f8417c61ff7537a712;hpb=b8b2278745bb2fe0a49aa9f8b3ff38d4592e4bfc;p=people%2Fms%2Fipfire-3.x.git

diff --git a/gettext/gettext.nm b/gettext/gettext.nm
index 0732fdffe..7c7617bba 100644
--- a/gettext/gettext.nm
+++ b/gettext/gettext.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = gettext
-version    = 0.18.1.1
-release    = 3
+version    = 0.18.2
+release    = 1
 
 groups     = System/Base
 url        = http://www.gnu.org/software/gettext/
@@ -30,6 +30,7 @@ source_dl  = http://ftp.gnu.org/pub/gnu/gettext/
 build
 	requires
 		bison
+		chrpath
 		libcroco-devel
 		libxml2-devel
 	end
@@ -39,30 +40,62 @@ build
 		--enable-shared \
 		--disable-rpath
 
-# Disable testsuite - it's broken ( readlink test )
-#	test
-#		make check
-#	end
+	test
+		make check
+	end
+
+	install_cmds
+		# cleanup rpaths
+		for i in $(find %{BUILDROOT}%{bindir} %{BUILDROOT}%{libdir} -type f); do
+			if file ${i} | grep "ELF 64-bit" >/dev/null; then
+				chrpath -l ${i} && chrpath --delete ${i}
+			fi
+		done
+
+		# Fix library permissions.
+		chmod 755 %{BUILDROOT}%{libdir}/preloadable_libintl.so
+	end
 end
 
 packages
 	package %{name}
-	
+
+	package %{name}-common-devel
+		summary = Common development files for gettext.
+		description = %{summary}
+		arch = noarch
+
+		files
+			/usr/share/gettext/
+		end
+	end
+
 	package %{name}-devel
 		template DEVEL
 
-		requires += \
+		requires
+			gettext-common-devel=%{thisver}
 			gettext-libs=%{thisver}
+			git
+		end
+
+		files += \
+			/usr/bin/autopoint \
+			/usr/share/man/man1/autopoint.1
 	end
 
 	package %{name}-libs
 		template LIBS
 
 		files
-			/usr/lib/libgettextlib-*.so
-			/usr/lib/libgettextpo.so.*
-			/usr/lib/libgettextsrc-*.so
-			/usr/lib/preloadable_libintl.so
+			%{libdir}/libgettextlib-*.so
+			%{libdir}/libgettextpo.so.*
+			%{libdir}/libgettextsrc-*.so
+			%{libdir}/preloadable_libintl.so
 		end
 	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end