rpms
/
xz
7
0
Fork 0
Code Issues Pull Requests Releases Activity

rebase to new stable version 

All patches were removed because those were applied upstream (with
one exception - the man-page-day fix - which was upstram-rejected;
so not needed anyway).

Resolves: #1023718
Version: 5.2.0-1
This commit is contained in:
Pavel Raiskup 2014-12-23 18:11:26 +01:00
parent 9907793ad8
commit 729c7139dd
3 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
/xz-4.999.9beta.20100401git.tar.bz2 /xz-4.999.9beta.20100401git.tar.bz2
/xz-5.1.2alpha.tar.gz /xz-5.2.0.tar.xz

2
sources
View File

@ -1,2 +1,2 @@
3aa7bbfaa2d5a87f65c23224b9016006 xz-4.999.9beta.20100401git.tar.bz2 3aa7bbfaa2d5a87f65c23224b9016006 xz-4.999.9beta.20100401git.tar.bz2
9bad1e249537ce69b206815cf28ca87b xz-5.1.2alpha.tar.gz d87c242778fcf5ce4598de80a55ded28 xz-5.2.0.tar.xz

38
xz.spec
View File

@ -2,12 +2,12 @@
Summary: LZMA compression utilities Summary: LZMA compression utilities
Name: xz Name: xz
Version: 5.1.2 Version: 5.2.0
Release: 15alpha%{?dist} Release: 1%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: Applications/File Group: Applications/File
# official upstream release # official upstream release
Source0: http://tukaani.org/%{name}/%{name}-%{version}alpha.tar.gz Source0: http://tukaani.org/%{name}/%{name}-%{version}.tar.xz
# source created as "make dist" in checked out GIT tree # source created as "make dist" in checked out GIT tree
Source1: %{compat_ver}.20100401git.tar.bz2 Source1: %{compat_ver}.20100401git.tar.bz2
@ -18,27 +18,6 @@ URL: http://tukaani.org/%{name}/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# partly upstream/partly not (yet?)
# ~> proposal: http://www.mail-archive.com/xz-devel@tukaani.org/msg00153.html
# ~> #948533
Patch0: xz-5.1.2alpha-man-page-day.patch
# fix 'xzgrep -h' to behave as expected
# ~> upstream (5019413a0)
# ~> #850898
Patch1: xz-5.1.2alpha-xzgrep-and-h-option.patch
# fix less version checking
# ~> upstream (db5c1817fa, 9e6dabcf22)
# ~> #1015924
Patch2: xz-5.1.2alpha-less-version-check.patch
# xzgrep: return 0 when at least one file matches (+ test)
# ~> upstream (ceca37901783)
# ~> #1109122
Patch3: xz-5.1.2alpha-xzgrep-exit.patch
Patch4: xz-5.1.2alpha-xzgrep-exit-test.patch
%description %description
XZ Utils are an attempt to make LZMA compression easy to use on free (as in XZ Utils are an attempt to make LZMA compression easy to use on free (as in
@ -100,12 +79,7 @@ The lzma-compat package contains compatibility links for older
commands that deal with the older LZMA format. commands that deal with the older LZMA format.
%prep %prep
%setup -q -a1 -n %{name}-%{version}alpha %setup -q -a1
%patch0 -p1 -b .man-page-day
%patch1 -p1 -b .xzgrep-and-h-option
%patch2 -p1 -b .less-version-check
%patch3 -p1 -b .xzgrep-exit-status
%patch4 -p1 -b .xzgrep-exit-status-test
for i in `find . -name config.sub`; do for i in `find . -name config.sub`; do
perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" $i perl -pi -e "s/ppc64-\*/ppc64-\* \| ppc64p7-\*/" $i
@ -198,6 +172,10 @@ rm -rf %{buildroot}
%{_mandir}/man1/*lz* %{_mandir}/man1/*lz*
%changelog %changelog
* Tue Dec 23 2014 Pavel Raiskup <praiskup@redhat.com> - 5.2.0-1
- rebase per upstream release notes (#1023718)
http://www.mail-archive.com/xz-devel@tukaani.org/msg00216.html
* Tue Aug 26 2014 Pavel Raiskup <praiskup@redhat.com> - 5.1.2-15alpha * Tue Aug 26 2014 Pavel Raiskup <praiskup@redhat.com> - 5.1.2-15alpha
- xz*grep's output is colored iff grep's is (#1034846) - xz*grep's output is colored iff grep's is (#1034846)