Accepting request 263376 from Base:System

- Clean up with spec-cleaner
- Add ncurses-devel as it is inherited from readline
- Explicitely pass without-libedit if we decide to switch for
  it at some point

OBS-URL: https://build.opensuse.org/request/show/263376
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bc?expand=0&rev=21

bc.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov 28 20:48:58 UTC 2014 - tchvatal@suse.com
+
+- Clean up with spec-cleaner
+- Add ncurses-devel as it is inherited from readline
+- Explicitely pass without-libedit if we decide to switch for
+  it at some point
+
 -------------------------------------------------------------------
 Mon Sep 17 12:00:40 UTC 2012 - idonmez@suse.com
 

bc.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package bc
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,25 +17,24 @@
 
 
 Name:           bc
-BuildRequires:  bison
-BuildRequires:  ed
-BuildRequires:  flex
-%if 0%{?suse_version} > 1220
-BuildRequires:  makeinfo
-%endif
-BuildRequires:  readline-devel
-Url:            ftp://ftp.gnu.org/pub/gnu/bc
-PreReq:         %{install_info_prereq}
 Version:        1.06.95
 Release:        0
 Summary:        GNU Command Line Calculator
 License:        GPL-2.0+
 Group:          Productivity/Scientific/Math
+Url:            ftp://ftp.gnu.org/pub/gnu/bc
 Source:         ftp://alpha.gnu.org/pub/gnu/bc/bc-%{version}.tar.bz2
 Patch1:         bc-1.06-dc_ibase.patch
 Patch2:         bc-1.06.95-memleak.patch
 Patch3:         bc-1.06.95-matlib.patch
 Patch4:         bc-1.06.95-sigintmasking.patch
+BuildRequires:  bison
+BuildRequires:  ed
+BuildRequires:  flex
+BuildRequires:  makeinfo
+BuildRequires:  ncurses-devel
+BuildRequires:  readline-devel
+Requires(post): %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -64,17 +63,13 @@ and "pushes" its results back onto the stack.
 %patch4 -p1 -b .sigintmask
 
 %build
-./configure CFLAGS="$RPM_OPT_FLAGS" \
-            --with-readline \
-            --prefix=/usr \
-	    --infodir=%{_infodir} \
-            --mandir=%{_mandir} \
-            --build=%{_target_cpu}-suse-linux
-rm bc/libmath.h
-make
+%configure \
+    --with-readline \
+    --without-libedit
+make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
 %post
 %install_info --info-dir=%{_infodir} %{_infodir}/bc.info.gz
@@ -87,8 +82,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README COPYING.LIB FAQ
-/usr/bin/bc
-/usr/bin/dc
+%{_bindir}/bc
+%{_bindir}/dc
 %{_infodir}/*.info*
 %{_mandir}/man1/*