Merge remote-tracking branch 'origin/f16' into f17
Conflicts: .gitignore pigz.spec sources
This commit is contained in:
commit
e7161b5c28
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
pigz-2.1.6.tar.gz
|
pigz-2.1.6.tar.gz
|
||||||
/pigz-2.2.3.tar.gz
|
/pigz-2.2.3.tar.gz
|
||||||
|
/pigz-2.2.4.tar.gz
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
Name: pigz
|
Name: pigz
|
||||||
Version: 2.2.3
|
Version: 2.2.4
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Parallel implementation of gzip
|
Summary: Parallel implementation of gzip
|
||||||
|
|
||||||
@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Mar 14 2012 Adel Gadllah <adel.gadllah@gmail.com> - 2.2.4-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
* Wed Jan 18 2012 Adel Gadllah <adel.gadllah@gmail.com> - 2.2.3-1
|
* Wed Jan 18 2012 Adel Gadllah <adel.gadllah@gmail.com> - 2.2.3-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user