- no macro in Conflicts for old version

[packages/bzip2.git] / bzip2.spec

diff --git a/bzip2.spec b/bzip2.spec
index eddb3457ceff2a98bedf33540ba4a0a2270e08ae..bca8a2dabd868f0814050445bdf6e347291303c5 100644 (file)
--- a/bzip2.spec
+++ b/bzip2.spec
@@ -7,20 +7,21 @@ Summary(uk):  
 Summary(ru):   ëÏÍÐÒÅÓÓÏÒ ÆÁÊÌÏ× ÎÁ ÏÓÎÏ×Å ÁÌÇÏÒÉÔÍÁ ÂÌÏÞÎÏÊ ÓÏÒÔÉÒÏ×ËÉ
 Name:          bzip2
 Version:       1.0.2
-Release:       7
+Release:       12
+Epoch:         0
 License:       BSD-like
 Group:         Applications/Archiving
 Source0:       ftp://sources.redhat.com/pub/bzip2/v102/%{name}-%{version}.tar.gz
-# Source0-md5: ee76864958d568677f03db8afad92beb
+# Source0-md5: ee76864958d568677f03db8afad92beb
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
-# Source1-md5: 5ffc3dbdd40080a8c22c3b4c3143cdd7
+# Source1-md5: 5ffc3dbdd40080a8c22c3b4c3143cdd7
 Patch0:                %{name}-libtoolizeautoconf.patch
 URL:           http://sources.redhat.com/bzip2/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
+BuildRequires: tetex
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes:     libbzip2
 
 %description
 Bzip2 compresses files using the Burrows-Wheeler block-sorting text
@@ -74,15 +75,14 @@ bzip2 
 §§ ÚÁÂÅÚÐÅÞÕ¤ Ó¦ÍÅÊÓÔ×Ï ÓÔÁÔÉÓÔÉÞÎÉÈ ËÏÍÐÒÅÓÏÒ¦× PPM.
 
 %package devel
-Summary:       Libbz2 library header files
-Summary(es):   Header files and libraries needed for bzip2 development
-Summary(fr):   Librairie statique et fichiers d'en-tête pour bzip2
+Summary:       libbz2 library header files
+Summary(fr):   Fichiers d'en-tête pour bzip2
 Summary(pl):   Pliki nag³ówkowe do libbz2
-Summary(pt_BR):        Arquivos de inclusão e biblioteca de desenvolvimento para o bzip2
+Summary(pt_BR):        Arquivos de inclusão para o bzip2
 Summary(uk):   èÅÄÅÒÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÐÒÏÇÒÁÍÕ×ÁÎÎÑ Ú libbz2
 Summary(ru):   èÅÄÅÒÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÑ Ó libbz2
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Obsoletes:     libbzip2-devel
 
 %description devel
@@ -91,12 +91,8 @@ Libbz2 library header files.
 %description devel -l pl
 Pliki nag³ówkowe do libbz2.
 
-%description devel -l es
-This package includes the header files and libraries needed for
-developing programs using bzip2.
-
 %description devel -l pt_BR
-Este pacote inclui arquivos de inclusão e biblioteca necessário para o
+Este pacote inclui arquivos de inclusão necessário para o
 desenvolvimento de programas que usam o bzip2.
 
 %description devel -l ru
@@ -107,23 +103,46 @@ desenvolvimento de programas que usam o bzip2.
 ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ Â¦Â̦ÏÔÅËÕ ÔÁ ÈÅÄÅÒÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÚÒÏÂËÉ
 ÐÒÏÇÒÁÍ, Ñ˦ ×ËÌÀÞÁÀÔØ Ð¦ÄÐÒÏÇÒÁÍÉ ËÏÍÐÒÅÓ¦§/ÄÅËÏÍÐÒÅÓ¦§ bz2.
 
+%package libs
+Summary:       libbz2 library
+Summary(fr):   Librairie libbz2
+Summary(pl):   Biblioteka libbz2
+Group:         Development/Libraries
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+%ifarch amd64 ia64 ppc64 sparc64
+Provides:      libbz2.so.1.0()(64bit)
+%else
+Provides:      libbz2.so.1.0
+%endif
+Obsoletes:     libbzip2
+Conflicts:     bzip2 < 0:1.0.2-12
+
+%description libs
+libbz2 library.
+
+%description libs -l fr
+Librairie libbz2.
+
+%description libs -l pl
+Biblioteka libbz2.
+
 %package static
 Summary:       Static libbz2 library
-Summary(es):   Static libraries for bzip2 development
+Summary(fr):   Librairie statique libbz2
 Summary(pl):   Biblioteka statyczna libbz2
 Summary(pt_BR):        Bibliotecas estáticas para desenvolvimento com a bzip2
 Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ bzip2
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ bzip2
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
-%define                specflags_ia32  "-fomit-frame-pointer"
+%define                specflags_ia32  -fomit-frame-pointer
 
 %description static
 Static libbz2 library.
 
-%description static -l es
-Static libraries for bzip2 development.
+%description libs -l fr
+Librairie statique d'en-tête pour bzip2.
 
 %description static -l pl
 Biblioteka statyczna libbz2.
@@ -148,6 +167,9 @@ Bibliotecas est
 %{__autoconf}
 %configure
 %{__make}
+cd doc
+/usr/bin/texi2html bzip2.texi
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -162,18 +184,21 @@ sed -e "s@%%{_bindir}@%{_bindir}@g" \
        $RPM_BUILD_ROOT%{_bindir}/bzless
 rm -f $RPM_BUILD_ROOT%{_bindir}/bzless.tmp
 
+# 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%{_libdir}/libbz2.so.1.0
+
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs     -p /sbin/ldconfig
+%postun libs   -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc README* NEWS Y2K_INFO
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%doc README* NEWS Y2K_INFO doc/*.html
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
 %lang(es) %{_mandir}/es/man1/*
@@ -189,6 +214,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.la
 %{_includedir}/*.h
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/lib*.so.1.0
+
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a