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

diff --git a/apt.spec b/apt.spec
index 3cc9daa..d97463b 100644
--- a/apt.spec
+++ b/apt.spec
@@ -1,24 +1,36 @@
-Name:		apt
-Version:	0.3.19cnc21
-Release:	1
 Summary:	Debian's Advanced Packaging Tool with RPM support
 Summary(pl):	Zawansowane narzêdzie do zarz±dzania pakietami
-Summary(pt_BR):	Frontend avançado para pacotes rpm e deb
-Summary(es):	Advanced Packaging Tool frontend for rpm and dpkg
+Summary(pt):	Frontend avançado para pacotes rpm e deb
+Name:		apt
+Version:	0.3.19cnc52
+Release:	2
+License:	GPL
 Group:		Applications/Archiving
 Group(de):	Applikationen/Archivierung
 Group(es):	Administración
 Group(pl):	Aplikacje/Archiwizacja
-License:	GPL
-Source0:	%{name}-%{version}.tar.gz
+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
-URL:		ftp://ftp.conectiva.com/pub/conectiva/EXPERIMENTAL/apt/
-BuildRequires:	rpm-devel >= 3.0.5
+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
-BuildRequires:	db3-devel
+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
@@ -29,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.
 
@@ -37,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(pl):	Pliki nag³ówkowe dla libapt-pkg
-Summary(pt_BR):	Arquivos de desenvolvimento para a biblioteca libapt-pkg do APT
-Summary(es):	Development files for APT's libapt-pkg
-Group:		Development
-Group(de):	Entwicklung
-Group(pl):	Programowanie
-Group(pt_BR):	Desenvolvimento
-Group(de):	Applikationen/Archivierung
-Group(es):	Desarrollo
-Group(pl):	Aplikacje/Archiwizacja
-Requires:	%{name}-%{version}
+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 -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
 
-%description -l es -n libapt-pkg-devel
-This package contains the header files and static libraries for
-developing with APT's libapt-pkg package manipulation library,
-modified for RPM.
-
 %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
@@ -94,93 +105,59 @@ 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/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 -f bin/libapt-pkg.so $RPM_BUILD_ROOT%{_libdir}
+
+install bin/{apt-{get,cache,config,cdrom},genpkglist,gensrclist} \
+	tools/genbasedir $RPM_BUILD_ROOT%{_bindir}
+
+install apt-pkg/{*.h,*/*.h} $RPM_BUILD_ROOT%{_includedir}/apt-pkg
+
+install doc/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5
+install doc/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8
 
-install -d $RPM_BUILD_ROOT/var/cache/apt/archives/partial
-install -d $RPM_BUILD_ROOT/var/state/apt/lists/partial
-
-install -d $RPM_BUILD_ROOT%{_libdir}/
-cp -a	bin/libapt-pkg.so.*	$RPM_BUILD_ROOT%{_libdir}/
-cp -a	bin/libapt-pkg.so	$RPM_BUILD_ROOT%{_libdir}/
-
-install -D bin/apt-get		$RPM_BUILD_ROOT%{_bindir}/apt-get
-install -D bin/apt-cache	$RPM_BUILD_ROOT%{_bindir}/apt-cache
-install -D bin/apt-config	$RPM_BUILD_ROOT%{_bindir}/apt-config
-install -D bin/apt-cdrom	$RPM_BUILD_ROOT%{_bindir}/apt-cdrom
-install -D bin/genpkglist	$RPM_BUILD_ROOT%{_bindir}/genpkglist
-install -D bin/gensrclist	$RPM_BUILD_ROOT%{_bindir}/gensrclist
-install -D tools/genbasedir	$RPM_BUILD_ROOT%{_bindir}/genbasedir
-
-install -d $RPM_BUILD_ROOT%{_includedir}/apt-pkg/
-install -D apt-pkg/*.h		$RPM_BUILD_ROOT%{_includedir}/apt-pkg/
-install -D apt-pkg/*/*.h	$RPM_BUILD_ROOT%{_includedir}/apt-pkg/
-
-install -d $RPM_BUILD_ROOT/%{_mandir}/man5/
-install -d $RPM_BUILD_ROOT/%{_mandir}/man8/
-install -D doc/apt.conf.5	$RPM_BUILD_ROOT/%{_mandir}/man5/apt.conf.5
-install -D doc/sources.list.5	$RPM_BUILD_ROOT/%{_mandir}/man5/sources.list.5
-install -D doc/vendors.list.5	$RPM_BUILD_ROOT/%{_mandir}/man5/vendors.list.5
-install -D doc/apt-cache.8	$RPM_BUILD_ROOT/%{_mandir}/man8/apt-cache.8
-install -D doc/apt-config.8	$RPM_BUILD_ROOT/%{_mandir}/man8/apt-config.8
-install -D doc/apt.8		$RPM_BUILD_ROOT/%{_mandir}/man8/apt.8
-install -D doc/apt-cdrom.8	$RPM_BUILD_ROOT/%{_mandir}/man8/apt-cdrom.8
-install -D doc/apt-get.8	$RPM_BUILD_ROOT/%{_mandir}/man8/apt-get.8
-install -D doc/apt-get.8	$RPM_BUILD_ROOT/%{_mandir}/man8/apt-get.8
-
-install -d $RPM_BUILD_ROOT%{_libdir}/apt
 install  bin/methods/* $RPM_BUILD_ROOT%{_libdir}/apt
 
-install -D %{SOURCE1}   	$RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf
-install -D %{SOURCE2}   	$RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list
-install -D %{SOURCE3}   	$RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list
-install -D rpmpriorities	$RPM_BUILD_ROOT%{_sysconfdir}/apt/rpmpriorities
+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
 
-(cd po;make install DESTDIR=$RPM_BUILD_ROOT)
+sed -e s/@ARCH@/%{_target_cpu}/ %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list
 
-gzip -9fn docs/*.text
+cd po; make install DESTDIR=$RPM_BUILD_ROOT; cd ..
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+gzip -9fn docs/*.text docs/examples/* README.RPM TODO
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README* TODO
-%doc docs/examples/configure-index
-%doc docs/examples/vendors.list
-%doc docs/examples/sources.list
-%{_mandir}/man5/*
-%{_mandir}/man8/*
-%{_datadir}/locale/*/LC_MESSAGES/%{name}.mo
+%doc docs/*.gz docs/examples/*.gz *.gz
+%attr(755,root,root) %{_bindir}/*
 %dir %{_sysconfdir}/apt
 %config(noreplace) %{_sysconfdir}/apt/apt.conf 
 %config(noreplace) %{_sysconfdir}/apt/sources.list
 %config(noreplace) %{_sysconfdir}/apt/vendors.list
 %config %{_sysconfdir}/apt/rpmpriorities
-%dir /var/cache/apt
-%dir /var/cache/apt/archives       
-%dir /var/cache/apt/archives/partial
-%dir /var/state/apt
-%dir /var/state/apt/lists
-%dir /var/state/apt/lists/partial
-%defattr(755,root,root)
 %dir %{_libdir}/apt
-%config %verify(not mode) %{_libdir}/apt/*
-%attr(755,root,root) %{_bindir}/apt-get
-%attr(755,root,root) %{_bindir}/apt-cache
-%attr(755,root,root) %{_bindir}/apt-cdrom
-%attr(755,root,root) %{_bindir}/apt-config
-%attr(755,root,root) %{_bindir}/genpkglist
-%attr(755,root,root) %{_bindir}/gensrclist
-%attr(755,root,root) %{_bindir}/genbasedir
-
-%files -n libapt-pkg
-%defattr(644,root,root,755)
-%{_libdir}/libapt-pkg.so.*
+%attr(755,root,root) %{_libdir}/apt/*
+%{_mandir}/man[58]/*
+/var/cache/apt
+/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
-%doc docs/*.text.gz docs/*.html