Hello community, here is the log from the commit of package man-pages-it checked in at Sun Aug 12 11:20:20 CEST 2007. -------- --- AUTO/noarch/man-pages-it/man-pages-it.changes 2007-07-18 15:53:42.000000000 +0200 +++ /mounts/work_src_done/NOARCH/man-pages-it/man-pages-it.changes 2007-08-10 22:22:55.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 10 22:22:50 CEST 2007 - dmueller@suse.de + +- fix fileconflicts + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man-pages-it.spec ++++++ --- /var/tmp/diff_new_pack.L21419/_old 2007-08-12 11:20:12.000000000 +0200 +++ /var/tmp/diff_new_pack.L21419/_new 2007-08-12 11:20:12.000000000 +0200 @@ -11,6 +11,8 @@ # norootforbuild Name: man-pages-it +# strange buildrequires are needed to resolve fileconflicts (see %install) +BuildRequires: man vim-base URL: http://www.pluto.it/ildp/man/ License: GPL v2 or later, Linux Documentation Project License (LDPL), Lizence differs from man page to page, some are GPL, some Group: Documentation/Man @@ -22,7 +24,7 @@ %endif Autoreqprov: off Version: 0.3.0 -Release: 593 +Release: 600 Summary: LDP Man Pages (Italian) BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: man-pages-it-%{version}.tar.gz @@ -46,13 +48,12 @@ %install mkdir -p $RPM_BUILD_ROOT%{_mandir}/it -# Remove man pages which are in man-2.3.x -rm -f man1/apropos.1* man1/manpath.1* man1/whatis.1* man1/zsoelim.1* -rm -f man5/manpath.5* man5/manpath.config.5* man8/accessdb.8* -rm -f man8/catman.8* man8/mandb.8* man1/man.1* for i in man? ; do mkdir -p $RPM_BUILD_ROOT%{_mandir}/it/$i - install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/it/$i + for m in $i/* ; do + test -f /usr/share/man/it/$m* && continue + install -m 644 $m $RPM_BUILD_ROOT%{_mandir}/it/$i + done done %if 0%{?suse_version} > 1020 @@ -68,6 +69,8 @@ %doc LICENZE/LDP.licenza README README.eng %changelog +* Fri Aug 10 2007 - dmueller@suse.de +- fix fileconflicts * Wed Jul 18 2007 - ro@suse.de - leave as gz (as upstream) for an auto-update package * Wed Jul 18 2007 - ro@suse.de ++++++ man-pages-it.spec.in ++++++ --- AUTO/noarch/man-pages-it/man-pages-it.spec.in 2007-07-18 15:53:16.000000000 +0200 +++ /mounts/work_src_done/NOARCH/man-pages-it/man-pages-it.spec.in 2007-08-10 22:21:59.000000000 +0200 @@ -11,6 +11,8 @@ # norootforbuild Name: man-pages-it +# strange buildrequires are needed to resolve fileconflicts (see %install) +BuildRequires: man vim-base URL: http://www.pluto.it/ildp/man/ License: GPL, Other License(s), see package Group: Documentation/Man @@ -46,13 +48,12 @@ %install mkdir -p $RPM_BUILD_ROOT%{_mandir}/it -# Remove man pages which are in man-2.3.x -rm -f man1/apropos.1* man1/manpath.1* man1/whatis.1* man1/zsoelim.1* -rm -f man5/manpath.5* man5/manpath.config.5* man8/accessdb.8* -rm -f man8/catman.8* man8/mandb.8* man1/man.1* for i in man? ; do mkdir -p $RPM_BUILD_ROOT%{_mandir}/it/$i - install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/it/$i + for m in $i/* ; do + test -f /usr/share/man/it/$m* && continue + install -m 644 $m $RPM_BUILD_ROOT%{_mandir}/it/$i + done done %if 0%{?suse_version} > 1020 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org