- rediffed

[packages/bzip2.git] / bzip2.spec

diff --git a/bzip2.spec b/bzip2.spec
index dd953804cbc998877db8e5df52aa50fb318b2f7e..d99966527cf2c995e588dc6976c7901717214bb0 100644 (file)
--- a/bzip2.spec
+++ b/bzip2.spec
@@ -1,7 +1,7 @@
 #
 # Conditional build:
 %bcond_with    progress        # with progressbar patch
-%bcond_without static_libs     # don't build static libraries
+%bcond_without static_libs     # static libraries
 
 Summary:       Extremely powerful file compression utility
 Summary(es.UTF-8):     Un compresor de archivos con un nuevo algoritmo
@@ -11,20 +11,20 @@ Summary(pt_BR.UTF-8):       Compactador de arquivo extremamente poderoso
 Summary(uk.UTF-8):     Компресор файлів на базі алгоритму блочного сортування
 Summary(ru.UTF-8):     Компрессор файлов на основе алгоритма блочной сортировки
 Name:          bzip2
-Version:       1.0.6
-Release:       3
+Version:       1.0.8
+Release:       1
 License:       BSD-like
 Group:         Applications/Archiving
-Source0:       http://www.bzip.org/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 00b516f4704d4a7cb50a1d97e6e8e15b
+Source0:       https://sourceware.org/pub/bzip2/%{name}-%{version}.tar.gz
+# Source0-md5: 67e051268d0c475ea773822f7500d0e5
 Source1:       http://qboosh.pl/man/%{name}-man-pages.tar.bz2
 # Source1-md5: 14a68bf85666428000aad7cb0785a6e5
 Source2:       %{name}.pc
 Patch0:                %{name}-libtoolizeautoconf.patch
-Patch1:                %{name}-bzgrep.patch
+
 # Modified from http://www.vanheusden.com/Linux/bzip2-1.0.2.diff.gz
 Patch2:                %{name}-progress-counter-1.0.2.patch
-URL:           http://www.bzip.org/
+URL:           https://sourceware.org/bzip2/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.6
 BuildRequires: libtool
@@ -167,7 +167,7 @@ Bibliotecas estáticas para desenvolvimento com a bzip2.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+
 %{?with_progress:%patch2 -p1}
 
 %build
@@ -193,9 +193,10 @@ install -d $RPM_BUILD_ROOT{/%{_lib},/etc/env.d,%{_pkgconfigdir}}
        s|^Version:.*|Version: %{version}|
 ' %{SOURCE2} > $RPM_BUILD_ROOT%{_pkgconfigdir}/bzip2.pc
 
-mv -f $RPM_BUILD_ROOT%{_libdir}/libbz2.so.* $RPM_BUILD_ROOT/%{_lib}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libbz2.so.* $RPM_BUILD_ROOT/%{_lib}
 ln -sf /%{_lib}/libbz2.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libbz2.so
 
+# TODO: move this to install-*-hook so the patch could be upstreamed eventually
 # standard soname was libbz2.so.1.0, libtoolizeautoconf patch broke it,
 # but ABI has not changed - provide symlink for binary compatibility
 ln -sf libbz2.so.1.0.0 $RPM_BUILD_ROOT/%{_lib}/libbz2.so.1.0