SHA256
3
0
forked from pool/libedit

Accepting request 313046 from home:scarabeus_iv:branches:devel:libraries:c_c++

I wanted to add one patch, but then I found few bugs in it
but the cleanup itself is okay too.

- Cleanup a bit with spec-cleaner
  * remove pkg_name variable which is equal to name variable

OBS-URL: https://build.opensuse.org/request/show/313046
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libedit?expand=0&rev=54
This commit is contained in:
Ismail Dönmez 2015-06-22 12:31:42 +00:00 committed by Git OBS Bridge
parent 2118b4e98e
commit 0214f43165
2 changed files with 33 additions and 32 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 22 11:45:10 UTC 2015 - tchvatal@suse.com
- Cleanup a bit with spec-cleaner
* remove pkg_name variable which is equal to name variable
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 19 12:01:55 UTC 2015 - idonmez@suse.com Fri Jun 19 12:01:55 UTC 2015 - idonmez@suse.com

View File

@ -16,19 +16,15 @@
# #
%define pkg_version 20150325-3.1
%define soname 0
%define library_name libedit%{soname}
Name: libedit Name: libedit
Version: 3.1.snap20150325 Version: 3.1.snap20150325
Release: 0 Release: 0
%define pkg_name libedit Summary: Command Line Editing and History Library
%define pkg_version 20150325-3.1 License: BSD-3-Clause
# Group: Development/Libraries/C and C++
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: pkgconfig
#
Url: http://www.thrysoee.dk/editline/ Url: http://www.thrysoee.dk/editline/
Source: http://thrysoee.dk/editline/libedit-%{pkg_version}.tar.gz Source: http://thrysoee.dk/editline/libedit-%{pkg_version}.tar.gz
Source1: README.SUSE Source1: README.SUSE
@ -36,23 +32,22 @@ Source2: baselibs.conf
Patch2: libedit-20100424-3.0-ncurses.patch Patch2: libedit-20100424-3.0-ncurses.patch
Patch3: libedit-ocloexec.patch Patch3: libedit-ocloexec.patch
Patch4: libedit-visibility.patch Patch4: libedit-visibility.patch
Summary: Command Line Editing and History Library BuildRequires: gcc-c++
License: BSD-3-Clause BuildRequires: libtool
Group: Development/Libraries/C and C++ BuildRequires: ncurses-devel
BuildRequires: pkgconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
libedit is a command line editing and history library. It is designed 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 to be used by interactive programs that allow the user to type commands
at a terminal prompt. at a terminal prompt.
%define library_name libedit0
%define soname 0
%package -n %{library_name} %package -n %{library_name}
Provides: %{pkg_name} = %{version}-%{release}
Obsoletes: %{pkg_name} < %{version}
Summary: Command Line Editing and History Library Summary: Command Line Editing and History Library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Provides: %{name} = %{version}-%{release}
Obsoletes: %{name} < %{version}
%description -n %{library_name} %description -n %{library_name}
libedit is a command line editing and history library. It is designed libedit is a command line editing and history library. It is designed
@ -60,11 +55,11 @@ to be used by interactive programs that allow the user to type commands
at a terminal prompt. at a terminal prompt.
%package -n libedit-devel %package -n libedit-devel
Requires: %{library_name} = %{version}
Provides: %{library_name}-devel = %{version}-%{release}
Requires: glibc-devel
Summary: Development files for libedit Summary: Development files for libedit
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{library_name} = %{version}
Requires: glibc-devel
Provides: %{library_name}-devel = %{version}-%{release}
%description -n libedit-devel %description -n libedit-devel
libedit is a command line editing and history library. It is designed libedit is a command line editing and history library. It is designed
@ -74,27 +69,27 @@ at a terminal prompt.
This package holds the development files for libedit. This package holds the development files for libedit.
%prep %prep
%setup -q -n %{pkg_name}-%{pkg_version} %setup -q -n %{name}-%{pkg_version}
cp %{S:1} . cp %{SOURCE1} .
%patch2 %patch2
%patch3 %patch3
%patch4 -p1 %patch4 -p1
%build %build
NOCONFIGURE=1 autoreconf -fiv autoreconf -fiv
%configure --disable-static \ %configure \
--with-pic \ --disable-static \
--disable-silent-rules \ --with-pic \
--enable-widec --disable-silent-rules \
--enable-widec
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
%makeinstall make DESTDIR=%{buildroot} install %{?_smp_mflags}
rm "%{buildroot}%{_libdir}"/*.la find %{buildroot} -type f -name "*.la" -delete -print
%check %check
make check make %{?_smp_mflags} check
%post -n %{library_name} -p /sbin/ldconfig %post -n %{library_name} -p /sbin/ldconfig