sbrabec/util-linux
SHA256
1
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

- Remove hacks for format_spec_file and source_validator

Browse Source 
(bnc#891152, bnc#891829).
- Use macro defined summary that passes both SLE and openSUSE
  check-in QA scripts (invented by Ruediger Oertel).

OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=250
This commit is contained in:
Stanislav Brabec 2014-08-21 20:06:54 +00:00 committed by Git OBS Bridge
parent cd9b9d676e
commit 5ae4f018c0
9 changed files with 94 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python-libmount.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Aug 21 18:34:59 CEST 2014 - sbrabec@suse.cz
- Remove hacks for format_spec_file and source_validator
(bnc#891152, bnc#891829).
- Use macro defined summary that passes both SLE and openSUSE
check-in QA scripts (invented by Ruediger Oertel).
-------------------------------------------------------------------
Fri Aug 8 22:17:29 CEST 2014 - sbrabec@suse.cz

68
python-libmount.spec
View File

@ -32,19 +32,35 @@ Name: python-libmount
# build_util_linux_systemd: Builds util-linux-systemd and uuidd.
# build_python_libmount: Builds python-libmount.
%define build_all 0
# definitions for the main packages
# This two level indirect definition of Summary and Group is needed to
# simplify parsing of spec file by format_spec_file,
# source_validator and check-in QA scripts).
%define summary_ul A collection of basic system utilities
%define summary_uls A collection of basic system utilities
%define summary_pl Python bindings for the libmount library
%define group_ul System/Base
%define group_uls System/Base
%define group_pl System/Filesystems
%if "%{name}" == "python-libmount"
%define build_util_linux 0
%define build_util_linux_systemd 0
%define build_python_libmount 1
# To prevent dependency loops, verify signature only in third stage.
%define verify_sig 1
%define main_summary %summary_pl
%define main_group %group_pl
%else
%if "%{name}" == "util-linux-systemd"
%define build_util_linux 0
%define build_util_linux_systemd 1
%define build_python_libmount 0
%define verify_sig 0
%define main_summary %summary_uls
%define main_group %group_uls
%else
%define main_summary %summary_ul
%define main_group %group_ul
%if %build_all
%define build_util_linux 1
%define build_util_linux_systemd 1
@ -58,6 +74,9 @@ Name: python-libmount
%endif
%endif
%endif
Summary: %main_summary
License: GPL-2.0+
Group: %group_pl
BuildRequires: audit-devel
BuildRequires: bc
BuildRequires: binutils-devel
@ -110,16 +129,6 @@ Release: 0
# these tools as well
#!BuildIgnore: pwdutils
Url: https://www.kernel.org/pub/linux/utils/util-linux/
#BEGIN UGLY HACK
%if 0
# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152)
Summary: TRAP
License: GPL-2.0+
Group: System/Filesystems
%endif
# UGLY HACK: License tag is errorneously moved here on every call of format_spec_file. %%include cannot be broken by format_spec_file.
%include %{_sourcedir}/util-linux.preamble
#END UGLY HACK
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.xz
Source1: util-linux-rpmlintrc
Source4: raw.init
@ -144,10 +153,6 @@ Source31: addnote.c
#
Source50: uuidd.rc
Source51: blkid.conf
# detachec parts of spec file
Source100: util-linux.preamble
Source101: util-linux.util-linux
Source102: util-linux.python-libmount
##
## util-linux patches
##
@ -172,15 +177,6 @@ Provides: util-linux(fake+no-canonicalize)
PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version}
#BEGIN UGLY HACK
%if 0
# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152)
Summary: TRAP
Group: System/Filesystems
%endif
# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file.
%include %{_sourcedir}/util-linux.util-linux
#END UGLY HACK
%if %{with enable_eject}
Provides: eject = 2.1.0-166.8
%endif
@ -216,24 +212,9 @@ Recommends: adjtimex
Recommends: time
Recommends: which
%else
# Exact copy of headers below is needed for spec cleaner that does not support
# if condition across preamble and subsequent sections.
%if %build_python_libmount
# Exact copy of the %%package tag from python-libmount section below:
#BEGIN UGLY HACK
%if 0
# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152)
Summary: TRAP
Group: System/Filesystems
%endif
# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file.
%include %{_sourcedir}/util-linux.python-libmount
#END UGLY HACK
%else
%if %build_util_linux_systemd
# Exact copy of the %%package tag from systemd section below:
Summary: A collection of basic systemd utilities
Group: System/Filesystems
Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service
@ -353,9 +334,8 @@ Files to develop applications using the libsmartcols library.
%if %build_util_linux_systemd
%if %build_util_linux
%package systemd
# Do not forget to copy duplicate of this section to the preamble:
Summary: A collection of basic systemd utilities
Group: System/Base
Summary: %summary_uls
Group: %group_uls
Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service
@ -387,9 +367,9 @@ SMP systems.
%if %build_python_libmount
%if %build_util_linux
%package -n python-libmount
# Do not forget to copy duplicate of this section to the preamble:
Summary: Python bindings for the libmount library
Group: System/Filesystems
Summary: %summary_pl
License: GPL-2.0+
Group: %group_pl
%description -n python-libmount
%else

8
util-linux-systemd.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Aug 21 18:34:59 CEST 2014 - sbrabec@suse.cz
- Remove hacks for format_spec_file and source_validator
(bnc#891152, bnc#891829).
- Use macro defined summary that passes both SLE and openSUSE
check-in QA scripts (invented by Ruediger Oertel).
-------------------------------------------------------------------
Fri Aug 8 22:17:29 CEST 2014 - sbrabec@suse.cz

67
util-linux-systemd.spec
View File

@ -32,19 +32,35 @@ Name: util-linux-systemd
# build_util_linux_systemd: Builds util-linux-systemd and uuidd.
# build_python_libmount: Builds python-libmount.
%define build_all 0
# definitions for the main packages
# This two level indirect definition of Summary and Group is needed to
# simplify parsing of spec file by format_spec_file,
# source_validator and check-in QA scripts).
%define summary_ul A collection of basic system utilities
%define summary_uls A collection of basic system utilities
%define summary_pl Python bindings for the libmount library
%define group_ul System/Base
%define group_uls System/Base
%define group_pl System/Filesystems
%if "%{name}" == "python-libmount"
%define build_util_linux 0
%define build_util_linux_systemd 0
%define build_python_libmount 1
# To prevent dependency loops, verify signature only in third stage.
%define verify_sig 1
%define main_summary %summary_pl
%define main_group %group_pl
%else
%if "%{name}" == "util-linux-systemd"
%define build_util_linux 0
%define build_util_linux_systemd 1
%define build_python_libmount 0
%define verify_sig 0
%define main_summary %summary_uls
%define main_group %group_uls
%else
%define main_summary %summary_ul
%define main_group %group_ul
%if %build_all
%define build_util_linux 1
%define build_util_linux_systemd 1
@ -58,6 +74,9 @@ Name: util-linux-systemd
%endif
%endif
%endif
Summary: %main_summary
License: GPL-2.0+
Group: %main_group
BuildRequires: audit-devel
BuildRequires: bc
BuildRequires: binutils-devel
@ -110,16 +129,6 @@ Release: 0
# these tools as well
#!BuildIgnore: pwdutils
Url: https://www.kernel.org/pub/linux/utils/util-linux/
#BEGIN UGLY HACK
%if 0
# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152)
Summary: TRAP
License: GPL-2.0+
Group: System/Base
%endif
# UGLY HACK: License tag is errorneously moved here on every call of format_spec_file. %%include cannot be broken by format_spec_file.
%include %{_sourcedir}/util-linux.preamble
#END UGLY HACK
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.xz
Source1: util-linux-rpmlintrc
Source4: raw.init
@ -144,10 +153,6 @@ Source31: addnote.c
#
Source50: uuidd.rc
Source51: blkid.conf
# detachec parts of spec file
Source100: util-linux.preamble
Source101: util-linux.util-linux
Source102: util-linux.python-libmount
##
## util-linux patches
##
@ -172,15 +177,6 @@ Provides: util-linux(fake+no-canonicalize)
PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version}
#BEGIN UGLY HACK
%if 0
# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152)
Summary: TRAP
Group: System/Base
%endif
# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file.
%include %{_sourcedir}/util-linux.util-linux
#END UGLY HACK
%if %{with enable_eject}
Provides: eject = 2.1.0-166.8
%endif
@ -216,24 +212,9 @@ Recommends: adjtimex
Recommends: time
Recommends: which
%else
# Exact copy of headers below is needed for spec cleaner that does not support
# if condition across preamble and subsequent sections.
%if %build_python_libmount
# Exact copy of the %%package tag from python-libmount section below:
#BEGIN UGLY HACK
%if 0
# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152)
Summary: TRAP
Group: System/Base
%endif
# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file.
%include %{_sourcedir}/util-linux.python-libmount
#END UGLY HACK
%else
%if %build_util_linux_systemd
# Exact copy of the %%package tag from systemd section below:
Summary: A collection of basic systemd utilities
Group: System/Base
Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service
@ -353,9 +334,8 @@ Files to develop applications using the libsmartcols library.
%if %build_util_linux_systemd
%if %build_util_linux
%package systemd
# Do not forget to copy duplicate of this section to the preamble:
Summary: A collection of basic systemd utilities
Group: System/Base
Summary: %summary_uls
Group: %group_uls
Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service
@ -387,9 +367,8 @@ SMP systems.
%if %build_python_libmount
%if %build_util_linux
%package -n python-libmount
# Do not forget to copy duplicate of this section to the preamble:
Summary: Python bindings for the libmount library
Group: System/Filesystems
Summary: %summary_pl
Group: %group_pl
%description -n python-libmount
%else

8
util-linux.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Aug 21 18:34:59 CEST 2014 - sbrabec@suse.cz
- Remove hacks for format_spec_file and source_validator
(bnc#891152, bnc#891829).
- Use macro defined summary that passes both SLE and openSUSE
check-in QA scripts (invented by Ruediger Oertel).
-------------------------------------------------------------------
Fri Aug 8 22:17:29 CEST 2014 - sbrabec@suse.cz

1
util-linux.preamble
View File

@ -1 +0,0 @@
License: GPL-2.0+

2
util-linux.python-libmount
View File

@ -1,2 +0,0 @@
Summary: Python bindings for the libmount library
Group: System/Filesystems

67
util-linux.spec
View File

@ -32,19 +32,35 @@ Name: util-linux
# build_util_linux_systemd: Builds util-linux-systemd and uuidd.
# build_python_libmount: Builds python-libmount.
%define build_all 0
# definitions for the main packages
# This two level indirect definition of Summary and Group is needed to
# simplify parsing of spec file by format_spec_file,
# source_validator and check-in QA scripts).
%define summary_ul A collection of basic system utilities
%define summary_uls A collection of basic system utilities
%define summary_pl Python bindings for the libmount library
%define group_ul System/Base
%define group_uls System/Base
%define group_pl System/Filesystems
%if "%{name}" == "python-libmount"
%define build_util_linux 0
%define build_util_linux_systemd 0
%define build_python_libmount 1
# To prevent dependency loops, verify signature only in third stage.
%define verify_sig 1
%define main_summary %summary_pl
%define main_group %group_pl
%else
%if "%{name}" == "util-linux-systemd"
%define build_util_linux 0
%define build_util_linux_systemd 1
%define build_python_libmount 0
%define verify_sig 0
%define main_summary %summary_uls
%define main_group %group_uls
%else
%define main_summary %summary_ul
%define main_group %group_ul
%if %build_all
%define build_util_linux 1
%define build_util_linux_systemd 1
@ -58,6 +74,9 @@ Name: util-linux
%endif
%endif
%endif
Summary: %main_summary
License: GPL-2.0+
Group: %main_group
BuildRequires: audit-devel
BuildRequires: bc
BuildRequires: binutils-devel
@ -110,16 +129,6 @@ Release: 0
# these tools as well
#!BuildIgnore: pwdutils
Url: https://www.kernel.org/pub/linux/utils/util-linux/
#BEGIN UGLY HACK
%if 0
# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152)
Summary: TRAP
License: GPL-2.0+
Group: System/Base
%endif
# UGLY HACK: License tag is errorneously moved here on every call of format_spec_file. %%include cannot be broken by format_spec_file.
%include %{_sourcedir}/util-linux.preamble
#END UGLY HACK
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.xz
Source1: util-linux-rpmlintrc
Source4: raw.init
@ -144,10 +153,6 @@ Source31: addnote.c
#
Source50: uuidd.rc
Source51: blkid.conf
# detachec parts of spec file
Source100: util-linux.preamble
Source101: util-linux.util-linux
Source102: util-linux.python-libmount
##
## util-linux patches
##
@ -172,15 +177,6 @@ Provides: util-linux(fake+no-canonicalize)
PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version}
#BEGIN UGLY HACK
%if 0
# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152)
Summary: TRAP
Group: System/Base
%endif
# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file.
%include %{_sourcedir}/util-linux.util-linux
#END UGLY HACK
%if %{with enable_eject}
Provides: eject = 2.1.0-166.8
%endif
@ -216,24 +212,9 @@ Recommends: adjtimex
Recommends: time
Recommends: which
%else
# Exact copy of headers below is needed for spec cleaner that does not support
# if condition across preamble and subsequent sections.
%if %build_python_libmount
# Exact copy of the %%package tag from python-libmount section below:
#BEGIN UGLY HACK
%if 0
# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152)
Summary: TRAP
Group: System/Base
%endif
# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file.
%include %{_sourcedir}/util-linux.python-libmount
#END UGLY HACK
%else
%if %build_util_linux_systemd
# Exact copy of the %%package tag from systemd section below:
Summary: A collection of basic systemd utilities
Group: System/Base
Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service
@ -353,9 +334,8 @@ Files to develop applications using the libsmartcols library.
%if %build_util_linux_systemd
%if %build_util_linux
%package systemd
# Do not forget to copy duplicate of this section to the preamble:
Summary: A collection of basic systemd utilities
Group: System/Base
Summary: %summary_uls
Group: %group_uls
Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service
@ -387,9 +367,8 @@ SMP systems.
%if %build_python_libmount
%if %build_util_linux
%package -n python-libmount
# Do not forget to copy duplicate of this section to the preamble:
Summary: Python bindings for the libmount library
Group: System/Filesystems
Summary: %summary_pl
Group: %group_pl
%description -n python-libmount
%else

2
util-linux.util-linux
View File

@ -1,2 +0,0 @@
Summary: A collection of basic system utilities
Group: System/Base