X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apt.spec;h=a276e301d61eca0647e83e6568eb51bae80d2b5b;hb=f4c11b999c72a9659f017ecb593b17f911b50c35;hp=9ea66a309bcc8ce2472003c38394793929255a88;hpb=b4e466978abb58cf329fee54c3de1ecc112eb9e5;p=packages%2Fapt.git

diff --git a/apt.spec b/apt.spec
index 9ea66a3..a276e30 100644
--- a/apt.spec
+++ b/apt.spec
@@ -2,34 +2,34 @@ Summary:	Debian's Advanced Packaging Tool with RPM support
 Summary(pl):	Zawansowane narzêdzie do zarz±dzania pakietami
 Summary(pt):	Frontend avançado para pacotes rpm e deb
 Name:		apt
-Version:	0.3.19cnc52
-Release:	8
+Version:	0.5.4cnc7
+Release:	0.9
 License:	GPL
 Group:		Applications/Archiving
-Source0:	ftp://ftp.conectiva.com/pub/conectiva/EXPERIMENTAL/apt/%{name}-%{version}.tar.gz
+Source0:	http://moin.conectiva.com.br/files/AptRpm/attachments/%{name}-%{version}.tar.bz2
 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
-Patch0:		%{name}-norequires.patch
-Patch1:		%{name}-FHS.patch
-Patch2:		%{name}-no_PARALLEL_RUN.patch
-Patch3:		%{name}-ac_fixes.patch
-Patch4:		%{name}-newmethods.patch
-Patch5:		%{name}-pld_man.patch
-Patch6:		%{name}-man_fixes.patch
-URL:		http://bazar.conectiva.com.br/~godoy/apt-howto/
-Requires:	gnupg
+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
+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
 BuildRequires:	rpm-devel >= 3.0.6-2
 BuildRequires:	zlib-devel
+Requires:	gnupg
+Requires:	rpm
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	libapt-pkg
 
@@ -79,25 +79,28 @@ Arquivos de desenvolvimento para a biblioteca libapt-pkg do APT
 %prep
 %setup -q -a5
 %patch0 -p1
-tar xzf docs.tar.gz
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+#%patch2 -p1
+#%patch3 -p1
+#%patch4 -p1
 %patch5 -p1
-%patch6 -p1
-
-mkdir docs/{pl,pt_BR}
-rm -f po/{POTFILES,Makefile}
+#%patch6 -p1
 
 %build
-aclocal -I buildlib
-autoconf
+mv po/es_ES.po po/es.po
+mv po/it_IT.po po/it.po
+mv po/de_DE.po po/de.po
+
+%{__aclocal} -I buildlib
+#need patching
+#autoheader
+%{__autoconf}
+CPPFLAGS="-Wno-deprecated"
 CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
 %configure \
 	--enable-nls \
 	--with-gpm
-%{__make}
+%{__make} CC="%{__cc}"  CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -107,22 +110,27 @@ install -d $RPM_BUILD_ROOT/var/cache/apt/archives/partial \
 	$RPM_BUILD_ROOT{%{_mandir}/{,pl/,pt_BR/}man{5,8},%{_bindir}} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/apt
 
-install bin/libapt-pkg.so.*.*.* $RPM_BUILD_ROOT%{_libdir}
-cp -f bin/libapt-pkg.so $RPM_BUILD_ROOT%{_libdir}
+install bin/libapt*.so.*.*.* $RPM_BUILD_ROOT%{_libdir}
+cp -f bin/libapt*.so $RPM_BUILD_ROOT%{_libdir}
 
-install bin/{apt-{get,cache,config,cdrom},genpkglist,gensrclist} \
-	tools/genbasedir $RPM_BUILD_ROOT%{_bindir}
+install -m755 bin/apt-* bin/gen* bin/hd* \
+	$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 doc/$a/*.5 $RPM_BUILD_ROOT/%{_mandir}/$a/man5
+		install -m644 doc/*.5 $RPM_BUILD_ROOT%{_mandir}/$a/man5
 	fi
-	install doc/$a/*.8 $RPM_BUILD_ROOT/%{_mandir}/$a/man8
+	install -m644 doc/$a/*.8 $RPM_BUILD_ROOT%{_mandir}/$a/man8
 done
 
 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
 
 install %{SOURCE1}   	$RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf
 install %{SOURCE3}   	$RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list
@@ -131,9 +139,7 @@ install %{SOURCE4}	$RPM_BUILD_ROOT%{_sysconfdir}/apt/rpmpriorities
 
 sed -e s/@ARCH@/%{_target_cpu}/ %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list
 
-cd po; make install DESTDIR=$RPM_BUILD_ROOT; cd ..
-
-gzip -9fn docs/*.text docs/examples/* README.RPM TODO
+cd po; %{__make} install DESTDIR=$RPM_BUILD_ROOT; cd ..
 
 %find_lang %{name}
 
@@ -145,7 +151,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc docs/*.gz docs/examples/*.gz *.gz
+%doc doc/examples/* README.RPM TODO
 %attr(755,root,root) %{_bindir}/*
 %dir %{_sysconfdir}/apt
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/apt/apt.conf
@@ -156,12 +162,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]/*
+#%lang(pt) %{_mandir}/pt_BR/man[58]/*
 /var/cache/apt
 /var/lib/apt
-%attr(755,root,root) %{_libdir}/libapt-pkg.so.*.*.*
+%attr(755,root,root) %{_libdir}/libapt*.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libapt-pkg.so
+%{_libdir}/libapt*.so
 %{_includedir}/apt-pkg