Accepting request 291583 from home:pluskalm:branches:filesystems

- Update url
- Do not use full path for make

- Use url for source
- Add gpg signature
- Cleanup spec-file with spec-clener

OBS-URL: https://build.opensuse.org/request/show/291583
OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsprogs?expand=0&rev=33
This commit is contained in:
David Sterba 2015-03-19 14:44:17 +00:00 committed by Git OBS Bridge
parent 7ec2fd71ce
commit 3c5c5fdbd8
4 changed files with 146 additions and 33 deletions

BIN
xfsprogs-3.2.2.tar.gz.sig Normal file

Binary file not shown.

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Mar 19 13:38:47 UTC 2015 - mpluskal@suse.com
- Update url
- Do not use full path for make
-------------------------------------------------------------------
Thu Mar 19 13:06:46 UTC 2015 - mpluskal@suse.com
- Use url for source
- Add gpg signature
- Cleanup spec-file with spec-clener
-------------------------------------------------------------------
Thu Dec 11 10:06:01 UTC 2014 - jack@suse.cz

98
xfsprogs.keyring Normal file
View File

@ -0,0 +1,98 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2
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
=DGQa
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -1,7 +1,7 @@
#
# spec file for package xfsprogs
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,19 @@
Name: xfsprogs
Version: 3.2.2
Release: 0
Summary: Utilities for managing the XFS file system
License: GPL-2.0+
Group: System/Filesystems
Url: http://xfs.org
Source0: ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-%{version}.tar.gz
Source1: ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-%{version}.tar.gz.sig
Source2: %{name}.keyring
Patch0: xfsprogs-docdir.diff
Patch1: xfsprogs-ppc64.diff
BuildRequires: readline-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 0
%if 0%{?suse_version} < 1100
BuildRequires: e2fsprogs-devel
@ -27,20 +39,10 @@ BuildRequires: libuuid-devel
%else
BuildRequires: libuuid-devel
%endif
Version: 3.2.2
Release: 0
%if 0%{?suse_version} >= 1010
# hint for ZYPP
Supplements: filesystem(xfs)
%endif
Url: http://oss.sgi.com/projects/xfs/
Summary: Utilities for managing the XFS file system
License: GPL-2.0+
Group: System/Filesystems
Source0: xfsprogs-%{version}.tar.gz
Patch0: xfsprogs-docdir.diff
Patch1: xfsprogs-ppc64.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
A set of commands to use the XFS file system, including mkfs.xfs.
@ -57,9 +59,9 @@ complete details. This implementation is on-disk compatible with the
IRIX version of XFS.
%package devel
Requires: xfsprogs = %version
Summary: XFS Filesystem-specific Static Libraries and Headers
Group: Development/Libraries/C and C++
Requires: xfsprogs = %{version}
%description devel
xfsprogs-devel contains the libraries and header files needed to
@ -79,49 +81,49 @@ want to install xfsprogs.
%build
export OPTIMIZER="-fPIC"
export DEBUG=-DNDEBUG
export LIBUUID=/usr/%{_lib}/libuuid.a
export LIBUUID=%{_libdir}/libuuid.a
%configure --enable-readline=yes
make %{?_smp_mflags}
%install
export DIST_ROOT="$RPM_BUILD_ROOT"
/usr/bin/make install
/usr/bin/make install-dev
export DIST_ROOT=%{buildroot}
make install
make install-dev
# remove devel stuff from /lib
rm $RPM_BUILD_ROOT/%_lib/libhandle.so
rm %{buildroot}/%{_lib}/libhandle.so
# move things to usr
mv $RPM_BUILD_ROOT/sbin/* $RPM_BUILD_ROOT%{_sbindir}
mv $RPM_BUILD_ROOT/%_lib/* $RPM_BUILD_ROOT%{_libdir}
mv %{buildroot}/sbin/* %{buildroot}%{_sbindir}
mv %{buildroot}/%{_lib}/* %{buildroot}%{_libdir}
#UsrMerge
ln -s %{_sbindir}/{fsck.xfs,mkfs.xfs,xfs_repair} $RPM_BUILD_ROOT/sbin
ln -s %{_sbindir}/{fsck.xfs,mkfs.xfs,xfs_repair} %{buildroot}/sbin
#EndUserMerge
pushd $RPM_BUILD_ROOT%_libdir
pushd %{buildroot}%{_libdir}
ln -s libhandle.so.[0-9] libhandle.so
popd
chmod 755 $RPM_BUILD_ROOT/%_sbindir/fsck.xfs
%find_lang %name
chmod 755 %{buildroot}/%{_sbindir}/fsck.xfs
%find_lang %{name}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f %name.lang
%files -f %{name}.lang
%defattr(-,root,root,755)
#UsrMerge
/sbin/*
#EndUsrMerge
%_sbindir/*
%{_sbindir}/*
# this is only used by xfs cmds, therefore no urgent need for a shlib package
%_libdir/libhandle.so.*
%doc /usr/share/man/man[58]/*
%doc %_defaultdocdir/%name
%{_libdir}/libhandle.so.*
%doc %{_mandir}/man[58]/*
%doc %{_defaultdocdir}/%{name}
%files devel
%defattr(-,root,root,755)
%_includedir/xfs
%_libdir/*.so
%_libdir/*.a
%_libdir/*.la
/usr/share/man/man3/*
%{_includedir}/xfs
%{_libdir}/*.so
%{_libdir}/*.a
%{_libdir}/*.la
%{_mandir}/man3/*
%changelog