Merge branch 'master' into f23
Conflicts: .gitignore btrfs-progs.spec sources
This commit is contained in:
commit
b1e0cab4ed
1
.gitignore
vendored
1
.gitignore
vendored
@ -20,3 +20,4 @@
|
|||||||
/btrfs-progs-v4.2.tar.xz
|
/btrfs-progs-v4.2.tar.xz
|
||||||
/btrfs-progs-v4.2.1.tar.xz
|
/btrfs-progs-v4.2.1.tar.xz
|
||||||
/btrfs-progs-v4.2.2.tar.xz
|
/btrfs-progs-v4.2.2.tar.xz
|
||||||
|
/btrfs-progs-v4.3.1.tar.xz
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
Name: btrfs-progs
|
Name: btrfs-progs
|
||||||
Version: 4.2.2
|
Version: 4.3.1
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Userspace programs for btrfs
|
Summary: Userspace programs for btrfs
|
||||||
|
|
||||||
@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/libbtrfs.so
|
%{_libdir}/libbtrfs.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 18 2015 Eric Sandeen <sandeen@redhat.com> 4.3.1-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
* Wed Oct 08 2015 Eric Sandeen <sandeen@redhat.com> 4.2.2-1
|
* Wed Oct 08 2015 Eric Sandeen <sandeen@redhat.com> 4.2.2-1
|
||||||
- New upstream release
|
- New upstream release
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user