From 71cb6775db40eff915009f38ce4bacd8aed451a6 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Oct 04 2014 11:28:25 +0000 Subject: Clean the spec to follow preferred packaging guidelines --- diff --git a/man-pages-fr.spec b/man-pages-fr.spec index 659d9b7..91e0540 100644 --- a/man-pages-fr.spec +++ b/man-pages-fr.spec @@ -1,19 +1,19 @@ -%define REV_EXTRAS 0.8.1 -%define REV_SUP 20080608 -%define SUBREV 1 - -Summary: French version of the Linux man-pages -Name: man-pages-fr -Version: 3.66 -Release: 3%{?dist} -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/file/4097/%{name}-%{version}-%{SUBREV}.tar.xz -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 +%global REV_EXTRAS 0.8.1 +%global REV_SUP 20080608 +%global SUBREV 1 + +Summary: French version of the Linux man-pages +Name: man-pages-fr +Version: 3.66 +Release: 4%{?dist} +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/file/4097/%{name}-%{version}-%{SUBREV}.tar.xz +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 @@ -33,7 +33,7 @@ Dr. Gerard Delafond. mv pagesdeman man-pages-sup-fr-%{REV_SUP} mv -f man-pages-sup-fr-%{REV_SUP}/LISEZ_MOI man-pages-sup-fr-%{REV_SUP}/LISEZ_MOI.man-pages-sup-fr cp -a man-pages-sup-fr-%{REV_SUP}/* . -%{__rm} -rf man-pages-sup-fr-%{REV_SUP}/ +rm -rf man-pages-sup-fr-%{REV_SUP}/ # The mgetty in fedora and rhel contains the patches # mgetty-1.1.26-issue.patch and mgetty-1.1.31-issue-doc.patch which @@ -43,7 +43,7 @@ cp -a man-pages-sup-fr-%{REV_SUP}/* . mv man8/mgettyfedora.8 man8/mgetty.8 cp -a man-pages-extras-fr-%{REV_EXTRAS}/* . -%{__rm} -rf man-pages-extras-fr-%{REV_EXTRAS}/ +rm -rf man-pages-extras-fr-%{REV_EXTRAS}/ # fix bug rh 495703, rhbz#1135541 for i in mail.1 yum.8 xinetd.8 du.1; do @@ -61,10 +61,10 @@ done #Install the man pages for i in fr/man?/*; do - %{__install} -m 0644 "${i}" "$RPM_BUILD_ROOT%{_mandir}/${i}" + install -m 0644 -p "${i}" "$RPM_BUILD_ROOT%{_mandir}/${i}" done -# Install pages from man-pages-extras-fr-%{version}.tar.bz2: +# Install pages from man-pages-extras-fr-%%{version}.tar.bz2: make install-fedora DESTDIR=$RPM_BUILD_ROOT # Install pages from mansupfr.tar.bz2: @@ -74,7 +74,7 @@ for i in 1 2 3 4 5 6 7 8 9; do 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}" + install -m 0644 -p "${j}" "$RPM_BUILD_ROOT%{_mandir}/fr/man${i}/${j}" else echo "$j already exists" fi @@ -84,46 +84,48 @@ for i in 1 2 3 4 5 6 7 8 9; do done # Remove files already included in other packages - # This page is provided by LDP so we have to remove it from shadow-utils package -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man3/getspnam.3 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man3/getspnam.3 # This page is provided by rpm package -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man8/rpm.8 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/rpm.8 # This page is provided by sitecopy package -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man1/sitecopy.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/sitecopy.1 # This page is provided by nmap package -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man1/nmap.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/nmap.1 # These pages are provided by the awesome package -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/awesome* +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/awesome* # These pages are provided by the procps-ng >= 3.3.10 package: -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/free.1 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/kill.1 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/pgrep.1 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/pkill.1 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/pmap.1 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/pwdx.1 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/skill.1 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/slabtop.1 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/tload.1 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/uptime.1 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/w.1 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/watch.1 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/sysctl.conf.5 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/sysctl.8 -%{__rm} -rf $RPM_BUILD_ROOT%{_mandir}/fr/man?/vmstat.8 - -#LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%{_mandir}/fr/ +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/free.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/kill.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/pgrep.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/pkill.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/pmap.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/pwdx.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/skill.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/slabtop.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/tload.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/uptime.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/w.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/watch.1 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/sysctl.conf.5 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/sysctl.8 +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man?/vmstat.8 + +#LANG=fr ./cree_index_man.sh $RPM_BUILD_ROOT%%{_mandir}/fr/ %files %doc fr/README.fr LISEZ_MOI.man-pages-sup-fr Changements Changements.anciens Lisez_moi %{_mandir}/fr/man?/* %changelog +* Sat Oct 04 2014 Parag Nemade - 3.66-4 +- Clean the spec to follow preferred packaging guidelines + * Thu Sep 25 2014 Mike FABIAN - 3.66-3 - exclude man-pages also contained in procps-ng >= 3.3.10 - Resolves: rhbz#1146203 - File conflicts with procps-ng