From 5de818c896ccf1dea83cc17953a4f51b3abdd4db Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 6 Aug 2014 13:05:20 +0200 Subject: [PATCH 1/3] fix license handling --- util-linux.spec | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/util-linux.spec b/util-linux.spec index 561e64c..5d8a18a 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -2,7 +2,7 @@ Summary: A collection of basic system utilities Name: util-linux Version: 2.25 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain Group: System Environment/Base URL: http://en.wikipedia.org/wiki/Util-linux @@ -212,6 +212,7 @@ SMP systems. Summary: Python bindings for the libmount library Group: Development/Libraries Requires: libmount = %{version}-%{release} +License: LGPLv2+ %description -n python3-libmount The libmount-python package contains a module that permits applications @@ -433,7 +434,9 @@ exit 0 %files -f %{name}.files %defattr(-,root,root) %doc README NEWS AUTHORS -%doc Documentation/deprecated.txt Documentation/licenses/* +%doc Documentation/deprecated.txt +%{!?_licensedir:%global license %%doc} +%license Documentation/licenses/* %doc misc-utils/getopt-*.{bash,tcsh} %config(noreplace) %{_sysconfdir}/pam.d/chfn @@ -753,7 +756,8 @@ exit 0 %files -n uuidd %defattr(-,root,root) -%doc Documentation/licenses/COPYING.GPLv2 +%{!?_licensedir:%global license %%doc} +%license Documentation/licenses/COPYING.GPLv2 %{_mandir}/man8/uuidd.8* %{_sbindir}/uuidd %{_unitdir}/uuidd.* @@ -764,12 +768,12 @@ exit 0 %files -n libsmartcols %defattr(-,root,root) -%doc libsmartcols/COPYING +%{!?_licensedir:%global license %%doc} +%license Documentation/licenses/COPYING.LGPLv2.1 libsmartcols/COPYING %{_libdir}/libsmartcols.so.* %files -n libsmartcols-devel %defattr(-,root,root) -%doc libsmartcols/COPYING %{_libdir}/libsmartcols.so %{_includedir}/libsmartcols %{_libdir}/pkgconfig/smartcols.pc @@ -777,12 +781,12 @@ exit 0 %files -n libmount %defattr(-,root,root) -%doc libmount/COPYING +%{!?_licensedir:%global license %%doc} +%license Documentation/licenses/COPYING.LGPLv2.1 libmount/COPYING %{_libdir}/libmount.so.* %files -n libmount-devel %defattr(-,root,root) -%doc libmount/COPYING %{_libdir}/libmount.so %{_includedir}/libmount %{_libdir}/pkgconfig/mount.pc @@ -804,12 +808,12 @@ exit 0 %files -n libuuid %defattr(-,root,root) -%doc libuuid/COPYING +%{!?_licensedir:%global license %%doc} +%license Documentation/licenses/COPYING.BSD-3 libuuid/COPYING %{_libdir}/libuuid.so.* %files -n libuuid-devel %defattr(-,root,root) -%doc libuuid/COPYING %{_libdir}/libuuid.so %{_includedir}/uuid %{_mandir}/man3/uuid.3* @@ -828,10 +832,14 @@ exit 0 %files -n python3-libmount %defattr(-, root, root) -%doc libmount/COPYING +%{!?_licensedir:%global license %%doc} +%license Documentation/licenses/COPYING.LGPLv2.1 libmount/COPYING %{_libdir}/python*/site-packages/libmount/* %changelog +* Wed Aug 6 2014 Tom Callaway 2.25-3 +- fix license handling + * Thu Jul 24 2014 Karel Zak 2.25-2 - remove fstrim unit files from uuidd subpackage From 71fd605ed8c74299c3ebac31d5625126f3480ab6 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 07:20:06 +0000 Subject: [PATCH 2/3] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- util-linux.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-linux.spec b/util-linux.spec index 5d8a18a..5cbbbce 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -2,7 +2,7 @@ Summary: A collection of basic system utilities Name: util-linux Version: 2.25 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain Group: System Environment/Base URL: http://en.wikipedia.org/wiki/Util-linux @@ -837,6 +837,9 @@ exit 0 %{_libdir}/python*/site-packages/libmount/* %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 2.25-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Aug 6 2014 Tom Callaway 2.25-3 - fix license handling From b079edfd1551b37f375f290b338dc8bc18525079 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 27 Aug 2014 15:53:32 +0200 Subject: [PATCH 3/3] 2.25.1-rc1: new upstream version --- .gitignore | 1 + sources | 2 +- util-linux.spec | 10 +++++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a03239f..4951bbe 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /util-linux-2.25-rc1.tar.xz /util-linux-2.25-rc2.tar.xz /util-linux-2.25.tar.xz +/util-linux-2.25.1-rc1.tar.xz diff --git a/sources b/sources index 2e97c41..00fa5ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c78fdef4cb882caafad61e33cafbc14 util-linux-2.25.tar.xz +3c8bf9c9ccf2f1a3e8b7b7303be54543 util-linux-2.25.1-rc1.tar.xz diff --git a/util-linux.spec b/util-linux.spec index 5cbbbce..2728e8f 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,13 +1,13 @@ ### Header Summary: A collection of basic system utilities Name: util-linux -Version: 2.25 -Release: 4%{?dist} +Version: 2.25.1 +Release: 0.1%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain Group: System Environment/Base URL: http://en.wikipedia.org/wiki/Util-linux -%define upstream_version %{version} +%define upstream_version %{version}-rc1 ### Macros %define compldir %{_datadir}/bash-completion/completions/ @@ -837,6 +837,10 @@ exit 0 %{_libdir}/python*/site-packages/libmount/* %changelog +* Wed Aug 27 2014 Karel Zak 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 - 2.25-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild