[man-pages-de/f14/master] - delete man pages conflicting with man-db (#583731) - convert COPYRIGHT README to utf8
tomspur
tomspur at fedoraproject.org
Thu Aug 5 18:16:44 UTC 2010
commit c63474a7760b00339854861135efb0601ca17df9
Author: Thomas Spura <tomspur at fedoraproject.org>
Date: Thu Aug 5 20:10:21 2010 +0200
- delete man pages conflicting with man-db (#583731)
- convert COPYRIGHT README to utf8
man-pages-de.spec | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/man-pages-de.spec b/man-pages-de.spec
index eaafabc..6670304 100644
--- a/man-pages-de.spec
+++ b/man-pages-de.spec
@@ -1,7 +1,7 @@
Summary: German man pages from the Linux Documentation Project
Name: man-pages-de
Version: 0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL+
Group: Documentation
URL: http://www.infodrom.org/projects/manpages-de/
@@ -33,7 +33,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_mandir}/de
for n in 1 2 3 4 5 6 7 8 9 n; do
mkdir $RPM_BUILD_ROOT/%{_mandir}/de/man$n
done
-for i in man*/*; do
+for i in man*/* COPYRIGHT README; do
iconv -f ISO-8859-1 -t UTF-8 < $i > $i.new
mv -f $i.new $i
done
@@ -43,6 +43,12 @@ LC_ALL=de_DE make prefix=$RPM_BUILD_ROOT/usr \
rm -f $RPM_BUILD_ROOT%{_mandir}/de/man1/{apropos.1,man.1,whatis.1}*
rm -f $RPM_BUILD_ROOT%{_mandir}/de/man5/man.config.5*
+# some files conflict with man-db, so delete them here for now
+# see bug #583731
+rm $RPM_BUILD_ROOT%{_mandir}/de/man1/{manpath.1,zsoelim.1}*
+rm $RPM_BUILD_ROOT%{_mandir}/de/man5/manpath.5*
+rm $RPM_BUILD_ROOT%{_mandir}/de/man8/{catman.8,mandb.8}*
+
%clean
rm -fr $RPM_BUILD_ROOT
@@ -54,6 +60,10 @@ rm -fr $RPM_BUILD_ROOT
%changelog
+* Thu Aug 5 2010 Thomas Spura <tomspur at fedoraproject.org> - 0.5-4
+- delete man pages conflicting with man-db (#583731)
+- convert COPYRIGHT README to utf8
+
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list