- typo

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 4dda17ad9e8d04ff5550c738dbe40dd03c528e5f..87adc98bb9d212be3a6cc7e51fd16cb301de789f 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -47,11 +47,11 @@ Summary(ru.UTF-8):  Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.0
-Release:       0.1
+Release:       0.2
 License:       GPL
 Group:         Base
-Source0:       %{name}-20070927.tar.gz
-# Source0-md5: cf0bda3a41b74d68b36ef078edfafc6d
+Source0:       %{name}-20071029.tar.bz2
+# Source0-md5: 572527ed1757842b2d8cb264473d2dea
 Source1:       %{name}.groups
 Source2:       %{name}.platform
 Source3:       %{name}-install-tree
@@ -78,13 +78,12 @@ Source102:  %{name}-macros-i486
 Source103:     %{name}-macros-i586
 Source104:     %{name}-macros-i686
 Source105:     %{name}-macros-noarch
-Source106:     %{name}-macros.patch
-Source107:     %{name}-macros-pentium3
-Source108:     %{name}-macros-pentium4
-Source109:     %{name}-macros-ppc
-Source110:     %{name}-macros-x86_64
-Source111:     %{name}-macros-ia32e
-Source112:     %{name}-macros-amd64
+Source106:     %{name}-macros-pentium3
+Source107:     %{name}-macros-pentium4
+Source108:     %{name}-macros-ppc
+Source109:     %{name}-macros-x86_64
+Source110:     %{name}-macros-ia32e
+Source111:     %{name}-macros-amd64
 
 Patch0:                %{name}-pl.po.patch
 
@@ -104,7 +103,6 @@ Patch18:    %{name}-perl_req.patch
 
 Patch23:       %{name}-pkgconfigdeps.patch
 
-Patch25:       %{name}-rpm2cpio-payload.patch
 Patch26:       %{name}-notsc.patch
 Patch27:       %{name}-hack-norpmlibdep.patch
 
@@ -609,12 +607,6 @@ Python para manipular pacotes e bancos de dados RPM.
 
 %prep
 %setup -q -n %{name}
-sed -i -e 's# no # nb #g' configure.ac
-mv po/no.po po/nb.po
-sed -i -e 's# sr # sr@Latn #g' configure.ac
-mv -f po/{sr,sr@Latn}.po
-
-sed -i -e 's#${prefix}/lib/python@WITH_PYTHON_VERSION@#@WITH_PYTHON_LIBDIR@#g' python/rpm/Makefile.am
 
 # APPLIED ALREADY?
 #%patch0 -p1
@@ -642,8 +634,8 @@ install %{SOURCE9} scripts/php.prov.in
 install %{SOURCE10} scripts/php.req.in
 install %{SOURCE12} scripts/perl.prov
 %patch23 -p1
-%patch25 -p1
-%ifarch i386
+
+%ifarch i386 i486
 # disable TSC
 %patch26 -p1
 %endif
@@ -719,8 +711,8 @@ awk -f %{SOURCE6} %{SOURCE1}
        --with-db=%{?with_db:external}%{!?with_db:no} \
        --with-sqlite=%{?with_sqlite:external}%{!?with_sqlite:no} \
        --with-dbapi=%{!?sqlite_dbapi:db}%{?sqlite_dbapi:sqlite} \
-       --with-lua=none \
-       --with-pcre=external \
+       --with-lua=internal \
+       --with-pcre=no \
        --with-keyutils=none \
        --without-path-versioned \
        --with-path-macros='%{_rpmlibdir}/macros:%{_rpmlibdir}/macros.pld:%{_rpmlibdir}/macros.build:%{_rpmlibdir}/%%{_target}/macros:%{_sysconfdir}/macros.*:%{_sysconfdir}/macros:%{_sysconfdir}/%%{_target}/macros:~/etc/rpmmacros:~/etc/.rpmmacros:~/.rpmmacros' \
@@ -750,20 +742,20 @@ install %{SOURCE101} $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros
 install %{SOURCE102} $RPM_BUILD_ROOT%{_rpmlibdir}/i486-linux/macros
 install %{SOURCE103} $RPM_BUILD_ROOT%{_rpmlibdir}/i586-linux/macros
 install %{SOURCE104} $RPM_BUILD_ROOT%{_rpmlibdir}/i686-linux/macros
-install %{SOURCE107} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros
-install %{SOURCE110} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros
+install %{SOURCE106} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros
+install %{SOURCE107} $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros
 %endif
 
 %ifarch %{x8664}
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/{x86_64,ia32e,amd64}-linux
-install %{SOURCE110} $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros
-install %{SOURCE111} $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros
-install %{SOURCE112} $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros
+install %{SOURCE109} $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros
+install %{SOURCE110} $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros
+install %{SOURCE111} $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros
 %endif
 
 %ifarch %{ppc}
 install -d $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux
-install %{SOURCE109} $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros
+install %{SOURCE108} $RPM_BUILD_ROOT%{_rpmlibdir}/ppc-linux/macros
 %endif
 
 # first platform file entry can't contain regexps
@@ -1045,8 +1037,12 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_pkgconfigdir}/*.pc
 %attr(755,root,root) %{_libdir}/librpm.so
 %attr(755,root,root) %{_libdir}/librpm-%{sover}.so
+%attr(755,root,root) %{_libdir}/librpmconstant.so
+%attr(755,root,root) %{_libdir}/librpmconstant-%{sover}.so
 %attr(755,root,root) %{_libdir}/librpmio.so
 %attr(755,root,root) %{_libdir}/librpmio-%{sover}.so
+%attr(755,root,root) %{_libdir}/librpmmisc.so
+%attr(755,root,root) %{_libdir}/librpmmisc-%{sover}.so
 %attr(755,root,root) %{_libdir}/librpmdb.so
 %attr(755,root,root) %{_libdir}/librpmdb-%{sover}.so
 %attr(755,root,root) %{_libdir}/librpmbuild.so