From fedcab5e828e902b7b3815402f7b2bb59b1e340fba5c1f1edcbf2a810febb151 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 6 Dec 2011 17:00:24 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/bash revision 90 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=c444798a5636be3660a9c12cdb825db9 --- bash.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bash.spec b/bash.spec index 3d2e1f5..6335f89 100644 --- a/bash.spec +++ b/bash.spec @@ -22,7 +22,7 @@ BuildRequires: bison ncurses-devel %if %suse_version > 1020 BuildRequires: fdupes %endif -License: GPLv2+ +License: GPL-2.0+ Group: System/Shells %define bash_vers 4.2 %define rl_vers 6.2 @@ -95,7 +95,7 @@ be a conformant implementation of the IEEE Posix Shell and Tools specification (IEEE Working Group 1003.2). %package -n bash-doc -License: GPLv2+ +License: GPL-2.0+ Summary: Documentation how to Use the GNU Bourne-Again Shell Group: Documentation/Man Provides: bash:%{_infodir}/bash.info.gz @@ -115,7 +115,7 @@ interpreter Bash. %else %package -n bash-lang -License: GPLv2+ +License: GPL-2.0+ Summary: Languages for package bash Group: System/Localization Provides: bash-lang = %{version} @@ -126,7 +126,7 @@ Provides translations to the package bash %endif %package -n bash-devel -License: GPLv2+ +License: GPL-2.0+ Summary: Include Files mandatory for Development of bash loadable builtins Group: Development/Languages/C and C++ Version: 4.2 @@ -138,7 +138,7 @@ builtins for the interpreter Bash. Use -I /usr/include/bash/ on the compilers command line. %package -n bash-loadables -License: GPLv2+ +License: GPL-2.0+ Summary: Loadable bash builtins Group: System/Shells Version: 4.2 @@ -199,7 +199,7 @@ whoami Print out username of current user. %package -n libreadline6 -License: GPLv2+ +License: GPL-2.0+ Summary: The Readline Library Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} @@ -222,7 +222,7 @@ standard command interpreter) for easy editing of command lines. This includes history and search functionality. %package -n readline-devel -License: GPLv2+ +License: GPL-2.0+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a @@ -244,7 +244,7 @@ This package contains all necessary include files and libraries needed to develop applications that require these. %package -n readline-doc -License: GPLv2+ +License: GPL-2.0+ Summary: Documentation how to Use and Program with the Readline Library Group: System/Libraries Provides: readline:%{_infodir}/readline.info.gz From 94ef2b278a2e7d4a50e17acf3dc92043b3eecf020b978154cd1290d36cf229bf Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 19 Dec 2011 14:34:58 +0000 Subject: [PATCH 2/3] - remove suse_update_config calls - obsolete OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=110 --- bash.changes | 5 +++++ bash.spec | 32 +++++++++++--------------------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/bash.changes b/bash.changes index df019c3..ca71e63 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 19 14:34:41 UTC 2011 - coolo@suse.de + +- remove suse_update_config calls - obsolete + ------------------------------------------------------------------- Fri Nov 25 17:08:30 UTC 2011 - werner@suse.de diff --git a/bash.spec b/bash.spec index 6335f89..99959a0 100644 --- a/bash.spec +++ b/bash.spec @@ -15,15 +15,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: bash -BuildRequires: bison ncurses-devel +BuildRequires: bison +BuildRequires: ncurses-devel %if %suse_version > 1020 BuildRequires: fdupes %endif -License: GPL-2.0+ -Group: System/Shells %define bash_vers 4.2 %define rl_vers 6.2 %define extend "" @@ -36,8 +33,10 @@ Suggests: command-not-found Recommends: bash-doc = %bash_vers %endif Version: 4.2 -Release: 5 +Release: 0 Summary: The GNU Bourne-Again Shell +License: GPL-2.0+ +Group: System/Shells Url: http://www.gnu.org/software/bash/bash.html Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{bash_vers}.tar.gz Source1: ftp://ftp.gnu.org/gnu/readline/readline-%{rl_vers}.tar.gz @@ -95,13 +94,12 @@ be a conformant implementation of the IEEE Posix Shell and Tools specification (IEEE Working Group 1003.2). %package -n bash-doc -License: GPL-2.0+ Summary: Documentation how to Use the GNU Bourne-Again Shell Group: Documentation/Man Provides: bash:%{_infodir}/bash.info.gz PreReq: %install_info_prereq Version: 4.2 -Release: 5 +Release: 0 %if %suse_version > 1120 BuildArch: noarch %endif @@ -115,7 +113,6 @@ interpreter Bash. %else %package -n bash-lang -License: GPL-2.0+ Summary: Languages for package bash Group: System/Localization Provides: bash-lang = %{version} @@ -126,11 +123,10 @@ Provides translations to the package bash %endif %package -n bash-devel -License: GPL-2.0+ Summary: Include Files mandatory for Development of bash loadable builtins Group: Development/Languages/C and C++ Version: 4.2 -Release: 5 +Release: 0 %description -n bash-devel This package contains the C header files for writing loadable new @@ -138,11 +134,10 @@ builtins for the interpreter Bash. Use -I /usr/include/bash/ on the compilers command line. %package -n bash-loadables -License: GPL-2.0+ Summary: Loadable bash builtins Group: System/Shells Version: 4.2 -Release: 5 +Release: 0 %description -n bash-loadables This package contains the examples for the ready-to-dynamic-load @@ -199,12 +194,11 @@ whoami Print out username of current user. %package -n libreadline6 -License: GPL-2.0+ Summary: The Readline Library Group: System/Libraries Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.2 -Release: 5 +Release: 0 %if %suse_version > 1020 Recommends: readline-doc = %{version} %endif @@ -222,12 +216,11 @@ standard command interpreter) for easy editing of command lines. This includes history and search functionality. %package -n readline-devel -License: GPL-2.0+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Provides: bash:%{_libdir}/libreadline.a Version: 6.2 -Release: 5 +Release: 0 Requires: libreadline6 = %{version} Requires: ncurses-devel %if %suse_version > 1020 @@ -244,13 +237,12 @@ This package contains all necessary include files and libraries needed to develop applications that require these. %package -n readline-doc -License: GPL-2.0+ Summary: Documentation how to Use and Program with the Readline Library Group: System/Libraries Provides: readline:%{_infodir}/readline.info.gz PreReq: %install_info_prereq Version: 6.2 -Release: 5 +Release: 0 %if %suse_version > 1120 BuildArch: noarch %endif @@ -316,7 +308,6 @@ done MACHTYPE=${CPU}-suse-linux export LANG LC_ALL HOSTTYPE MACHTYPE pushd ../readline-%{rl_vers}%{extend} -%{?suse_update_config:%{suse_update_config -f support}} autoconf cflags () { @@ -407,7 +398,6 @@ popd CC_FOR_BUILD="$CC" CFLAGS_FOR_BUILD="$CFLAGS" export CC_FOR_BUILD CFLAGS_FOR_BUILD CFLAGS LDFLAGS CC -%{?suse_update_config:%{suse_update_config -f support}} autoconf # # We have a malloc with our glibc From a1a223cd15735bbdefebe737ac251b663215ae16323bf5f0f25a901ea3889f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Tue, 20 Dec 2011 20:06:27 +0000 Subject: [PATCH 3/3] Accepting request 97319 from home:coolo:removeautoconf add autoconf to buildrequires OBS-URL: https://build.opensuse.org/request/show/97319 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=111 --- bash.changes | 5 +++++ bash.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/bash.changes b/bash.changes index ca71e63..039d30c 100644 --- a/bash.changes +++ b/bash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 20 20:01:48 UTC 2011 - coolo@suse.com + +- add autoconf as buildrequire to avoid implicit dependency + ------------------------------------------------------------------- Mon Dec 19 14:34:41 UTC 2011 - coolo@suse.de diff --git a/bash.spec b/bash.spec index 99959a0..b0138c4 100644 --- a/bash.spec +++ b/bash.spec @@ -15,7 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: bash +BuildRequires: autoconf BuildRequires: bison BuildRequires: ncurses-devel %if %suse_version > 1020