]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
attr: Fix installation.
authorStefan Schantl <stefan.schantl@ipfire.org>
Thu, 12 Apr 2012 19:36:54 +0000 (21:36 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Thu, 12 Apr 2012 20:41:34 +0000 (22:41 +0200)
attr/attr.nm
attr/patches/attr-2.4.46-build.patch [new file with mode: 0644]

index a1bc9d5305b4d4c3f26f829f422b38194cdc9626..2a9b2f0d1232756aa9f337c3aa88665c88cc07af 100644 (file)
@@ -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 (file)
index 0000000..44d5c26
--- /dev/null
@@ -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