rpms/util-linux
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f21'

Browse Source 
Conflicts:
	util-linux.spec
This commit is contained in:
Karel Zak 2014-08-27 16:19:51 +02:00
commit d4fa6b5537
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -34,3 +34,4 @@
/util-linux-2.25-rc1.tar.xz /util-linux-2.25-rc1.tar.xz
/util-linux-2.25-rc2.tar.xz /util-linux-2.25-rc2.tar.xz
/util-linux-2.25.tar.xz /util-linux-2.25.tar.xz
/util-linux-2.25.1-rc1.tar.xz

2
sources
View File

@ -1 +1 @@
4c78fdef4cb882caafad61e33cafbc14 util-linux-2.25.tar.xz 3c8bf9c9ccf2f1a3e8b7b7303be54543 util-linux-2.25.1-rc1.tar.xz

10
util-linux.spec
View File

@ -1,13 +1,13 @@
### Header ### Header
Summary: A collection of basic system utilities Summary: A collection of basic system utilities
Name: util-linux Name: util-linux
Version: 2.25 Version: 2.25.1
Release: 4%{?dist} Release: 0.1%{?dist}
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
Group: System Environment/Base Group: System Environment/Base
URL: http://en.wikipedia.org/wiki/Util-linux URL: http://en.wikipedia.org/wiki/Util-linux
%define upstream_version %{version} %define upstream_version %{version}-rc1
### Macros ### Macros
%define compldir %{_datadir}/bash-completion/completions/ %define compldir %{_datadir}/bash-completion/completions/
@ -837,6 +837,10 @@ exit 0
%{_libdir}/python*/site-packages/libmount/* %{_libdir}/python*/site-packages/libmount/*
%changelog %changelog
* Wed Aug 27 2014 Karel Zak <kzak@redhat.com> 2.25.1-0.1
- upgrade to release 2.25.1-rc1
ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/v2.25.1-ReleaseNotes
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.25-4 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.25-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild