mbox

xfsprogs: Update to 4.7.0.

Message ID 1474540102-13831-1-git-send-email-stefan.schantl@ipfire.org
State Accepted
Commit 78647fb02210e34f700f44534bc73b401d3416bf
Headers

Message

Stefan Schantl Sept. 22, 2016, 8:28 p.m. UTC 
  This is an major update to the latest stable version.

* Drop dependency to e2fsprogs.
* Add dependency to libatt-devel

* Cleanup build instructions and package.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---
 xfsprogs/xfsprogs.nm | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

Comments

Michael Tremer Sept. 23, 2016, 12:48 a.m. UTC | #1 
Hi,

I merged this, but I am not sure if you noticed that libattr is later not part
of the runtime dependencies.

That suggests that it might have not been found correctly by the build system.

Could you have a look at that again and maybe send a follow-up patch if
necessary?

Best,
-Michael

On Thu, 2016-09-22 at 12:28 +0200, Stefan Schantl wrote:
> This is an major update to the latest stable version.
> 
> * Drop dependency to e2fsprogs.
> * Add dependency to libatt-devel
> 
> * Cleanup build instructions and package.
> 
> Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
> ---
>  xfsprogs/xfsprogs.nm | 22 +++++++++++++++-------
>  1 file changed, 15 insertions(+), 7 deletions(-)
> 
> diff --git a/xfsprogs/xfsprogs.nm b/xfsprogs/xfsprogs.nm
> index 2dded35..5041e50 100644
> --- a/xfsprogs/xfsprogs.nm
> +++ b/xfsprogs/xfsprogs.nm
> @@ -4,7 +4,7 @@
>  #############################################################################
> ##
>  
>  name       = xfsprogs
> -version    = 3.2.2
> +version    = 4.7.0
>  release    = 1
>  
>  groups     = System/Filesystems
> @@ -20,10 +20,10 @@ source_dl  = ftp://oss.sgi.com/projects/xfs/cmd_tars/
>  
>  build
>  	requires
> -		e2fsprogs-devel
>  		gettext
>  		libacl-devel
> -		libblkid-devel
> +		libattr-devel
> +		libblkid-devel >= 2.17
>  		libtool
>  		libuuid-devel
>  		readline-devel
> @@ -34,11 +34,19 @@ build
>  		--enable-readline=yes \
>  		--enable-blkid=yes
>  
> -	make_build_targets += V=1 DEBUG=-DNDEBUG
> +	make_build_targets += \
> +		V=1 DEBUG=-DNDEBUG
>  
> -	install
> -		make install install-dev install-qa V=1
> DIST_ROOT=%{BUILDROOT} \
> -			PKG_ROOT_SBIN_DIR=%{sbindir}
> PKG_ROOT_LIB_DIR=%{libdir}
> +	make_install_targets += \
> +		install-dev V=1 DIST_ROOT=%{BUILDROOT} \
> +		PKG_ROOT_SBIN_DIR=%{sbindir} PKG_ROOT_LIB_DIR=%{libdir}
> +
> +	install_cmds
> +		# Fix file permission.
> +		chmod 0755 %{BUILDROOT}/%{libdir}/libhandle.so.*.*.*
> +
> +		# Remove unneeded doc location.
> +		rm -rvf %{BUILDROOT}/%{datadir}/doc/xfsprogs/
>  	end
>  end
>