Accepting request 366498 from Archiving

- Recommend mt_st as it is not hard dependency

- fix typos in the description
- add 'Require: mt_st' in order not to surprise users by the missing
  'mt' binary

- Disable mt building: this binary from mt_st package offers
  advanced capabilities with the same functionality.
- Enable rmt building: 'dump' package no longer include it, besides 
  cpio code base for rmt is more fresh.
- Reflect those changes in the package description.

OBS-URL: https://build.opensuse.org/request/show/366498
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cpio?expand=0&rev=53
This commit is contained in:
Dominique Leuenberger 2016-03-14 08:56:30 +00:00 committed by Git OBS Bridge
commit 1176b99d0e
2 changed files with 36 additions and 16 deletions

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Sat Mar 5 12:31:47 UTC 2016 - mpluskal@suse.com
- Recommend mt_st as it is not hard dependency
-------------------------------------------------------------------
Thu Mar 3 09:44:23 UTC 2016 - kstreitova@suse.com
- fix typos in the description
- add 'Require: mt_st' in order not to surprise users by the missing
'mt' binary
-------------------------------------------------------------------
Thu Mar 3 07:19:03 UTC 2016 - svalx@svalx.net
- Disable mt building: this binary from mt_st package offers
advanced capabilities with the same functionality.
- Enable rmt building: 'dump' package no longer include it, besides
cpio code base for rmt is more fresh.
- Reflect those changes in the package description.
-------------------------------------------------------------------
Fri Feb 19 15:47:00 UTC 2016 - kstreitova@suse.com

View File

@ -28,6 +28,7 @@ Source1: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2.sig
Source2: %{name}.keyring
Patch2: cpio-use_new_ascii_format.patch
#oouch what a ...?! pieces of code grabed from mt_st package to add missing functionality (e.g. density info)
#TODO: review is patches needed while mt is no longer building
Patch3: cpio-mt.patch
Patch4: cpio-use_sbin_rmt.patch
Patch5: cpio-open_nonblock.patch
@ -46,22 +47,22 @@ Patch26: cpio-2.12-util.c_no_return_in_nonvoid_fnc.patch
Patch27: cpio-2.12-out_of_bounds_write.patch
BuildRequires: autoconf
BuildRequires: automake
Recommends: mt_st
Requires(post): %{install_info_prereq}
Requires(preun): %{install_info_prereq}
Recommends: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
GNU cpio is a program to manage archives of files. This package also
includes 'mt', a tape drive control program. Cpio copies files into or
out of a cpio or tar archive. An archive is a file that contains other
files plus information about them, such as their pathname, owner, time
stamps, and access permissions. The archive can be another file on the
disk, a magnetic tape, or a pipe. This package normally includes the
program 'rmt', which provides remote tape drive control. Because there
is a compatible 'rmt' in the 'dump' package, 'rmt' is not included in
this package. If you are planning to use the remote tape features
provided by cpio, install the 'dump' package as well.
GNU cpio is a program to manage archives of files. Cpio copies files
into or out of a cpio or tar archive. An archive is a file that contains
other files plus information about them, such as their pathname, owner,
time stamps, and access permissions. The archive can be another file on
the disk, a magnetic tape, or a pipe.
This package also includes the program 'rmt', which provides remote tape
drive control. The 'mt', a local tape drive control program can be found
in mt_st package.
%lang_package
@ -91,8 +92,6 @@ autoreconf --force --install
CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fPIE" \
LDFLAGS="-pie" \
./configure \
--with-rmt="%{_sysconfdir}/rmt" \
--enable-mt \
--prefix=%{_prefix} \
--mandir=%{_mandir} \
--infodir=%{_infodir} \
@ -102,7 +101,8 @@ make %{?_smp_mflags}
%install
mkdir -p %{buildroot}/{usr/bin,bin}
make prefix=%{buildroot}%{_prefix} infodir=%{buildroot}/%{_infodir} mandir=%{buildroot}/%{_mandir} install
make prefix=%{buildroot}%{_prefix} infodir=%{buildroot}%{_infodir} mandir=%{buildroot}%{_mandir} \
DEFAULT_RMT_DIR=%{buildroot}%{_sbindir} install
#UsrMerge
ln -sf %{_bindir}/cpio %{buildroot}/bin
#EndUsrMerge
@ -120,11 +120,10 @@ ln -sf %{_bindir}/cpio %{buildroot}/bin
/bin/cpio
#EndUsrMerge
%{_bindir}/cpio
%{_bindir}/mt
%{_sbindir}/rmt
%{_infodir}/cpio.info.gz
%{_mandir}/man1/cpio.1.gz
%{_mandir}/man1/mt.1.gz
#/usr/share/locale/*/LC_MESSAGES/cpio.mo
%{_mandir}/man8/rmt.8.gz
%files lang -f %{name}.lang
%defattr(-,root,root)