- added no_PARALLEL_RUN and ac_fixes patches (now apt build correctly).

[packages/apt.git] / apt.spec

diff --git a/apt.spec b/apt.spec
index 4f090254edeb9bf88cf4a633b03fc09ddbe7f4f0..a554553d2b9a9f9c65770f2577f502cebc237912 100644 (file)
--- a/apt.spec
+++ b/apt.spec
@@ -3,7 +3,7 @@ Summary(es):    Advanced Packaging Tool frontend for rpm and dpkg
 Summary(pl):   Zawansowane narzêdzie do zarz±dzania pakietami
 Summary(pt):   Frontend avançado para pacotes rpm e deb
 Name:          apt
-Version:       0.3.19cnc45
+Version:       0.3.19cnc52
 Release:       1
 License:       GPL
 Group:         Applications/Archiving
@@ -17,6 +17,9 @@ Source3:      vendors.list
 Source4:       rpmpriorities
 Patch0:                %{name}-norequires.patch
 Patch1:                %{name}-pld_user_in_ftp_pass.patch
+Patch2:                %{name}-FHS.patch
+Patch3:                %{name}-no_PARALLEL_RUN.patch
+Patch4:                %{name}-ac_fixes.patch
 URL:           http://bazar.conectiva.com.br/~godoy/apt-howto/
 Requires:      gnupg
 Obsoletes:     libapt-pkg
@@ -27,6 +30,7 @@ BuildRequires:        db3-devel >= 3.1.17-3
 BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
 BuildRequires: popt-devel
+BuildRequires: autoconf
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,7 +41,7 @@ multiple source capability and several other unique features.
 
 %description -l pl
 Port debianowego narzêdzia APT dla dystrybucji bazuj±cych na zarz±dcy
-pakietów RPM. APT dostarcza narzêdzie apt-get, które umo¿liwia prost±
+pakietów RPM. APT dostarcza narzêdzie apt-get, które umo¿liwia prost±,
 bezpieczn± instalacjê i aktualizacjê pakietów. Mo¿liwo¶ci APT to wybór
 kolejno¶ci instalacji, mo¿liwo¶æ ustawienia kilku ¼róde³ pakietów itp.
 
@@ -81,8 +85,15 @@ Arquivos de desenvolvimento para a biblioteca libapt-pkg do APT
 %patch0 -p1
 %patch1 -p1
 tar xzf docs.tar.gz
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+rm -f po/{POTFILES,Makefile}
 
 %build
+aclocal -I buildlib
+autoconf
 %configure \
        --enable-nls \
        --with-gpm
@@ -91,12 +102,12 @@ tar xzf docs.tar.gz
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/cache/apt/archives/partial \
-       $RPM_BUILD_ROOT/var/state/apt/lists/partial \
+       $RPM_BUILD_ROOT/var/lib/apt/lists/partial \
        $RPM_BUILD_ROOT{%{_includedir}/apt-pkg,%{_libdir}/apt,%{_mandir}/man{5,8},%{_bindir}} \
        $RPM_BUILD_ROOT%{_sysconfdir}/apt
 
 install bin/libapt-pkg.so.*.*.* $RPM_BUILD_ROOT%{_libdir}
-cp bin/libapt-pkg.so $RPM_BUILD_ROOT%{_libdir}
+cp -f bin/libapt-pkg.so $RPM_BUILD_ROOT%{_libdir}
 
 install bin/{apt-{get,cache,config,cdrom},genpkglist,gensrclist} \
        tools/genbasedir $RPM_BUILD_ROOT%{_bindir}
@@ -139,7 +150,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/apt/*
 %{_mandir}/man[58]/*
 /var/cache/apt
-/var/state/apt
+/var/lib/apt
 %attr(755,root,root) %{_libdir}/libapt-pkg.so.*.*.*
 
 %files devel