- release 12,

- spec adapterized,
- added info patch with xdelta info index entry fixes,
- added ac_fixes patch with remove test/Makefile from AC_OUTPUT() and
  remove all manipulation in CFLAGS (for allow non problematic pass
  $RPM_OPT_FLAGS to CFLAGS),
- added info paces to main and aclocal macros to devel,
- run fix-info-dir in %post/%postun,
- merge translations from CNV.

Changed files:
    xdelta.spec -> 1.42

diff --git a/xdelta.spec b/xdelta.spec
index 701cf0509bd4ad787bc61585f5b83bb968e70d84..a6c7abf71efc4903809c88b96c9233955f496b1b 100644 (file)
--- a/xdelta.spec
+++ b/xdelta.spec
@@ -1,17 +1,27 @@
 Summary:       XDELTA - version control system
+Summary(es):   patch y diff para archivos binarios
 Summary(pl):   XDELTA - system kontroli wersji
+Summary(pt_BR):        patch e diff para arquivos binários
 Name:          xdelta
 Version:       1.1.1
-Release:       5
+Release:       12
 License:       GPL
 Group:         Development/Version Control
 Group(de):     Entwicklung/Versionkontrolle
 Group(pl):     Programowanie/Zarz±dzanie wersjami
 Source0:       ftp://www.xcf.berkeley.edu/pub/xdelta/%{name}-%{version}.tar.gz
+Patch0:                %{name}-info.patch
+Patch1:                xdelta-ac_fixes.patch
+Patch2:                xdelta-use_sys_getopt.patch
 URL:           http://www.XCF.Berkeley.EDU/~jmacd/xdelta.html
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: glib-devel >= 1.2.0
+BuildRequires: libtool
 BuildRequires: zlib-devel
 Requires:      glib >= 1.2.0
+Requires(post):                /sbin/ldconfig
+Requires(postun):      /sbin/ldconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -35,6 +45,10 @@ higher-level programs such as XCF's Project Revision Control System
 a binary file delta algorithm to replace the standard diff program
 used by RCS.
 
+%description -l es
+xdelta es como las órdenes patch y diff, pero también funciona con
+archivos binarios.
+
 %description -l pl
 XDELTA (`X' od XCF) jest bibliotek± systemu kontroli wersji tworzona
 jako zamiennik RCS. Biblioteka XDELTA wykonuje ró¿ne czynno¶ci
@@ -43,40 +57,71 @@ plik
 u¿ywania w ró¿nych wysoko-poziomowych systemach kontroli wersji jak
 PRCS.
 
+%description -l pt_BR
+xdelta é como os comandos patch e diff, mas também funciona com
+arquivos binários.
+
 %package devel
 Summary:       XDELTA - header files
+Summary(es):   xdelta development files
 Summary(pl):   XDELTA - pliki nag³ówkowe
+Summary(pt_BR):        Arquivos de desenvolvimento xdelta
 Group:         Development/Libraries
 Group(de):     Entwicklung/Libraries
+Group(es):     Desarrollo/Bibliotecas
 Group(fr):     Development/Librairies
 Group(pl):     Programowanie/Biblioteki
+Group(pt_BR):  Desenvolvimento/Bibliotecas
+Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 
 %description devel
 This package contains the XDELTA header files required to develop
 XDELTA-based applications.
 
+%description -l es devel
+xdelta development files.
+
 %description -l pl devel
 Pakiet ten zawiera pliki nag³ówkowe potrzebne przy tworzeniu aplikacji
 bazuj±cych na XDELTA.
 
+%description -l pt_BR devel
+Esse pacote contém os arquivos de desenvolvimento do xdelta.
+
 %package static
 Summary:       XDELTA - static library
+Summary(es):   Static libraries for xdelta development
 Summary(pl):   XDELTA - biblioteka statyczna
+Summary(pt_BR):        Bibliotecas estáticas para desenvolvimento com xdelta
 Group:         Development/Libraries
 Group(de):     Entwicklung/Libraries
+Group(es):     Desarrollo/Bibliotecas
 Group(fr):     Development/Librairies
 Group(pl):     Programowanie/Biblioteki
+Group(pt_BR):  Desenvolvimento/Bibliotecas
+Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-devel = %{version}
 
 %description static
 This package contains the XDELTA static libraries
 
+%description -l es static
+Static libraries for xdelta development.
+
 %description -l pl static
 Pakiet ten zawiera bibliotekê statyczn± XDELTA.
 
+%description -l pt_BR static
+Bibliotecas estáticas para desenvolvimento com xdelta.
+
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 libtoolize -c -f
@@ -88,14 +133,20 @@ autoconf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_infodir}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       m4datadir=%{_aclocaldir}
 
 gzip -9nf NEWS READ* ChangeLog
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+
+%postun
+/sbin/ldconfig
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -109,11 +160,10 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc {NEWS,READ*,ChangeLog}.gz
-
 %attr(755,root,root) %{_bindir}/xdelta-config
-%{_includedir}/*
-
 %attr(755,root,root) %{_libdir}/lib*.so
+%{_aclocaldir}/*
+%{_includedir}/*
 
 %files static
 %defattr(644,root,root,755)