- simplifications in %install,

- cut %changelog,
- few cosmetics and reorders in %packages headers.

Changed files:
    apt.spec -> 1.11

diff --git a/apt.spec b/apt.spec
index 48c1a3b70da1449d4a7e70882efc6acd3f11b116..fffbaa366d634fea6fec8c6dc56cd5d57af61a69 100644 (file)
--- a/apt.spec
+++ b/apt.spec
@@ -1,15 +1,15 @@
-Name:          apt
-Version:       0.3.19cnc26
-Release:       1
 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(es):   Advanced Packaging Tool frontend for rpm and dpkg
+Name:          apt
+Version:       0.3.19cnc26
+Release:       1
+License:       GPL
 Group:         Applications/Archiving
 Group(de):     Applikationen/Archivierung
 Group(es):     Administración
 Group(pl):     Aplikacje/Archiwizacja
-License:       GPL
 Source0:       %{name}-%{version}.tar.gz
 Source1:       %{name}.conf
 Source2:       sources.list
@@ -56,9 +56,9 @@ Biblioteka libapt-pkg.
 
 %package -n libapt-pkg-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
-Summary(es):   Development files for APT's libapt-pkg
 Group:         Development
 Group(de):     Entwicklung
 Group(pl):     Programowanie
@@ -73,6 +73,11 @@ 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
+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
 Pakiet zawiera pliki nag³ówkowe potrzebne do tworzenia aplikacji
 korzystaj±cych z biblioteki libapt-pkg.
@@ -80,11 +85,6 @@ korzystaj
 %description -l pt_BR -n libapt-pkg-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
 tar xzf docs.tar.gz
@@ -97,93 +97,60 @@ tar xzf docs.tar.gz
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT/var/cache/apt/archives/partial
-install -d $RPM_BUILD_ROOT/var/state/apt/lists/partial
+       $RPM_BUILD_ROOT/var/state/apt/lists/partial \
+       $RPM_BUILD_ROOT{%{_includedir}/apt-pkg,%{_libdir}/apt,%{_mandir}/man{5,8}}
 
-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/{apt-{get,cache,config,cdrom},genpkglist,gensrclist} \
+       tools/genbasedir $RPM_BUILD_ROOT%{_bindir}
+
+install -D apt-pkg/{*.h,*/*.h} $RPM_BUILD_ROOT%{_includedir}/apt-pkg
+
+install -D doc/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5
+install -D doc/.8 $RPM_BUILD_ROOT/%{_mandir}/man8
+
 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 %{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
 
 cd po; make install DESTDIR=$RPM_BUILD_ROOT; cd ..
 
 gzip -9fn docs/*.text docs/examples/* README.RPM TODO
 
-%post -p /sbin/ldconfig
+%find_lang %{name}
+
+%post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
+%files -f %{namne}.lang
 %defattr(644,root,root,755)
-%doc README.RPM.gz TODO.gz
-%doc docs/examples/configure-index.gz
-%doc docs/examples/vendors.list.gz
-%doc docs/examples/sources.list.gz
-%{_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
+%{_mandir}/man[58]/*
+/var/cache/apt
+/var/state/apt
 
 %files -n libapt-pkg
 %defattr(644,root,root,755)
-%{_libdir}/libapt-pkg.so.*
+%{_libdir}/libapt-pkg.so.*.*
 
 %files -n libapt-pkg-devel
 %defattr(644,root,root,755)
 %{_libdir}/libapt-pkg.so
 %{_includedir}/apt-pkg
-%doc docs/*.text.gz docs/*.html