From 3c5c5fdbd87676b499022bad5556e01bb99971a20e441d45cc5ac36853871753 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 19 Mar 2015 14:44:17 +0000 Subject: [PATCH] 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 --- xfsprogs-3.2.2.tar.gz.sig | Bin 0 -> 543 bytes xfsprogs.changes | 13 +++++ xfsprogs.keyring | 98 ++++++++++++++++++++++++++++++++++++++ xfsprogs.spec | 68 +++++++++++++------------- 4 files changed, 146 insertions(+), 33 deletions(-) create mode 100644 xfsprogs-3.2.2.tar.gz.sig create mode 100644 xfsprogs.keyring diff --git a/xfsprogs-3.2.2.tar.gz.sig b/xfsprogs-3.2.2.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..a6e78020e5c7064c1f8a04b984e2017194458fb113f14217c38da85d9f78efc0 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p-umeUktR2@tL5DM$2m`W@x^5CE!EW8#gGb1)Aa3x-!0 z6)HwUoB$ATM2NNT#qLTJc67q!`vmDLYlr!NQKTnD!zL_$9geTa8X{G1mfPf45;m}1 z?2yh{Pl}6n6%>(z&X&HGmfA0$WJ+NqmeIqVvxxyo$jgP9ZWJe93MXdqId=V13+~Gs zGd?phERM)rp%ym;rH*%F|7=w~V-q0_y9{LCvGd_4&QxQo8n7Dyy9otw(H<5P{36)E z)#AsNXEwTBmbZ6*eJkrRi@+o;$w)X)&b2lppqnsM%(_Xj*9s55#0>D0oimld03)uc zuURE195EhHOqjLLLk01XOeZ$Es5xeakHHwLm=YH2zBdYzbBNdlg+Ar5dK3EU)`d7G zmHhx9#udciCa0vCH#w@T%|(q$jMlbW$87YDpK4&GC}~3>zTItffnfz>3<@jEHmhqf zvb7^Al%#`S7UYnuV;0f$sm?oThA>-!>D%W43k|1gS!UKS4UE+`u`_cU;G{BGr<_1w zI1uIxvrU1eynPHLwbaTpK0s*}Rc4T%g}5Gvk^~ZK$!!HqP1pK7A31$I<)qS6(#jKK z#(IdzNPc?YP2CPi2x!9Q-5JmZ_a8uj{0~ 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