Accepting request 501361 from home:pluskalm:branches:Archiving

- Drop implicit pie building
- Try profiled build
- Move autoreconf to build section

OBS-URL: https://build.opensuse.org/request/show/501361
OBS-URL: https://build.opensuse.org/package/show/Archiving/bzip2?expand=0&rev=61
This commit is contained in:
Martin Pluskal 2017-06-06 11:11:31 +00:00 committed by Git OBS Bridge
parent a05a1b34ed
commit d78e30202a
2 changed files with 46 additions and 13 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jun 6 10:32:06 UTC 2017 - mpluskal@suse.com
- Drop implicit pie building
- Try profiled build
- Move autoreconf to build section
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 23 15:14:20 UTC 2017 - kstreitova@suse.com Thu Mar 23 15:14:20 UTC 2017 - kstreitova@suse.com

View File

@ -41,10 +41,9 @@ BuildRequires: autoconf >= 2.57
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
# The following is a kludge to get updating bzip2 to after the split work # The following is a kludge to get updating bzip2 to after the split work
PreReq: %{libname} Requires(pre): %{libname}
Provides: bzip = %{version} Provides: bzip = %{version}
Obsoletes: bzip < %{version} Obsoletes: bzip < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
The bzip2 program is a very powerful program for compressing files. The bzip2 program is a very powerful program for compressing files.
@ -52,9 +51,7 @@ The bzip2 program is a very powerful program for compressing files.
%package doc %package doc
Summary: The bzip2 program and Library Documentation Summary: The bzip2 program and Library Documentation
Group: Productivity/Archiving/Compression Group: Productivity/Archiving/Compression
%if 0%{?suse_version} > 1130
BuildArch: noarch BuildArch: noarch
%endif
%description doc %description doc
The bzip2 program and library documentation. The bzip2 program and library documentation.
@ -83,19 +80,27 @@ The bzip2 runtime library development files.
%patch3 -p1 %patch3 -p1
%patch4 %patch4
%patch5 -p1 %patch5 -p1
autoreconf -fiv
%build %build
export CFLAGS="%{optflags} -fPIE" autoreconf -fiv
%configure --with-pic --disable-static %configure \
make %{?_smp_mflags} LDFLAGS="-pie" --with-pic \
--disable-static
%if %{do_profiling}
make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}"
make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" check
make test
make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_feedback}"
%else
make %{?_smp_mflags} CFLAGS="%{optflags}"
%endif
%install %install
make DESTDIR=%{buildroot} install %{?_smp_mflags} pkgconfigdir=%{_libdir}/pkgconfig %make_install pkgconfigdir=%{_libdir}/pkgconfig
gzip -9 manual.ps gzip -9 manual.ps
gzip -dc %{SOURCE1} > bznew gzip -dc %{SOURCE1} > bznew
install -D -m 755 bznew %{buildroot}%{_bindir}/bznew install -Dpm 0755 bznew %{buildroot}%{_bindir}/bznew
install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1 install -m 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1
# Steam and prolly others still use the 1.0 name, so we need to be # Steam and prolly others still use the 1.0 name, so we need to be
# compatible # compatible
# Remove this when all distros use the autotools based bzip2 release # Remove this when all distros use the autotools based bzip2 release
@ -111,8 +116,29 @@ make %{?_smp_mflags} test
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_mandir}/man1/* %{_bindir}/bunzip2
%{_bindir}/* %{_bindir}/bzcat
%{_bindir}/bzcmp
%{_bindir}/bzdiff
%{_bindir}/bzegrep
%{_bindir}/bzfgrep
%{_bindir}/bzgrep
%{_bindir}/bzip2
%{_bindir}/bzip2recover
%{_bindir}/bzless
%{_bindir}/bzmore
%{_bindir}/bznew
%{_mandir}/man1/bunzip2.1%{ext_man}
%{_mandir}/man1/bzcat.1%{ext_man}
%{_mandir}/man1/bzcmp.1%{ext_man}
%{_mandir}/man1/bzdiff.1%{ext_man}
%{_mandir}/man1/bzegrep.1%{ext_man}
%{_mandir}/man1/bzfgrep.1%{ext_man}
%{_mandir}/man1/bzgrep.1%{ext_man}
%{_mandir}/man1/bzip2.1%{ext_man}
%{_mandir}/man1/bzless.1%{ext_man}
%{_mandir}/man1/bzmore.1%{ext_man}
%{_mandir}/man1/bznew.1%{ext_man}
%files doc %files doc
%defattr(-,root,root) %defattr(-,root,root)