X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apt.spec;h=3e44e063d0fe57594a10401bdf78d29a6e266d36;hb=f7a8cb120c85848ca51691486eafe11209a3a2ea;hp=ccbc3ae34225b5a10e16202e282fceb28e5221d0;hpb=b6b7fe3a13229204b1673a50962bd741bd842730;p=packages%2Fapt.git

diff --git a/apt.spec b/apt.spec
index ccbc3ae..3e44e06 100644
--- a/apt.spec
+++ b/apt.spec
@@ -1,40 +1,45 @@
+# TODO:
+# - build python bindings
+# - use system lua
 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.3.19cnc52
-Release:	5
+Version:	0.5.15cnc7
+Release:	4
 License:	GPL
 Group:		Applications/Archiving
-Group(de):	Applikationen/Archivierung
-Group(es):	Administración
-Group(pl):	Aplikacje/Archiwizacja
-Source0:	ftp://ftp.conectiva.com/pub/conectiva/EXPERIMENTAL/apt/%{name}-%{version}.tar.gz
+#Source0:	https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc7.tar.bz2
+Source0:	%{name}-%{version}.tar.bz2
+# Source0-md5:	9e44ec1503fa96832bbd9b532543e4de
 Source1:	%{name}.conf
 Source2:	%{name}-sources.list
 Source3:	vendors.list
 Source4:	rpmpriorities
-Source5:	%{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
-Obsoletes:	libapt-pkg
-BuildRequires:	rpm-devel >= 3.0.6-2
-BuildRequires:	gettext-devel
-BuildRequires:	gpm-devel
-BuildRequires:	db3-devel >= 3.1.17-3
-BuildRequires:	zlib-devel
-BuildRequires:	bzip2-devel
-BuildRequires:	popt-devel
+Source5:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-pl-man-pages.tar.bz2
+# Source5-md5:	a3e9b7fd3dbf243d63cbfcc78cb20c1c
+Patch0:		%{name}-ac_fixes.patch
+Patch1:		%{name}-pld_man.patch
+Patch2:		%{name}-man_fixes.patch
+Patch3:		%{name}-es_it.patch
+Patch4:		%{name}-filed.patch
+Patch5:		%{name}-pld_user_in_ftp_pass.patch
+# do not add slash in URL
+URL:		http://moin.conectiva.com.br/AptRpm
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	docbook-dtd31-sgml
+BuildRequires:	docbook-utils
+BuildRequires:	gettext-devel
+BuildRequires:	gpm-devel
+BuildRequires:	libmagic-devel
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool
+BuildRequires:	rpm-devel >= 4.4.1
+Requires:	gnupg
+Requires:	rpm
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes:	libapt-pkg
 
 %description
 A port of Debian's apt tools for RPM based distributions. It provides
@@ -57,14 +62,8 @@ Summary:	Development files for APT's libapt-pkg
 Summary(pl):	Pliki nag³ówkowe dla libapt-pkg
 Summary(pt):	Arquivos de desenvolvimento para a biblioteca libapt-pkg do APT
 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}
+Requires:	libstdc++-devel
 Requires:	rpm-devel
 Obsoletes:	libapt-pkg-devel
 Obsoletes:	libapt-pkg-static
@@ -74,40 +73,39 @@ This package contains the header files and static libraries for
 developing with APT's libapt-pkg package manipulation library,
 modified for RPM.
 
-%description -l es devel
-This package contains the header files and static libraries for
-developing with APT's libapt-pkg package manipulation library,
-modified for RPM.
-
-%description -l pl devel
+%description devel -l pl
 Pakiet zawiera pliki nag³ówkowe potrzebne do tworzenia aplikacji
 korzystaj±cych z biblioteki libapt-pkg.
 
-%description -l pt_BR devel
+%description devel -l pt_BR
 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
 %patch5 -p1
-%patch6 -p1
 
-mkdir docs/{pl,pt_BR}
-rm -f po/{POTFILES,Makefile}
+mv po/es_ES.po po/es.po
+mv po/it_IT.po po/it.po
+mv po/de_DE.po po/de.po
 
 %build
-aclocal -I buildlib
-autoconf
-CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
+%{__libtoolize}
+%{__gettextize}
+%{__aclocal} -I buildlib
+#need patching
+#autoheader
+%{__autoconf}
+CPPFLAGS="-Wno-deprecated"
+CXXFLAGS="%{rpmcflags} -fno-exceptions"
 %configure \
 	--enable-nls \
 	--with-gpm
-%{__make}
+%{__make} CC="%{__cc}" CXX="%{__cxx}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -115,63 +113,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-pkg.so.*.*.* $RPM_BUILD_ROOT%{_libdir}
-cp -f bin/libapt-pkg.so $RPM_BUILD_ROOT%{_libdir}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install bin/{apt-{get,cache,config,cdrom},genpkglist,gensrclist} \
-	tools/genbasedir $RPM_BUILD_ROOT%{_bindir}
+install doc/pl/*.8 $RPM_BUILD_ROOT%{_mandir}/pl/man8
 
-install apt-pkg/{*.h,*/*.h} $RPM_BUILD_ROOT%{_includedir}/apt-pkg
+rm -f $RPM_BUILD_ROOT%{_libdir}/apt/methods/bzip2
+rm -f $RPM_BUILD_ROOT%{_libdir}/apt/methods/ssh
+ln -sf ./gzip $RPM_BUILD_ROOT%{_libdir}/apt/methods/bzip2
+ln -sf ./rsh $RPM_BUILD_ROOT%{_libdir}/apt/methods/ssh
 
-for a in "" pl pt_BR ; do
-	if ls doc/*.5 >/dev/null 2>&1 ; then
-		install doc/*.5 $RPM_BUILD_ROOT/%{_mandir}/$a/man5
-	fi
-	install doc/*.8 $RPM_BUILD_ROOT/%{_mandir}/$a/man8
-done
-
-install  bin/methods/* $RPM_BUILD_ROOT%{_libdir}/apt
-
-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 ..
-
-gzip -9fn docs/*.text docs/examples/* README.RPM TODO
-
 %find_lang %{name}
 
 %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 docs/*.gz docs/examples/*.gz *.gz
+%doc doc/examples/* TODO
 %attr(755,root,root) %{_bindir}/*
 %dir %{_sysconfdir}/apt
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/apt/apt.conf 
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/apt/sources.list
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/apt/vendors.list
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apt/apt.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apt/sources.list
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apt/vendors.list
 %config %{_sysconfdir}/apt/rpmpriorities
 %dir %{_libdir}/apt
 %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-pkg.so.*.*.*
+%attr(755,root,root) %{_libdir}/libapt*.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libapt-pkg.so
+%{_libdir}/libapt*.so
+%{_libdir}/libapt*.a
+%{_libdir}/libapt*.la
 %{_includedir}/apt-pkg