X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apt.spec;h=d97463b6dc9e8b94fd11574d63245ca2ab692b91;hb=9ce559347936253d89447c556cb6e1c851b91dfc;hp=abcff09e743c2fbbda6714072b8d281bff77e1c0;hpb=9985ac2cae614350e5c386861e9b3aeac13ecc99;p=packages%2Fapt.git

diff --git a/apt.spec b/apt.spec
index abcff09..d97463b 100644
--- a/apt.spec
+++ b/apt.spec
@@ -1,10 +1,9 @@
 Summary:	Debian's Advanced Packaging Tool with RPM support
-Summary(es):	Advanced Packaging Tool frontend for rpm and dpkg
 Summary(pl):	Zawansowane narzêdzie do zarz±dzania pakietami
-Summary(pt_BR):	Frontend avançado para pacotes rpm e deb
+Summary(pt):	Frontend avançado para pacotes rpm e deb
 Name:		apt
-Version: 	0.3.19cnc35
-Release:	0.1
+Version:	0.3.19cnc52
+Release:	2
 License:	GPL
 Group:		Applications/Archiving
 Group(de):	Applikationen/Archivierung
@@ -12,10 +11,17 @@ Group(es):	Administraci
 Group(pl):	Aplikacje/Archiwizacja
 Source0:	ftp://ftp.conectiva.com/pub/conectiva/EXPERIMENTAL/apt/%{name}-%{version}.tar.gz
 Source1:	%{name}.conf
-Source2:	sources.list
+Source2:	%{name}-sources.list
 Source3:	vendors.list
+Source4:	rpmpriorities
+Patch0:		%{name}-norequires.patch
+Patch1:		%{name}-FHS.patch
+Patch2:		%{name}-no_PARALLEL_RUN.patch
+Patch3:		%{name}-ac_fixes.patch
+Patch4:		%{name}-newmethods.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
@@ -23,6 +29,8 @@ BuildRequires:	db3-devel >= 3.1.17-3
 BuildRequires:	zlib-devel
 BuildRequires:	bzip2-devel
 BuildRequires:	popt-devel
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -33,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.
 
@@ -41,56 +49,55 @@ kolejno
 Um porte das ferramentas apt do Debian para distribuições baseadas no
 RPM. Sob desenvolvimento, use por sua própria conta e risco.
 
-%package -n libapt-pkg
-Summary:        libapt-pkg library
-Summary(pl):    Biblioteka libapt-pkg
-Group:          Libraries
-Group(de):      Libraries
-Group(fr):      Librairies
-Group(pl):      Biblioteki
-
-%description -n libapt-pkg
-libapt-pkg library
-
-%description -l pl -n libapt-pkg
-Biblioteka libapt-pkg.
-
-%package -n libapt-pkg-devel
+%package devel
 Summary:	Development files for APT's libapt-pkg
-Summary(es):	Development files for APT's libapt-pkg
 Summary(pl):	Pliki nag³ówkowe dla libapt-pkg
-Summary(pt_BR):	Arquivos de desenvolvimento para a biblioteca libapt-pkg do APT
-Group:		Development
-Group(de):	Entwicklung
-Group(pl):	Programowanie
-Group(pt_BR):	Desenvolvimento
-Group(de):	Applikationen/Archivierung
-Group(es):	Desarrollo
-Group(pl):	Aplikacje/Archiwizacja
-Requires:	libapt-pkg = %{version}
-
-%description -n libapt-pkg-devel
+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:	rpm-devel
+Obsoletes:	libapt-pkg-devel
+Obsoletes:	libapt-pkg-static
+
+%description 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 es -n libapt-pkg-devel
+%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 -n libapt-pkg-devel
+%description -l pl devel
 Pakiet zawiera pliki nag³ówkowe potrzebne do tworzenia aplikacji
 korzystaj±cych z biblioteki libapt-pkg.
 
-%description -l pt_BR -n libapt-pkg-devel
+%description -l pt_BR devel
 Arquivos de desenvolvimento para a biblioteca libapt-pkg do APT
 
 %prep
 %setup -q
+%patch0 -p1
 tar xzf docs.tar.gz
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+rm -f po/{POTFILES,Makefile}
 
 %build
+aclocal -I buildlib
+autoconf
+CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions"
 %configure \
 	--enable-nls \
 	--with-gpm
@@ -99,12 +106,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/etc/apt
+	$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}
@@ -117,9 +124,10 @@ install doc/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 install  bin/methods/* $RPM_BUILD_ROOT%{_libdir}/apt
 
 install %{SOURCE1}   	$RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf
-install %{SOURCE2}   	$RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list
 install %{SOURCE3}   	$RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list
-install rpmpriorities	$RPM_BUILD_ROOT%{_sysconfdir}/apt/rpmpriorities
+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 ..
 
@@ -127,12 +135,12 @@ gzip -9fn docs/*.text docs/examples/* README.RPM TODO
 
 %find_lang %{name}
 
-%post   -n libapt-pkg -p /sbin/ldconfig
-%postun -n libapt-pkg -p /sbin/ldconfig
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc docs/*.gz docs/examples/*.gz *.gz
@@ -146,13 +154,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/apt/*
 %{_mandir}/man[58]/*
 /var/cache/apt
-/var/state/apt
-
-%files -n libapt-pkg
-%defattr(644,root,root,755)
-%{_libdir}/libapt-pkg.so.*.*.*
+/var/lib/apt
+%attr(755,root,root) %{_libdir}/libapt-pkg.so.*.*.*
 
-%files -n libapt-pkg-devel
+%files devel
 %defattr(644,root,root,755)
 %{_libdir}/libapt-pkg.so
 %{_includedir}/apt-pkg