[man-pages-fr] update to 3.45
Mike FABIAN
mfabian at fedoraproject.org
Thu Jan 31 08:14:40 UTC 2013
commit f7bcc8fdfb6df5865a759b169291b47bf2b68c2b
Author: Mike FABIAN <mfabian at redhat.com>
Date: Tue Jan 29 11:56:26 2013 +0100
update to 3.45
- Resolves: #905826 - Due to problems in the man-pages-fr.spec file
and the Makefile in man-pages-extras-fr-0.8.1.tar.bz2,
many French man-pages are not included in man-pages-fr
- fix Makefile, “make install” in the subdirectory “afaire” was
not executed because the target had the same name as the directory
and was not marked .PHONY
- install the man-pages from mansupfr.tar.bz2 unless an identical
man-page is already installed by man-pages-fr-3.45-1.tar.bz2 or
man-pages-extras-fr-0.8.1.tar.bz2
(installing the above extra man-pages fixes #903048 because
man-pages for “less”, “more”, “bash”, and “echo” are now available.
A man-page for “man” is still not available, this should be added
to the “man-db” package instead).
- edit also xinetd.8 man page with sed to make it clear that it is
not up-to-date (for #891277 and #891278).
- fix sed pattern to add the notice that a man-page is not up-to-date
- suggest to use “LANG=en_US.UTF-8 man $name” instead of
”LANG=en man $name” to view English man-pages (“en” is an invalid locale)
- Resolves: #880076 (add license tags inherited from packages whose
translated man-pages are included here)
.gitignore | 1 +
man-pages-fr.spec | 56 +++++++++++++---
phony-targets.patch | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
4 files changed, 224 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d2d36c..4d3ad8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ man-pages-fr-3.23-1.tar.bz2
man-pages-extras-fr-0.8.1.tar.bz2
mansupfr.tar.bz2
/man-pages-fr-3.44-1.tar.bz2
+/man-pages-fr-3.45-1.tar.bz2
diff --git a/man-pages-fr.spec b/man-pages-fr.spec
index 2085b3e..6a58514 100644
--- a/man-pages-fr.spec
+++ b/man-pages-fr.spec
@@ -4,14 +4,15 @@
Summary: French version of the Linux man-pages
Name: man-pages-fr
-Version: 3.44
+Version: 3.45
Release: 1%{?dist}
-License: GPL+
+License: GPL+ and GPLv2 and GPLv2+ and LGPLv2+ and GPLv3+ and ImageMagick and ISC and Public Domain and BSD and MIT and ASL 2.0 and and UCD and IBM and TCL and xinetd
Group: Documentation
URL: https://alioth.debian.org/projects/perkamon/
-Source0: https://alioth.debian.org/frs/download.php/3837/%{name}-%{version}-%{SUBREV}.tar.bz2
+Source0: https://alioth.debian.org/frs/download.php/3858/%{name}-%{version}-%{SUBREV}.tar.bz2
Source1: http://www.delafond.org/traducmanfr/mansupfr.tar.bz2
Source2: http://manpagesfr.free.fr/download/man-pages-extras-fr-%{REV_EXTRAS}.tar.bz2
+Patch0: phony-targets.patch
BuildArch: noarch
Requires: man-pages-reader
@@ -25,6 +26,7 @@ Dr. Gerard Delafond.
%setup -q -c
%setup -q -D -T -a 1
%setup -q -D -T -a 2
+%patch0 -p1 -b .phony-targets
# pick up the supplemental pages
@@ -37,14 +39,9 @@ cp -a man-pages-extras-fr-%{REV_EXTRAS}/* .
%{__rm} -rf man-pages-extras-fr-%{REV_EXTRAS}/
# fix bug rh 495703
-for i in mail.1 ; do
+for i in mail.1 yum.8 xinetd.8; do
name=`echo ${i} | awk -F"." '{print$1}'`
- find . -name ${i} -exec sed -i "/SYNOPSIS/i\.Sh Attention :\n La traduction de cette page de manuel pour \"$name\" est obsolète par rapport à la version actuelle de \"$name\".\n Pour avoir la dernière version de la page de manuel, veuillez utiliser la version anglaise.\n La version anglaise est disponible avec la commande suivante :\n.Nm LANG=en man $name" {} \;
-done
-
-for i in yum.8 ; do
- name=`echo ${i} | awk -F"." '{print$1}'`
- find . -name ${i} -exec sed -i "/SYNOPSIS/i\.SH Attention :\n La traduction de cette page de manuel pour \"$name\" est obsolète par rapport à la version actuelle de \"$name\".\n Pour avoir la dernière version de la page de manuel, veuillez utiliser la version anglaise.\n La version anglaise est disponible avec la commande suivante :\n.B LANG=en man $name" {} \;
+ find . -name ${i} -exec sed -i "s/\(\(\.SH\) *SYNOPSIS\)/.br\n\2 Attention\\\\ :\nLa traduction de cette page de manuel pour \"$name\" est obsolète par rapport à la version actuelle de \"$name\". Pour avoir la dernière version de la page de manuel, veuillez utiliser la version anglaise. La version anglaise est disponible avec la commande suivante :\n.nf\nLANG=en_US.UTF-8 man $name\n.fi\n\1/gi" {} \;
done
%build
@@ -60,8 +57,25 @@ for i in fr/man?/*; do
%{__install} -m 0644 "${i}" "$RPM_BUILD_ROOT%{_mandir}/${i}"
done
+# Install pages from man-pages-extras-fr-%{version}.tar.bz2:
make install-fedora DESTDIR=$RPM_BUILD_ROOT
+# Install pages from mansupfr.tar.bz2:
+for i in 1 2 3 4 5 6 7 8 9; do
+ if [ -d man${i} ] ; then
+ cd man${i};
+ for j in *.${i}; do
+ if [ ! -f $RPM_BUILD_ROOT%{_mandir}/fr/man${i}/$j ] ; then
+ echo "installing $j"
+ %{__install} -m 0644 "${j}" "$RPM_BUILD_ROOT%{_mandir}/fr/man${i}/${j}"
+ else
+ echo "$j already exists"
+ fi
+ done
+ cd ..
+ fi
+done
+
# Remove files already included in other packages
# This page is provided by LDP so we have to remove it from shadow-utils package
@@ -83,6 +97,28 @@ make install-fedora DESTDIR=$RPM_BUILD_ROOT
%{_mandir}/fr/man?/*
%changelog
+* Wed Jan 30 2013 Mike FABIAN <mfabian at redhat.com> - 3.45-1
+- Resolves: #905826 - Due to problems in the man-pages-fr.spec file
+ and the Makefile in man-pages-extras-fr-0.8.1.tar.bz2,
+ many French man-pages are not included in man-pages-fr
+- fix Makefile, “make install” in the subdirectory “afaire” was
+ not executed because the target had the same name as the directory
+ and was not marked .PHONY
+- install the man-pages from mansupfr.tar.bz2 unless an identical
+ man-page is already installed by man-pages-fr-3.45-1.tar.bz2 or
+ man-pages-extras-fr-0.8.1.tar.bz2
+ (installing the above extra man-pages fixes #903048 because
+ man-pages for “less”, “more”, “bash”, and “echo” are now available.
+ A man-page for “man” is still not available, this should be added
+ to the “man-db” package instead).
+- edit also xinetd.8 man page with sed to make it clear that it is
+ not up-to-date (for #891277 and #891278).
+- fix sed pattern to add the notice that a man-page is not up-to-date
+- suggest to use “LANG=en_US.UTF-8 man $name” instead of
+ ”LANG=en man $name” to view English man-pages (“en” is an invalid locale)
+- Resolves: #880076 (add license tags inherited from packages whose
+ translated man-pages are included here)
+
* Wed Nov 21 2012 Jens Petersen <petersen at redhat.com> - 3.44-1
- update to man-pages-fr-3.44-1 and newer mansupfr tarball
- update main project url to Alioth perkamon
diff --git a/phony-targets.patch b/phony-targets.patch
new file mode 100644
index 0000000..bd3734f
--- /dev/null
+++ b/phony-targets.patch
@@ -0,0 +1,176 @@
+diff -ru man-pages-fr-3.45.orig/man-pages-extras-fr-0.8.1/Makefile man-pages-fr-3.45/man-pages-extras-fr-0.8.1/Makefile
+--- man-pages-fr-3.45.orig/man-pages-extras-fr-0.8.1/Makefile 2008-06-03 16:13:12.000000000 +0200
++++ man-pages-fr-3.45/man-pages-extras-fr-0.8.1/Makefile 2013-01-29 12:23:40.101993080 +0100
+@@ -15,138 +15,172 @@
+ sgml-common switchdesk sysvinit util-linux-ng yp-tools yum man-pages-man1 \
+ ntpd gzip yum-utils usbutils pciutils
+
++.PHONY : afaire
+ afaire :
+ cd afaire ; \
+ make install ;
+
++.PHONY : asr-manpages
+ asr-manpages :
+ cd asr-manpages-1.3 ; \
+ make install ;
+
++.PHONY : at
+ at :
+ cd at-3.1.10 ; \
+ make install ;
+
++.PHONY : bash
+ bash :
+ cd bash-3.2 ; \
+ make install ;
+
++.PHONY : createrepo
+ createrepo :
+ cd createrepo-0.9.5 ; \
+ make install ;
+
++.PHONY : cron
+ cron :
+ cd cron-4.1 ; \
+ make install ;
+
++.PHONY : diffutils
+ diffutils :
+ cd diffutils-2.8.1 ; \
+ make install ;
+
++.PHONY : docbook-utils
+ docbook-utils :
+ cd docbook-utils-0.6.14 ; \
+ make install ;
+
++.PHONY : eject
+ eject :
+ cd eject-2.1.5 ; \
+ make install ;
+
++.PHONY : glibc-linuxthreads
+ glibc-linuxthreads :
+ cd glibc-linuxthreads-2.3.6 ; \
+ make install ;
+
++.PHONY : grep
+ grep :
+ cd grep-2.5.3 ; \
+ make install ;
+
++.PHONY : gzip
+ gzip :
+ cd gzip-1.3.12 ; \
+ make install ;
+
++.PHONY : initscripts
+ initscripts :
+ cd initscripts-8.51 ; \
+ make install ;
+
++.PHONY : lilo
+ lilo :
+ cd lilo-22.8 ; \
+ make install ;
+
++.PHONY : man-pages-man1
+ man-pages-man1 :
+ cd man-pages-man1-2.49 ; \
+ make install ;
+
++.PHONY : modutils
+ modutils :
+ cd modutils-2.4.27 ; \
+ make install ;
+
++.PHONY : netkit-telnet
+ netkit-telnet :
+ cd netkit-telnet-0.17 ; \
+ make install ;
+
++.PHONY : nfs-utils
+ nfs-utils :
+ cd nfs-utils-1.1.1 ; \
+ make install ;
+
++.PHONY : ntpd
+ ntpd :
+ cd ntpd-4.2.4p4 ; \
+ make install ;
+
++.PHONY : opensp
+ opensp :
+ cd opensp-1.5.2 ; \
+ make install ;
+
++.PHONY : openjade
+ openjade :
+ cd openjade-1.3.2 ; \
+ make install ;
+
++.PHONY : pciutils
+ pciutils :
+ cd pciutils-3.0.0 ; \
+ make install ;
+
++.PHONY : procps
+ procps :
+ cd procps-3.2.7 ; \
+ make install ;
+
++.PHONY : psmisc
+ psmisc :
+ cd psmisc-22.6 ; \
+ make install ;
+
++.PHONY : rp-pppoe
+ rp-pppoe :
+ cd rp-pppoe-3.8 ; \
+ make install ;
+
++.PHONY : sed
+ sed :
+ cd sed-4.1.5 ; \
+ make install ;
+
++.PHONY : sgml-common
+ sgml-common :
+ cd sgml-common-0.6.3 ; \
+ make install ;
+
++.PHONY : switchdesk
+ switchdesk :
+ cd switchdesk-4.0.8 ; \
+ make install ;
+
++.PHONY : sysvinit
+ sysvinit :
+ cd sysvinit-2.86 ; \
+ make install ;
+
++.PHONY : util-linux-ng
+ util-linux-ng :
+ cd util-linux-ng-2.13.1.1 ; \
+ make install ;
+
++.PHONY : usbutils
+ usbutils :
+ cd usbutils-0.73 ; \
+ make install ;
+
++.PHONY : yp-tools
+ yp-tools :
+ cd yp-tools-2.10 ; \
+ make install ;
+
++.PHONY : yum
+ yum :
+ cd yum-3.2.7 ; \
+ make install ;
+
++.PHONY : yum-utils
+ yum-utils :
+ cd yum-utils-1.1.13 ; \
+ make install ;
diff --git a/sources b/sources
index cc76a8a..9e92cd7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-a3ca71d6fd588ca3b87560c247a0f5e0 man-pages-fr-3.44-1.tar.bz2
+9ab9cf6ccd69b3c11b18d3d29214f62d man-pages-fr-3.45-1.tar.bz2
d5210b8253fc6793d9eb6cf53110054c mansupfr.tar.bz2
94b3c7d6a13f6492417d25d3dc92b016 man-pages-extras-fr-0.8.1.tar.bz2
More information about the scm-commits
mailing list