Attachment 718174 Details for Bug 929349 – patch: use /usr/sbin/alternatives

[patch] patch: use /usr/sbin/alternatives

0001-spec-man-prepare-for-alternatives.patch (text/plain), 7.18 KB, created by Pavel Raiskup on 2013-03-29 20:01:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Raiskup

Created: 2013-03-29 20:01:40 UTC

Size: 7.18 KB

patch

obsolete

>From bf269aba598f3a2b074213006f773188373eec09 Mon Sep 17 00:00:00 2001
>From: Pavel Raiskup <praiskup@redhat.com>
>Date: Fri, 29 Mar 2013 20:49:40 +0100
>Subject: [PATCH] spec & man: prepare for alternatives
>
>Version: 3.4-16
>---
> pax-3.4-manpage.patch | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++
> pax.spec              |  47 +++++++++++++--
> 2 files changed, 203 insertions(+), 4 deletions(-)
> create mode 100644 pax-3.4-manpage.patch
>
>diff --git a/pax-3.4-manpage.patch b/pax-3.4-manpage.patch
>new file mode 100644
>index 0000000..ba5a06c
>--- /dev/null
>+++ b/pax-3.4-manpage.patch
>@@ -0,0 +1,160 @@
>+diff --git a/src/pax.1 b/src/pax.1
>+index cd85bb0..6320bcc 100644
>+--- a/src/pax.1
>++++ b/src/pax.1
>+@@ -38,10 +38,10 @@
>+ .Dt PAX 1
>+ .Os
>+ .Sh NAME
>+-.Nm pax
>+-.Nd read and write file archives and copy directory hierarchies
>++.Nm opax
>++.Nd read and write file archives and copy directory hierarchies (OpenBSD \fIpax\fR implementation)
>+ .Sh SYNOPSIS
>+-.Nm pax
>++.Nm
>+ .Op Fl 0cdOnvz
>+ .Bk -words
>+ .Op Fl f Ar archive
>+@@ -67,7 +67,7 @@
>+ .Ar ...
>+ .Ek
>+ .Op Ar pattern ...
>+-.Nm pax
>++.Nm
>+ .Fl r
>+ .Op Fl cdiknuvzDOYZ
>+ .Bk -words
>+@@ -103,7 +103,7 @@
>+ .Ar ...
>+ .Ek
>+ .Op Ar pattern ...
>+-.Nm pax
>++.Nm
>+ .Fl w
>+ .Op Fl 0dituvzHLOPX
>+ .Bk -words
>+@@ -145,7 +145,7 @@
>+ .Ar ...
>+ .Ek
>+ .Op Ar file ...
>+-.Nm pax
>++.Nm
>+ .Fl r
>+ .Fl w
>+ .Op Fl 0diklntuvDHLOPXYZ
>+@@ -647,7 +647,7 @@ are not selected and will be skipped.
>+ Reset the access times of any file or directory read or accessed by
>+ .Nm
>+ to be the same as they were before being read or accessed by
>+-.Nm pax .
>++.Nm .
>+ .It Fl u
>+ Ignore files that are older (having a less recent file modification time)
>+ than a pre-existing file or archive member with the same name.
>+@@ -733,7 +733,7 @@ and is repaired.
>+ The old BSD tar format as found in BSD4.3.
>+ The default blocksize for this format is 10240 bytes.
>+ Pathnames stored by this format must be 100 characters or less in length
>+-(including the trailing \0 character, which means that filenames can have 
>++(including the trailing \0 character, which means that filenames can have
>+ a maximum length of 99 characters).
>+ Only
>+ .Em regular
>+@@ -753,9 +753,9 @@ The extended tar interchange format specified in the
>+ standard.
>+ The default blocksize for this format is 10240 bytes.
>+ Filenames stored by this format must be 100 characters or less in length
>+-(including the trailing \0 character, which means that filenames can have 
>++(including the trailing \0 character, which means that filenames can have
>+ a maximum length of 99 characters).
>+-Pathnames (directorynames + filenames) stored by this format must be 
>++Pathnames (directorynames + filenames) stored by this format must be
>+ 250 characters or less in length.
>+ .El
>+ .Pp
>+@@ -1081,26 +1081,34 @@ than the file to which it is compared.
>+ Path in which to store temporary files.
>+ .El
>+ .Sh EXAMPLES
>+-.Li $ pax -w -f /dev/rst0 \&.
>++.Li $
>++.Nm
>++-w -f /dev/rst0 \&.
>+ .Pp
>+ Copies the contents of the current directory to the device
>+ .Pa /dev/rst0 .
>+ .Pp
>+-.Li $ pax -v -f filename
>++.Li $
>++.Nm
>++-v -f filename
>+ .Pp
>+ Gives the verbose table of contents for an archive stored in
>+ .Pa filename .
>+ .Pp
>+ .Li $ mkdir newdir ;
>+ .Li cd olddir ;
>+-.Li pax -rw \&. newdir
>++.Li
>++.Nm
>++-rw \&. newdir
>+ .Pp
>+ This sequence of commands will copy the entire
>+ .Pa olddir
>+ directory hierarchy to
>+ .Pa newdir .
>+ .Pp
>+-.Li $ pax -r -s ',^//*usr//*,,' -f a.pax
>++.Li $
>++.Nm
>++-r -s ',^//*usr//*,,' -f a.pax
>+ .Pp
>+ Reads the archive
>+ .Pa a.pax ,
>+@@ -1108,13 +1116,17 @@ with all files rooted in
>+ .Pa /usr
>+ into the archive extracted relative to the current directory.
>+ .Pp
>+-.Li $ pax -rw -i \&. dest_dir
>++.Li $
>++.Nm
>++-rw -i \&. dest_dir
>+ .Pp
>+ Can be used to interactively select the files to copy from the current
>+ directory to
>+ .Pa dest_dir .
>+ .Pp
>+-.Li $ pax -r -pe -U root -G bin -f a.pax
>++.Li $
>++.Nm
>++-r -pe -U root -G bin -f a.pax
>+ .Pp
>+ Extract all files from the archive
>+ .Pa a.pax
>+@@ -1124,7 +1136,9 @@ with group
>+ .Em bin
>+ and preserve all file permissions.
>+ .Pp
>+-.Li "$ pax -r -w -v -Y -Z home /backup"
>++.Li "$
>++.Nm
>++-r -w -v -Y -Z home /backup"
>+ .Pp
>+ Update (and list) only those files in the destination directory
>+ .Pa /backup
>+@@ -1177,8 +1191,13 @@ and when
>+ .Nm
>+ completes it will exit with a non-zero exit status.
>+ .Sh SEE ALSO
>++.Xr spax 1 ,
>++.Xr tar 1 ,
>++.Xr bsdtar 1 ,
>++.Xr star 1 ,
>+ .Xr cpio 1 ,
>+-.Xr tar 1
>++.Xr bsdcpio 1 ,
>++.Xr scpio 1
>+ .Sh STANDARDS
>+ The
>+ .Nm
>diff --git a/pax.spec b/pax.spec
>index 301a25f..8c917bc 100644
>--- a/pax.spec
>+++ b/pax.spec
>@@ -1,7 +1,9 @@
>+%global ALTERNATIVES            %{_sbindir}/alternatives
>+
> Summary: POSIX File System Archiver
> Name: pax
> Version: 3.4
>-Release: 15%{?dist}
>+Release: 16%{?dist}
> License: BSD
> Group: Applications/Archiving
> Source: ftp://ftp.suse.com/pub/people/kukuk/pax/%{name}-%{version}.tar.bz2
>@@ -14,18 +16,38 @@ Patch1: pax-3.4-abs100.patch
> Patch2: pax-3.4-rdtruncate.patch
> #do not fail with gcc-4.6+
> Patch3: pax-gcc46.patch
>+
>+# manpage edits - s/pax/opax/, add cross references
>+Patch4: pax-3.4-manpage.patch
>+
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
>+Requires(post,preun): %{ALTERNATIVES}
> 
> %description
>-'pax' is the POSIX standard archive tool.  It supports the two most
>+The 'pax' utility is the POSIX standard archive tool.  It supports the two most
> common forms of standard Unix archive (backup) files - CPIO and TAR.
> 
>+# "desired" alternative constants
>+%global ALT_NAME                pax
>+%global ALT_LINK                %{_bindir}/pax
>+%global ALT_SL1_NAME            pax-man
>+%global ALT_SL1_LINK            %{_mandir}/man1/pax.1.gz
>+
>+# "local" alternative constants ("obpax" - OpenBSD pax)
>+%global ALT_PATH                %{_bindir}/obpax
>+%global ALT_SL1_PATH            %{_mandir}/man1/obpax.1.gz
>+
>+# helpers for alternatives
>+%global ALT_MAN_ORIG            %{_mandir}/man1/pax.1
>+%global ALT_MAN_NEW             %{_mandir}/man1/obpax.1
>+
> %prep
> %setup -q
> %patch0 -p1 -b .PATHMAX
> %patch1 -p1 -b .abs100
> %patch2 -p1 -b .rdtruncate
> %patch3 -p1 -b .gcc46
>+%patch4 -p1 -b .manpage
> 
> %build
> %configure
>@@ -34,6 +56,10 @@ make %{?_smp_mflags}
> %install
> rm -rf %{buildroot}
> make DESTDIR=%{buildroot} install
>+mv %{buildroot}%{ALT_LINK} %{buildroot}%{ALT_PATH}
>+mv %{buildroot}%{ALT_MAN_ORIG} %{buildroot}%{ALT_MAN_NEW}
>+ln -s %{ALT_PATH} %{buildroot}%{ALT_LINK}
>+ln -s %{ALT_MAN_NEW} %{buildroot}%{ALT_MAN_ORIG}
> 
> %clean
> rm -rf %{buildroot}
>@@ -41,10 +67,23 @@ rm -rf %{buildroot}
> %files
> %defattr(-,root,root,-)
> %doc ABOUT-NLS AUTHORS ChangeLog COPYING NEWS README THANKS
>-%{_bindir}/pax
>-%doc %{_mandir}/man1/*
>+%{ALT_PATH}
>+%doc %{ALT_SL1_PATH}
>+%ghost %verify(not md5 size mode mtime) %{ALT_LINK}
>+%ghost %verify(not md5 size mode mtime) %{ALT_SL1_LINK}
>+
>+%post
>+%{ALTERNATIVES} \
>+    --install   %{ALT_LINK}     %{ALT_NAME}     %{ALT_PATH}     33 \
>+    --slave     %{ALT_SL1_LINK} %{ALT_SL1_NAME} %{ALT_SL1_PATH} \
>+
>+%preun
>+%{ALTERNATIVES} --remove %{ALT_NAME} %{ALT_PATH}
> 
> %changelog
>+* Fri Mar 29 2013 Pavel Raiskup <praiskup@redhat.com> - 3.4-16
>+- setup the 'alternatives' template
>+
> * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4-15
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
> 
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 929349: 718174 | 732577