From e2bea9eb8dc1fbdaab9b3cd599f5f092df6465ef Mon Sep 17 00:00:00 2001 From: Paul Green Date: Wed, 5 Feb 2003 18:41:53 +0000 Subject: [PATCH] Update packaging spec files per patch submitted by Horst von Brand. In the future, we need to be sure to keep *.spec and *.spec.tmpl identical...the release macro produces *.spec from *.spec.tmpl. --- INSTALL | 5 +++++ packaging/lsb/rsync.spec | 15 ++++++++------- packaging/lsb/rsync.spec.tmpl | 25 +++++++++++++++++-------- packaging/redhat/5.0/rsync.spec | 25 ++++++++++++++++++------- packaging/redhat/5.0/rsync.spec.tmpl | 25 ++++++++++++++++++------- packaging/redhat/7.1/rsync.spec | 26 ++++++++++++++------------ packaging/redhat/7.1/rsync.spec.tmpl | 25 ++++++++++++++++++------- 7 files changed, 98 insertions(+), 48 deletions(-) diff --git a/INSTALL b/INSTALL index 45f8ba69..b19429b4 100644 --- a/INSTALL +++ b/INSTALL @@ -19,6 +19,11 @@ to pop up an xterm on DISPLAY=:0 if it crashes. You might find this useful, but it should be turned off for production builds. +RPM NOTES +--------- + +Under packaging you will find .spec files for several distributions. + HP-UX NOTES ----------- diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec index bd343fc6..716444bd 100644 --- a/packaging/lsb/rsync.spec +++ b/packaging/lsb/rsync.spec @@ -21,17 +21,18 @@ A technical report describing the rsync algorithm is included with this package. %changelog -* Tue Jan 26 2003 Horst von Brand +* Thu Jan 30 2003 Horst von Brand Fixed "Sept" date in %changelog here - Use %{_mandir} to point at manpages - Some distributions compress manpages, add '*' to cover this + Use %{_mandir} to point to manpages + Support for compressed manpages (* at end catches them in %files) Add doc/README-SGML and doc/rsync.sgml to %doc - + * Mon Sep 11 2000 John H Terpstra Changed target paths to be Linux Standards Base compliant * Mon Jan 25 1999 Stefan Hornburg - quoted RPM_OPT_FLAGS for the sake of robustness + quoted RPM_OPT_FLAGS for the sake of robustness + * Mon May 18 1998 Andrew Tridgell reworked for auto-building when I release rsync (tridge@samba.anu.edu.au) @@ -76,8 +77,8 @@ strip rsync mkdir -p $RPM_BUILD_ROOT/usr/bin mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,5} install -m755 rsync $RPM_BUILD_ROOT/usr/bin -install -m644 rsync.1 $RPM_BUILD_ROOT%{_mandir}/man1 -install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT%{_mandir}/man5 +install -m644 rsync.1 $RPM_BUILD_ROOT/%{_mandir}/man1 +install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5 %clean rm -rf $RPM_BUILD_ROOT diff --git a/packaging/lsb/rsync.spec.tmpl b/packaging/lsb/rsync.spec.tmpl index 65330cb0..fde911df 100644 --- a/packaging/lsb/rsync.spec.tmpl +++ b/packaging/lsb/rsync.spec.tmpl @@ -21,11 +21,18 @@ A technical report describing the rsync algorithm is included with this package. %changelog -* Mon Sept 11 2000 John H Terpstra +* Thu Jan 30 2003 Horst von Brand + Fixed "Sept" date in %changelog here + Use %{_mandir} to point to manpages + Support for compressed manpages (* at end catches them in %files) + Add doc/README-SGML and doc/rsync.sgml to %doc + +* Mon Sep 11 2000 John H Terpstra Changed target paths to be Linux Standards Base compliant * Mon Jan 25 1999 Stefan Hornburg - quoted RPM_OPT_FLAGS for the sake of robustness + quoted RPM_OPT_FLAGS for the sake of robustness + * Mon May 18 1998 Andrew Tridgell reworked for auto-building when I release rsync (tridge@samba.anu.edu.au) @@ -62,23 +69,25 @@ previous package(s).) %setup %build -./configure --prefix=/usr --mandir=/usr/share/man +./configure --prefix=/usr --mandir=%{_mandir} make CFLAGS="$RPM_OPT_FLAGS" strip rsync %install -mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/man/{man1,man5}} +mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,5} install -m755 rsync $RPM_BUILD_ROOT/usr/bin -install -m644 rsync.1 $RPM_BUILD_ROOT/usr/share/man/man1 -install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT/usr/share/man/man5 +install -m644 rsync.1 $RPM_BUILD_ROOT/%{_mandir}/man1 +install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5 %clean rm -rf $RPM_BUILD_ROOT %files %attr(-,root,root) /usr/bin/rsync -%attr(-,root,root) /usr/share/man/man1/rsync.1 -%attr(-,root,root) /usr/share/man/man5/rsyncd.conf.5 +%attr(-,root,root) %{_mandir}/man1/rsync.1* +%attr(-,root,root) %{_mandir}/man5/rsyncd.conf.5* %attr(-,root,root) %doc tech_report.tex %attr(-,root,root) %doc README %attr(-,root,root) %doc COPYING +%attr(-,root,root) %doc doc/README-SGML doc/rsync.sgml diff --git a/packaging/redhat/5.0/rsync.spec b/packaging/redhat/5.0/rsync.spec index bbc54881..91103210 100644 --- a/packaging/redhat/5.0/rsync.spec +++ b/packaging/redhat/5.0/rsync.spec @@ -21,8 +21,17 @@ A technical report describing the rsync algorithm is included with this package. %changelog +* Thu Jan 30 2003 Horst von Brand + Use %{_mandir} to point to manpages + Support for compressed manpages (* at end catches them in %files) + Add doc/README-SGML and doc/rsync.sgml to %doc + +* Mon Sep 11 2000 John H Terpstra + Changed target paths to be Linux Standards Base compliant + * Mon Jan 25 1999 Stefan Hornburg - quoted RPM_OPT_FLAGS for the sake of robustness + quoted RPM_OPT_FLAGS for the sake of robustness + * Mon May 18 1998 Andrew Tridgell reworked for auto-building when I release rsync (tridge@samba.anu.edu.au) @@ -59,23 +68,25 @@ previous package(s).) %setup %build -./configure --prefix=/usr +./configure --prefix=/usr --mandir=%{_mandir} make CFLAGS="$RPM_OPT_FLAGS" strip rsync %install -mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/{man1,man5}} +mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,5} install -m755 rsync $RPM_BUILD_ROOT/usr/bin -install -m644 rsync.1 $RPM_BUILD_ROOT/usr/man/man1 -install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT/usr/man/man5 +install -m644 rsync.1 $RPM_BUILD_ROOT/%{_mandir}/man1 +install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5 %clean rm -rf $RPM_BUILD_ROOT %files %attr(-,root,root) /usr/bin/rsync -%attr(-,root,root) /usr/man/man1/rsync.1 -%attr(-,root,root) /usr/man/man5/rsyncd.conf.5 +%attr(-,root,root) %{_mandir}/man1/rsync.1* +%attr(-,root,root) %{_mandir}/man5/rsyncd.conf.5* %attr(-,root,root) %doc tech_report.tex %attr(-,root,root) %doc README %attr(-,root,root) %doc COPYING +%attr(-,root,root) %doc doc/README-SGML doc/rsync.sgml diff --git a/packaging/redhat/5.0/rsync.spec.tmpl b/packaging/redhat/5.0/rsync.spec.tmpl index ada3a76f..d91a749f 100644 --- a/packaging/redhat/5.0/rsync.spec.tmpl +++ b/packaging/redhat/5.0/rsync.spec.tmpl @@ -21,8 +21,17 @@ A technical report describing the rsync algorithm is included with this package. %changelog +* Thu Jan 30 2003 Horst von Brand + Use %{_mandir} to point to manpages + Support for compressed manpages (* at end catches them in %files) + Add doc/README-SGML and doc/rsync.sgml to %doc + +* Mon Sep 11 2000 John H Terpstra + Changed target paths to be Linux Standards Base compliant + * Mon Jan 25 1999 Stefan Hornburg - quoted RPM_OPT_FLAGS for the sake of robustness + quoted RPM_OPT_FLAGS for the sake of robustness + * Mon May 18 1998 Andrew Tridgell reworked for auto-building when I release rsync (tridge@samba.anu.edu.au) @@ -59,23 +68,25 @@ previous package(s).) %setup %build -./configure --prefix=/usr +./configure --prefix=/usr --mandir=%{_mandir} make CFLAGS="$RPM_OPT_FLAGS" strip rsync %install -mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/{man1,man5}} +mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,5} install -m755 rsync $RPM_BUILD_ROOT/usr/bin -install -m644 rsync.1 $RPM_BUILD_ROOT/usr/man/man1 -install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT/usr/man/man5 +install -m644 rsync.1 $RPM_BUILD_ROOT/%{_mandir}/man1 +install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5 %clean rm -rf $RPM_BUILD_ROOT %files %attr(-,root,root) /usr/bin/rsync -%attr(-,root,root) /usr/man/man1/rsync.1 -%attr(-,root,root) /usr/man/man5/rsyncd.conf.5 +%attr(-,root,root) %{_mandir}/man1/rsync.1* +%attr(-,root,root) %{_mandir}/man5/rsyncd.conf.5* %attr(-,root,root) %doc tech_report.tex %attr(-,root,root) %doc README %attr(-,root,root) %doc COPYING +%attr(-,root,root) %doc doc/README-SGML doc/rsync.sgml diff --git a/packaging/redhat/7.1/rsync.spec b/packaging/redhat/7.1/rsync.spec index a79e2bd0..91103210 100644 --- a/packaging/redhat/7.1/rsync.spec +++ b/packaging/redhat/7.1/rsync.spec @@ -21,17 +21,17 @@ A technical report describing the rsync algorithm is included with this package. %changelog -* Wed Jan 29 2003 Paul Green - Restored changes accidentally removed by David Dykstra. - -* Tue Jan 28 2003 David Dykstra - Bumped version number to 2.5.6. +* Thu Jan 30 2003 Horst von Brand + Use %{_mandir} to point to manpages + Support for compressed manpages (* at end catches them in %files) + Add doc/README-SGML and doc/rsync.sgml to %doc * Mon Sep 11 2000 John H Terpstra Changed target paths to be Linux Standards Base compliant * Mon Jan 25 1999 Stefan Hornburg - quoted RPM_OPT_FLAGS for the sake of robustness + quoted RPM_OPT_FLAGS for the sake of robustness + * Mon May 18 1998 Andrew Tridgell reworked for auto-building when I release rsync (tridge@samba.anu.edu.au) @@ -68,23 +68,25 @@ previous package(s).) %setup %build -./configure --prefix=/usr --man-dir=/usr/share/man +./configure --prefix=/usr --mandir=%{_mandir} make CFLAGS="$RPM_OPT_FLAGS" strip rsync %install -mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/man/{man1,man5}} +mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,5} install -m755 rsync $RPM_BUILD_ROOT/usr/bin -install -m644 rsync.1* $RPM_BUILD_ROOT/usr/share/man/man1 -install -m644 rsyncd.conf.5* $RPM_BUILD_ROOT/usr/share/man/man5 +install -m644 rsync.1 $RPM_BUILD_ROOT/%{_mandir}/man1 +install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5 %clean rm -rf $RPM_BUILD_ROOT %files %attr(-,root,root) /usr/bin/rsync -%attr(-,root,root) /usr/share/man/man1/rsync.1* -%attr(-,root,root) /usr/share/man/man5/rsyncd.conf.5* +%attr(-,root,root) %{_mandir}/man1/rsync.1* +%attr(-,root,root) %{_mandir}/man5/rsyncd.conf.5* %attr(-,root,root) %doc tech_report.tex %attr(-,root,root) %doc README %attr(-,root,root) %doc COPYING +%attr(-,root,root) %doc doc/README-SGML doc/rsync.sgml diff --git a/packaging/redhat/7.1/rsync.spec.tmpl b/packaging/redhat/7.1/rsync.spec.tmpl index ce7082b5..d91a749f 100644 --- a/packaging/redhat/7.1/rsync.spec.tmpl +++ b/packaging/redhat/7.1/rsync.spec.tmpl @@ -21,8 +21,17 @@ A technical report describing the rsync algorithm is included with this package. %changelog +* Thu Jan 30 2003 Horst von Brand + Use %{_mandir} to point to manpages + Support for compressed manpages (* at end catches them in %files) + Add doc/README-SGML and doc/rsync.sgml to %doc + +* Mon Sep 11 2000 John H Terpstra + Changed target paths to be Linux Standards Base compliant + * Mon Jan 25 1999 Stefan Hornburg - quoted RPM_OPT_FLAGS for the sake of robustness + quoted RPM_OPT_FLAGS for the sake of robustness + * Mon May 18 1998 Andrew Tridgell reworked for auto-building when I release rsync (tridge@samba.anu.edu.au) @@ -59,23 +68,25 @@ previous package(s).) %setup %build -./configure --prefix=/usr +./configure --prefix=/usr --mandir=%{_mandir} make CFLAGS="$RPM_OPT_FLAGS" strip rsync %install -mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/{man1,man5}} +mkdir -p $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man{1,5} install -m755 rsync $RPM_BUILD_ROOT/usr/bin -install -m644 rsync.1* $RPM_BUILD_ROOT/usr/man/man1 -install -m644 rsyncd.conf.5* $RPM_BUILD_ROOT/usr/man/man5 +install -m644 rsync.1 $RPM_BUILD_ROOT/%{_mandir}/man1 +install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT/%{_mandir}/man5 %clean rm -rf $RPM_BUILD_ROOT %files %attr(-,root,root) /usr/bin/rsync -%attr(-,root,root) /usr/man/man1/rsync.1* -%attr(-,root,root) /usr/man/man5/rsyncd.conf.5* +%attr(-,root,root) %{_mandir}/man1/rsync.1* +%attr(-,root,root) %{_mandir}/man5/rsyncd.conf.5* %attr(-,root,root) %doc tech_report.tex %attr(-,root,root) %doc README %attr(-,root,root) %doc COPYING +%attr(-,root,root) %doc doc/README-SGML doc/rsync.sgml -- 2.34.1