"Green, Paul" <Paul.Green@stratus.com>
said:> Horst,
>
> Would you mind taking a look at the other spec files, specifically the
> RedHat 5.0 and 7.1 files? Looks to my untrained eyes that some of the
> changes you made here should be made in them as well.
For 5.0 I'm not sure, for 7.1 it certainly is applicable. In any case, I
only have a RH 8.0 system ad hand, so... In any case, the lsb .spec file
should be quite portable after my patch, so you could just delete the
others. Or you would have to add directories for the several RH releases in
between/after (* shudder *).
A full patch (all three files, lsb again as before) follows. Or keep the
other patch and "rm -rf packaging/redhat", expecting people running
into
trouble to fix the spec file by themselves. I added a note for them to
INSTALL. Perhaps you should contact the Debianites to contribute their
configuration scripts too?
--- rsync-2.5.6/INSTALL.orig 2002-03-27 06:10:44.000000000 +0100
+++ rsync-2.5.6/INSTALL 2003-01-30 11:11:11.000000000 +0100
@@ -19,6 +19,11 @@
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
-----------
--- rsync-2.5.6/packaging/lsb/rsync.spec.orig 2003-01-28 06:28:35.000000000
+0100
+++ rsync-2.5.6/packaging/lsb/rsync.spec 2003-01-30 10:42:12.000000000 +0100
@@ -21,7 +21,13 @@
this package.
%changelog
-* Mon Sept 11 2000 John H Terpstra <jht@turbolinux.com>
+* Tue Jan 26 2003 Horst von Brand <vonbrand@inf.utfsm.cl>
+ Fixed "Sept" date in %changelog here
+ Use %{_mandir} to point at manpages
+ Some distributions compress manpages, add '*' to cover this
+ Add doc/README-SGML and doc/rsync.sgml to %doc
+
+* Mon Sep 11 2000 John H Terpstra <jht@turbolinux.com>
Changed target paths to be Linux Standards Base compliant
* Mon Jan 25 1999 Stefan Hornburg <racke@linuxia.de>
@@ -62,23 +68,25 @@
%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
--- rsync-2.5.6/packaging/redhat/5.0/rsync.spec.orig 2003-01-28
06:28:35.000000000 +0100
+++ rsync-2.5.6/packaging/redhat/5.0/rsync.spec 2003-01-30 10:49:29.000000000
+0100
@@ -21,8 +21,14 @@
this package.
%changelog
+* Thu Jan 30 2003 Horst von Brand <vonbrand@inf.utfsm.cl>
+ 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 Jan 25 1999 Stefan Hornburg <racke@linuxia.de>
- quoted RPM_OPT_FLAGS for the sake of robustness
+ quoted RPM_OPT_FLAGS for the sake of robustness
+
* Mon May 18 1998 Andrew Tridgell <tridge@samba.anu.edu.au>
reworked for auto-building when I release rsync (tridge@samba.anu.edu.au)
@@ -64,18 +70,20 @@
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}/{man1,man5}}
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
--- rsync-2.5.6/packaging/redhat/7.1/rsync.spec.orig 2003-01-28
06:28:35.000000000 +0100
+++ rsync-2.5.6/packaging/redhat/7.1/rsync.spec 2003-01-30 10:59:12.000000000
+0100
@@ -21,8 +21,13 @@
this package.
%changelog
+* Thu Jan 30 2003 Horst von Brand <vonbrand@inf.utfsm.cl>
+ Use %{_mandir} to point to manpages
+ Add doc/README-SGML and doc/rsync.sgml to %doc
+
* Mon Jan 25 1999 Stefan Hornburg <racke@linuxia.de>
quoted RPM_OPT_FLAGS for the sake of robustness
+
* Mon May 18 1998 Andrew Tridgell <tridge@samba.anu.edu.au>
reworked for auto-building when I release rsync (tridge@samba.anu.edu.au)
@@ -64,18 +69,20 @@
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}/{man1,man5}
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
--
Dr. Horst H. von Brand User #22616 counter.li.org
Departamento de Informatica Fono: +56 32 654431
Universidad Tecnica Federico Santa Maria +56 32 654239
Casilla 110-V, Valparaiso, Chile Fax: +56 32 797513