From 7e29362366b27b439bb00406438c4b1a38a70dc7dcad1248653c08fbee57e7ce Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Tue, 12 Feb 2013 17:11:00 +0000 Subject: [PATCH] Accepting request 155256 from home:flichtenheld separate checkbashisms package so that rpmlint can depend on it without depending on all the other stuff. (bnc#802887) OBS-URL: https://build.opensuse.org/request/show/155256 OBS-URL: https://build.opensuse.org/package/show/system:packagemanager/devscripts?expand=0&rev=8 --- devscripts.changes | 13 +++++++++++++ devscripts.spec | 28 ++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/devscripts.changes b/devscripts.changes index cc206bb..dfbc3cc 100644 --- a/devscripts.changes +++ b/devscripts.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Feb 12 09:11:49 UTC 2013 - frank.lichtenheld@sophos.com + +- Make BuildArch: noarch for checkbashisms conditional to + allow building on SLE 11. + +------------------------------------------------------------------- +Mon Feb 11 22:49:10 UTC 2013 - frank.lichtenheld@sophos.com + +- separate checkbashisms package so that rpmlint can + depend on it without depending on all the other stuff. + (bnc#802887) + ------------------------------------------------------------------- Mon Feb 4 09:15:37 UTC 2013 - coolo@suse.com diff --git a/devscripts.spec b/devscripts.spec index 2577a24..2360bfe 100644 --- a/devscripts.spec +++ b/devscripts.spec @@ -42,6 +42,7 @@ BuildRequires: python-devel # we are sorry to drop sles10 support, but no setuptools BuildRequires: python-setuptools BuildRequires: zlib-devel +Requires: checkbashisms >= %{version} Requires: dpkg Requires: html2text Requires: perl @@ -76,8 +77,6 @@ Collection of scripts for working on Debian packages. Examples: - bts: a command-line tool for manipulating the Debian Bug Tracking System - - checkbashisms: check whether a /bin/sh script contains any - common bash-specific contructs - dcontrol: remotely query package and source control files for all Debian distributions - debchange/dch: automagically add entries to @@ -92,6 +91,24 @@ Examples: files - uscan: scan upstream sites for new releases of packages +%package -n checkbashisms +Summary: Tool for checking /bin/sh scripts for possible bashisms +License: GPL-2.0+ +Group: Development/Tools/Building +Provides: deb:/usr/bin/checkbashisms +Provides: devscripts:/usr/bin/checkbashisms +Requires: perl +%if 0%{?suse_version} && 0%{?suse_version} < 1120 +#for the benefit of SLE +%else +BuildArch: noarch +%endif + +%description -n checkbashisms +checkbashisms performs basic checks on /bin/sh shell scripts for the possible +presence of bashisms. It takes the names of the shell scripts on the command +line, and outputs warnings if possible bashisms are detected. + %prep %setup -q @@ -136,5 +153,12 @@ install -m644 debian/changelog %{buildroot}%{_docdir}/devscripts/changelog %{python_sitelib}/devscripts-%{version}-py%{py_ver}.egg-info/ /usr/lib/devscripts %{_datadir}/devscripts +%exclude %{_mandir}/man1/checkbashisms.1.gz +%exclude %{_bindir}/checkbashisms + +%files -n checkbashisms +%defattr(-,root,root) +%doc %{_mandir}/man1/checkbashisms.1.gz +%{_bindir}/checkbashisms %changelog