X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=acl%2Facl.nm;h=8c6f0c4de1acd48232b85fff9e1ab26b4001c236;hb=4286b9f6dc0ffdc229ecd40ba0436b95cb948210;hp=f75a039ffd48aecddd294a41f4bfdf201f9c30ad;hpb=e84b24e82329d16ca18bff7966d4f02d997bc965;p=people%2Fms%2Fipfire-3.x.git

diff --git a/acl/acl.nm b/acl/acl.nm
index f75a039ff..8c6f0c4de 100644
--- a/acl/acl.nm
+++ b/acl/acl.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = acl
-version    = 2.2.47
+version    = 2.2.51
 release    = 1
 
 groups     = System/Filesystems
@@ -17,7 +17,8 @@ description
 	manipulating access control lists.
 end
 
-source_dl  = ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/
+source_dl  = http://download-mirror.savannah.gnu.org/releases/acl/
+sources    = %{thisapp}.src.tar.gz
 
 build
 	requires
@@ -29,30 +30,45 @@ build
 
 	configure_options += \
 		--bindir=/bin \
-		--disable-static \
-		--mandir=/usr/share/man
+		--disable-static
 
 	make_build_targets += LIBTOOL="libtool --tag=CC"
 
+	test
+		make tests
+	end
+
 	install_cmds
-		mkdir -pv %{BUILDROOT}/{,usr/}lib %{BUILDROOT}/usr/include/{acl,sys}
-		install -v -m0755 %{DIR_APP}/libacl/.libs/libacl.so.1.2.0 %{BUILDROOT}/lib
-		ln -vsf libacl.so.1.2.0 %{BUILDROOT}/lib/libacl.so.1
-		ln -vsf ../../lib/libacl.so.1 %{BUILDROOT}/usr/lib/libacl.so
-		cp -vf %{DIR_APP}/include/libacl.h %{BUILDROOT}/usr/include/acl/
-		cp -vf %{DIR_APP}/include/acl.h %{BUILDROOT}/usr/include/sys/
+		mkdir -pv %{BUILDROOT}%{libdir}
+		install -v -m0755 libacl/.libs/libacl.so.1.1.0 %{BUILDROOT}%{libdir}
+		ln -vsf libacl.so.1.1.0 %{BUILDROOT}%{libdir}/libacl.so.1
+		ln -vsf libacl.so.1 %{BUILDROOT}%{libdir}/libacl.so
+
+		# Install headers.
+		mkdir -pv %{BUILDROOT}%{includedir}/{acl,sys}
+		cp -vf include/libacl.h %{BUILDROOT}%{includedir}/acl/
+		cp -vf include/acl.h %{BUILDROOT}%{includedir}/sys/
 	end
 end
 
 packages
 	package %{name}
-	end
-	
+
 	package libacl
 		template LIBS
 	end
-	
+
 	package libacl-devel
 		template DEVEL
+
+		# Overwrite default dependency because the
+		# libs are in a subpackage.
+		requires = libacl=%{thisver}
+	end
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+
+		provides += libacl-debuginfo
 	end
 end