Accepting request 636283 from home:jengelh:branches:Archiving

- Fix RPM groups. Remove idempotent %if..%endif guards.
  Diversify summaries. Set CFLAGS instead of re-defining
  optflags with itself.

OBS-URL: https://build.opensuse.org/request/show/636283
OBS-URL: https://build.opensuse.org/package/show/Archiving/libarchive?expand=0&rev=77
This commit is contained in:
Adrian Schröter 2018-09-18 07:41:19 +00:00 committed by Git OBS Bridge
parent 3effff948a
commit 06d8f80ff8
2 changed files with 18 additions and 12 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Sep 18 07:08:54 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
- Fix RPM groups. Remove idempotent %if..%endif guards.
Diversify summaries. Set CFLAGS instead of re-defining
optflags with itself.
-------------------------------------------------------------------
Fri Sep 14 06:57:14 UTC 2018 - Adrian Schröter <adrian@suse.de>

View File

@ -35,7 +35,7 @@
Name: libarchive
Version: 3.3.3
Release: 0
Summary: Creates and reads several different streaming archive formats
Summary: Utility and C library to create and read several different streaming archive formats
License: BSD-2-Clause
Group: Productivity/Archiving/Compression
Url: http://www.libarchive.org/
@ -60,7 +60,7 @@ BuildRequires: zlib-devel
Libarchive is a programming library that can create and read several
different streaming archive formats, including most popular tar
variants and several cpio formats. It can also write shar archives and
read ISO9660 CDROM images. The bsdtar program is an implementation of
read ISO-9660 CDROM images. The bsdtar program is an implementation of
tar(1) that is built on top of libarchive. It started as a test
harness, but has grown and is now the standard system tar for FreeBSD 5
and 6.
@ -69,7 +69,7 @@ This package contains the bsdtar cmdline utility.
%package -n bsdtar
Requires: %{libname} >= %{version}
Summary: Creates and reads several different streaming archive formats
Summary: Utility to read several different streaming archive formats
Group: Productivity/Archiving/Compression
%description -n bsdtar
@ -77,13 +77,13 @@ This package contains the bsdtar cmdline utility.
%package -n %{libname}
Summary: Library to work with several different streaming archive formats
Group: Development/Libraries/C and C++
Group: System/Libraries
%description -n %{libname}
Libarchive is a programming library that can create and read several
different streaming archive formats, including most popular tar
variants and several cpio formats. It can also write shar archives and
read ISO9660 CDROM images. The bsdtar program is an implementation of
read ISO-9660 CDROM images. The bsdtar program is an implementation of
tar(1) that is built on top of libarchive. It started as a test
harness, but has grown and is now the standard system tar for FreeBSD 5
and 6.
@ -142,22 +142,20 @@ Group: Development/Libraries/C and C++
Libarchive is a programming library that can create and read several
different streaming archive formats, including most popular tar
variants and several cpio formats. It can also write shar archives and
read ISO9660 CDROM images. The bsdtar program is an implementation of
read ISO-9660 CDROM images. The bsdtar program is an implementation of
tar(1) that is built on top of libarchive. It started as a test
harness, but has grown and is now the standard system tar for FreeBSD 5
and 6.
This package contains the development files.
%if %{with static_libs}
%package static-devel
Requires: %{name}-devel = %{version}
Summary: static library for libarchive
Summary: Static library for libarchive
Group: Development/Libraries/C and C++
%description static-devel
static library for libarchive
%endif
Static library for libarchive
%prep
%setup -q
@ -166,7 +164,8 @@ static library for libarchive
%if !0%{?skip_autoreconf}
autoreconf -fiv
%endif
%global optflags %{optflags} -D_REENTRANT -pipe
export CFLAGS="%{optflags} -D_REENTRANT -pipe"
export CXXFLAGS="$CFLAGS"
%configure \
--disable-silent-rules \
%if %{without static_libs}
@ -184,7 +183,7 @@ make %{?_smp_mflags}
make check || make check || make check
%install
%makeinstall
%make_install
find %{buildroot} -name '*.la' -type f -delete -print
rm "%{buildroot}%{_mandir}/man5/"{tar,cpio,mtree}.5*
sed -i -e '/Libs.private/d' %{buildroot}%{_libdir}/pkgconfig/libarchive.pc