X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apt.spec;h=662599bb5673e507a119561a067a02654d60f953;hb=7aa40dd6ad248f682142e970b7400f0946b42aba;hp=f79124eb9304481174490e37e9e845d86be5f6d9;hpb=4f97bd782bd1dd818ee5e5037ea63096214be5c6;p=packages%2Fapt.git

diff --git a/apt.spec b/apt.spec
index f79124e..662599b 100644
--- a/apt.spec
+++ b/apt.spec
@@ -1,29 +1,33 @@
+# TODO:
+# - build python bindings
 Summary:	Debian's Advanced Packaging Tool with RPM support
-Summary(pl):	Zawansowane narzêdzie do zarz±dzania pakietami
+Summary(pl):	Zaawansowane narzêdzie do zarz±dzania pakietami
 Summary(pt):	Frontend avançado para pacotes rpm e deb
 Name:		apt
-Version:	0.5.4cnc7
-Release:	0.9
+Version:	0.5.5cnc4.1
+Release:	0.2
 License:	GPL
 Group:		Applications/Archiving
 Source0:	http://moin.conectiva.com.br/files/AptRpm/attachments/%{name}-%{version}.tar.bz2
+# Source0-md5:	cde405f21583ea6f8e012dc3d62412aa
 Source1:	%{name}.conf
 Source2:	%{name}-sources.list
 Source3:	vendors.list
 Source4:	rpmpriorities
 Source5:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-pl-man-pages.tar.bz2
+# Source5-md5:	a3e9b7fd3dbf243d63cbfcc78cb20c1c
 Patch0:		%{name}-no_PARALLEL_RUN.patch
 Patch1:		%{name}-ac_fixes.patch
 Patch2:		%{name}-pld_man.patch
 Patch3:		%{name}-man_fixes.patch
-Patch4:		%{name}-md5-cache-dir-option.patch
 Patch5:		%{name}-es_it.patch
 Patch6:		%{name}-filed.patch
+Patch7:		%{name}-pld_user_in_ftp_pass.patch
+Patch8:		%{name}-assert.patch
 URL:		http://moin.conectiva.com.br/files/AptRpm/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
-BuildRequires:	db3-devel >= 3.1.17-3
 BuildRequires:	gettext-devel
 BuildRequires:	gpm-devel
 BuildRequires:	popt-devel
@@ -56,6 +60,7 @@ Summary(pl):	Pliki nag
 Summary(pt):	Arquivos de desenvolvimento para a biblioteca libapt-pkg do APT
 Group:		Development/Libraries
 Requires:	%{name} = %{version}
+Requires:	libstdc++-devel
 Requires:	rpm-devel
 Obsoletes:	libapt-pkg-devel
 Obsoletes:	libapt-pkg-static
@@ -83,9 +88,10 @@ Arquivos de desenvolvimento para a biblioteca libapt-pkg do APT
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p0
+%patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 mv po/es_ES.po po/es.po
@@ -97,11 +103,11 @@ mv po/de_DE.po po/de.po
 #autoheader
 %{__autoconf}
 CPPFLAGS="-Wno-deprecated"
-CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
+CXXFLAGS="%{rpmcflags} -fno-exceptions"
 %configure \
 	--enable-nls \
 	--with-gpm
-%{__make} CC="%{__cc}"  CXX="%{__cxx}"
+%{__make} CC="%{__cc}" CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -109,50 +115,52 @@ install -d $RPM_BUILD_ROOT/var/cache/apt/archives/partial \
 	$RPM_BUILD_ROOT/var/lib/apt/lists/partial \
 	$RPM_BUILD_ROOT{%{_includedir}/apt-pkg,%{_libdir}/apt} \
 	$RPM_BUILD_ROOT{%{_mandir}/{,pl/,pt_BR/}man{5,8},%{_bindir}} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/apt
+	$RPM_BUILD_ROOT{%{_sysconfdir}/apt,%{_datadir}}
+
 
 install bin/libapt*.so.*.*.* $RPM_BUILD_ROOT%{_libdir}
-cp -f bin/libapt*.so $RPM_BUILD_ROOT%{_libdir}
+cp -df bin/libapt*.so $RPM_BUILD_ROOT%{_libdir}
 
 install -m755 bin/apt-* bin/gen* bin/hd* \
 	$RPM_BUILD_ROOT%{_bindir}
-install -m755 tools/genbasedir $RPM_BUILD_ROOT%{_bindir}	
+install -m755 tools/genbasedir $RPM_BUILD_ROOT%{_bindir}
 
 install apt-pkg/{*.h,*/*.h} $RPM_BUILD_ROOT%{_includedir}/apt-pkg
 
-for a in "" pl pt_BR ; do
+for a in "" pl ; do
 	if ls doc/$a/*.5 >/dev/null 2>&1 ; then
 		install -m644 doc/*.5 $RPM_BUILD_ROOT%{_mandir}/$a/man5
 	fi
 	install -m644 doc/$a/*.8 $RPM_BUILD_ROOT%{_mandir}/$a/man8
 done
 
-install  bin/methods/* $RPM_BUILD_ROOT%{_libdir}/apt
+install bin/methods/* $RPM_BUILD_ROOT%{_libdir}/apt
 rm -f $RPM_BUILD_ROOT%{_libdir}/apt/bzip2
 rm -f $RPM_BUILD_ROOT%{_libdir}/apt/ssh
-ln -s ./gzip $RPM_BUILD_ROOT%{_libdir}/apt/bzip2
-ln -s ./rsh $RPM_BUILD_ROOT%{_libdir}/apt/ssh
+ln -sf ./gzip $RPM_BUILD_ROOT%{_libdir}/apt/bzip2
+ln -sf ./rsh $RPM_BUILD_ROOT%{_libdir}/apt/ssh
 
-install %{SOURCE1}   	$RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf
-install %{SOURCE3}   	$RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list
+install %{SOURCE1}	$RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf
+install %{SOURCE3}	$RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list
 install %{SOURCE4}	$RPM_BUILD_ROOT%{_sysconfdir}/apt/rpmpriorities
-# bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 sed -e s/@ARCH@/%{_target_cpu}/ %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list
 
-cd po; %{__make} install DESTDIR=$RPM_BUILD_ROOT; cd ..
+cp -a locale $RPM_BUILD_ROOT%{_datadir}/
 
 %find_lang %{name}
+%find_lang libapt-pkg3.3
+cat libapt-pkg3.3.lang >> %{name}.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc doc/examples/* README.RPM TODO
+%doc docs/examples/* TODO
 %attr(755,root,root) %{_bindir}/*
 %dir %{_sysconfdir}/apt
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/apt/apt.conf
@@ -163,12 +171,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/apt/*
 %{_mandir}/man[58]/*
 %lang(pl) %{_mandir}/pl/man8/*
-#%lang(pt) %{_mandir}/pt_BR/man[58]/*
 /var/cache/apt
 /var/lib/apt
 %attr(755,root,root) %{_libdir}/libapt*.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
+%doc doc/libapt-pkg2_to_3.txt
 %{_libdir}/libapt*.so
 %{_includedir}/apt-pkg