Accepting request 77511 from home:elvigia:branches:devel:libraries:c_c++

- Link with ncurses6w instead of ncurses5 
- Do not inject artificial dependencies on other packages

OBS-URL: https://build.opensuse.org/request/show/77511
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libedit?expand=0&rev=36
This commit is contained in:
Ismail Dönmez
2011-07-31 21:43:56 +00:00
committed by Git OBS Bridge
parent 2a5ec4f6fc
commit 3baddaf396
7 changed files with 114 additions and 71 deletions

View File

@@ -1,7 +1,7 @@
#
# spec file for package libedit (Version 3.0.snap20090923)
# spec file for package libedit (Version 3.0.snap20100424)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 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
@@ -19,25 +19,25 @@
Name: libedit
Version: 3.0.snap20090923
Release: 2
Version: 3.0.snap20100424
Release: 1
%define pkg_name libedit
%define pkg_version 20090923-3.0
%define pkg_version 20100424-3.0
#
License: BSD3c
Group: Development/Libraries/C and C++
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ ncurses-devel
BuildRequires: gcc-c++ ncurses-devel pkgconfig
#
Url: http://www.thrysoee.dk/editline/
# http://www.thrysoee.dk/editline/%{pkg_name}-%{pkg_version}.tar.gz
Source: http://www.thrysoee.dk/editline/%{pkg_name}-%{pkg_version}.tar.bz2
# http://www.thrysoee.dk/editline/%{pkg_name}-%{pkg_version}.tar.gz
Source: %{pkg_name}-%{pkg_version}.tar.bz2
Source1: README.SuSE
# PATCH-FIX-UPSTREAM libedit-ncurses-pkg-config.patch vuntz@opensuse.org -- Use ncurses in pkg-config file, sent upstream by mail
Patch0: libedit-ncurses-pkg-config.patch
Patch1: libedit-downgrade_autoconf.patch
Patch2: libedit-20100424-3.0-ncurses.patch
#
Summary: A command line editing and history library
Summary: Command Line Editing and History Library
%description
libedit is a command line editing and history library. It is designed
@@ -46,28 +46,31 @@ at a terminal prompt.
Authors:
--------
Jess Thrysoee
%define library_name libedit0
%define debug_package_requires %{library_name} = %{version}-%{release}
%define soname 0
%package -n %{library_name}
%package -n libedit0
License: BSD3c
Group: Development/Libraries/C and C++
Provides: %{pkg_name} = %{version}-%{release}
Obsoletes: %{pkg_name} < %{version}
#
Summary: A command line editing and history library
Summary: Command Line Editing and History Library
%description -n libedit0
%description -n %{library_name}
libedit is a command line editing and history library. It is designed
to be used by interactive programs that allow the user to type commands
at a terminal prompt.
Authors:
--------
Jess Thrysoee
@@ -77,7 +80,7 @@ License: BSD3c
Group: Development/Libraries/C and C++
Requires: %{library_name} = %{version}
Provides: %{library_name}-devel = %{version}-%{release}
Requires: ncurses-devel
Requires: glibc-devel
#
Summary: Development files for libedit
@@ -97,19 +100,24 @@ Authors:
%prep
%setup -n %{pkg_name}-%{pkg_version}
%{__cp} %{S:1} .
%patch0 -p1
%patch1
%patch2
%build
autoreconf -f -i
%configure --disable-static --with-pic
%{__make} %{?jobs:-j%jobs}
NOCONFIGURE=1 autoreconf -fiv
%configure --disable-static --with-pic \
--disable-silent-rules \
--enable-widec
%__make %{?jobs:-j%jobs}
%install
%makeinstall
rm %{buildroot}%{_libdir}/libedit.la
%__rm "%{buildroot}%{_libdir}"/*.la
%clean
%{__rm} -rf %{buildroot}
%{?buildroot:%__rm -rf "%{buildroot}"}
%check
make check
%post -n %{library_name} -p /sbin/ldconfig
@@ -117,8 +125,9 @@ rm %{buildroot}%{_libdir}/libedit.la
%files -n %{library_name}
%defattr(-,root,root,-)
%{_libdir}/libedit.so.*
%{_mandir}/man5/editrc.5*
%{_libdir}/libedit.so.%{soname}
%{_libdir}/libedit.so.%{soname}.*
%{_mandir}/man5/editrc.5%{ext_man}
%doc README.SuSE THANKS ChangeLog COPYING examples/*c
%files -n libedit-devel
@@ -126,7 +135,7 @@ rm %{buildroot}%{_libdir}/libedit.la
%{_libdir}/libedit.so
%{_includedir}/histedit.h
%{_includedir}/editline/
%{_mandir}/man3/*.3*
%{_mandir}/man3/*.3%{ext_man}
%{_libdir}/pkgconfig/libedit.pc
%changelog