From 796aeac07cdd14ee126b5f226ddc1ab723d53181393a763505747636a0a26d8d Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Thu, 3 Mar 2016 09:33:40 +0000 Subject: [PATCH 1/4] Accepting request 365132 from home:svalx OBS-URL: https://build.opensuse.org/request/show/365132 OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=60 --- cpio.changes | 9 +++++++++ cpio.spec | 30 ++++++++++++++---------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/cpio.changes b/cpio.changes index f01d9a1..ff9301b 100644 --- a/cpio.changes +++ b/cpio.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Mar 3 07:19:03 UTC 2016 - svalx@svalx.net + +- Disable mt building: this bynary 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 package description. + ------------------------------------------------------------------- Fri Feb 19 15:47:00 UTC 2016 - kstreitova@suse.com diff --git a/cpio.spec b/cpio.spec index e16dcc1..ff747c5 100644 --- a/cpio.spec +++ b/cpio.spec @@ -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 @@ -52,16 +53,15 @@ 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 theprogram 'rmt', which provides remote tape +drive control. The 'mt', a local tape drive control program can be found +into mt_st package. %lang_package @@ -91,8 +91,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 +100,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 +119,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) From a5a6e773a304ed02316dbbc588465e45d9d78cd3cc9be30692a25317b2f5b125 Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Thu, 3 Mar 2016 09:37:11 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=61 --- cpio.changes | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cpio.changes b/cpio.changes index ff9301b..3bd9c0f 100644 --- a/cpio.changes +++ b/cpio.changes @@ -1,11 +1,11 @@ ------------------------------------------------------------------- Thu Mar 3 07:19:03 UTC 2016 - svalx@svalx.net -- Disable mt building: this bynary 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 package description. +- 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 From cd41245e9a73dee70b90c1d24a959012a7504ff936031f8b70d4db17e527c58c Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 3 Mar 2016 12:34:16 +0000 Subject: [PATCH 3/4] Accepting request 365204 from home:kstreitova:branches:Archiving - fix typos in the description - add 'Require: mt_st' in order not to surprise users by the missing 'mt' binary OBS-URL: https://build.opensuse.org/request/show/365204 OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=62 --- cpio.changes | 7 +++++++ cpio.spec | 15 ++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/cpio.changes b/cpio.changes index 3bd9c0f..da90ac6 100644 --- a/cpio.changes +++ b/cpio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/cpio.spec b/cpio.spec index ff747c5..842fbb8 100644 --- a/cpio.spec +++ b/cpio.spec @@ -47,21 +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 +Requires: 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. 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 +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 theprogram 'rmt', which provides remote tape -drive control. The 'mt', a local tape drive control program can be found -into mt_st package. +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 From 17cb646e1da95680437e324be255c846ca296a11b75bc4097c6fd770852195de Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 5 Mar 2016 12:32:17 +0000 Subject: [PATCH 4/4] - Recommend mt_st as it is not hard dependency OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=63 --- cpio.changes | 5 +++++ cpio.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cpio.changes b/cpio.changes index da90ac6..70fa3f1 100644 --- a/cpio.changes +++ b/cpio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/cpio.spec b/cpio.spec index 842fbb8..9872ee0 100644 --- a/cpio.spec +++ b/cpio.spec @@ -47,7 +47,7 @@ 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 -Requires: mt_st +Recommends: mt_st Requires(post): %{install_info_prereq} Requires(preun): %{install_info_prereq} Recommends: %{name}-lang = %{version}