[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4cf37d600be0113d91ce012e4172d9b2451f2e34

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4cf37d600be0113d91ce012e4172d9b2451f2e34

[git]

[-- Attachment #1: Type: text/plain, Size: 3809 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  4cf37d600be0113d91ce012e4172d9b2451f2e34 (commit)
      from  360584c3be07814d44c80ada548620dc13730576 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4cf37d600be0113d91ce012e4172d9b2451f2e34
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date:   Thu Apr 12 21:36:54 2012 +0200

    attr: Fix installation.

-----------------------------------------------------------------------

Summary of changes:
 attr/attr.nm                                       |   12 ++++++--
 .../patches/attr-2.4.46-build.patch                |   28 +++++++++----------
 2 files changed, 22 insertions(+), 18 deletions(-)
 copy acl/patches/acl-2.2.39-build.patch => attr/patches/attr-2.4.46-build.patch (53%)

Difference in files:
diff --git a/attr/attr.nm b/attr/attr.nm
index a1bc9d5..2a9b2f0 100644
--- a/attr/attr.nm
+++ b/attr/attr.nm
@@ -5,7 +5,7 @@
 
 name       = attr
 version    = 2.4.43
-release    = 5
+release    = 6
 
 groups     = System/Filesystems
 url        = http://oss.sgi.com/projects/xfs/
@@ -13,7 +13,7 @@ license    = GPLv2+ LGPLv2+
 summary    = Tools for extended attribute support.
 
 description
-	A set of tools for manipulating extended attributes on filesystem \
+	A set of tools for manipulating extended attributes on filesystem
 	objects.
 end
 
@@ -30,7 +30,13 @@ build
 		--enable-shared
 
 	make_build_targets += LIBTOOL="libtool --tag=CC"
-	make_install_targets += install-libs install-dev
+	make_install_targets += install-lib install-dev
+
+	install_cmds
+		# Fix absolute symlink.
+		rm -rvf %{BUILDROOT}%{libdir}/libattr.so
+		ln -svf libattr.so.1 %{BUILDROOT}%{libdir}/libattr.so
+	end
 end
 
 packages
diff --git a/attr/patches/attr-2.4.46-build.patch b/attr/patches/attr-2.4.46-build.patch
new file mode 100644
index 0000000..44d5c26
--- /dev/null
+++ b/attr/patches/attr-2.4.46-build.patch
@@ -0,0 +1,38 @@
+diff -Nur a/include/builddefs.in b/include/builddefs.in
+--- a/include/builddefs.in	2008-06-30 07:38:27.000000000 +0200
++++ b/include/builddefs.in	2012-04-12 22:20:47.479076688 +0200
+@@ -27,14 +27,14 @@
+ PKG_VERSION	= @pkg_version@
+ PKG_PLATFORM	= @pkg_platform@
+ PKG_DISTRIBUTION= @pkg_distribution@
+-PKG_BIN_DIR	= @bindir@
+-PKG_SBIN_DIR	= @sbindir@
+-PKG_LIB_DIR	= @libdir@@libdirsuffix@
+-PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
+-PKG_INC_DIR	= @includedir@/attr
+-PKG_MAN_DIR	= @mandir@
+-PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
+-PKG_LOCALE_DIR	= @datadir@/locale
++PKG_BIN_DIR	= $(DESTDIR)@bindir@
++PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
++PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@
++PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@
++PKG_INC_DIR	= $(DESTDIR)@includedir@/attr
++PKG_MAN_DIR	= $(DESTDIR)@mandir@
++PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name@
++PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
+ 
+ CC		= @cc@
+ AWK		= @awk@
+diff -Nur a/include/buildmacros b/include/buildmacros
+--- a/include/buildmacros	2008-06-30 07:22:18.000000000 +0200
++++ b/include/buildmacros	2012-04-12 22:21:18.737379800 +0200
+@@ -27,7 +27,7 @@
+ 	  $(LFILES:.l=.o) \
+ 	  $(YFILES:%.y=%.tab.o)
+ 
+-INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL	= $(TOPDIR)/install-sh
+ 
+ SHELL = /bin/sh
+ IMAGES_DIR = $(TOPDIR)/all-images


hooks/post-receive
--
IPFire 3.x development tree