There are two patches attached to this message. The 'tilde patch' gets rid of
more of what look like stray multiple install files.
The 'spec_doc patch' puts the HTML documentation back into the
systemimager-server RPM.
Question... what's the 'rule' for updating the RPMs on SF? That is, should I
wait for someone to apply these and update the tarball, or should I just go
ahead and build with the patched specfile and not worry about the specfile in
the tarball?
One other thing... Brian was asking about the rpm name to get minfo... it is
mtools. Should I create another patch to add that as a dependency?
--- systemimager.spec.2 2004-03-11 23:04:17.000000000 -0700
+++ systemimager.spec.3 2004-03-12 00:29:27.000000000 -0700
@@ -1,6 +1,6 @@
%define name systemimager
%define ver 3.2.0
-%define rel 2
+%define rel 3
%define prefix /usr
%define _build_all 1
%define _boot_flavor standard
@@ -20,7 +20,6 @@
BuildRoot: /tmp/%{name}-%{ver}-root
BuildArchitectures: noarch
Packager: dann frazier <[EMAIL PROTECTED]>
-Docdir: %{prefix}/share/doc
URL: http://systemimager.org/
Distribution: System Installation Suite
Requires: rsync >= 2.4.6, syslinux >= 1.48, libappconfig-perl, dosfstools, /usr/bin/perl
@@ -39,7 +38,6 @@
Group: Applications/System
BuildRoot: /tmp/%{name}-%{ver}-root
Packager: dann frazier <[EMAIL PROTECTED]>
-docdir: %{prefix}/share/doc
URL: http://systemimager.org/
Distribution: System Installation Suite
Requires: rsync >= 2.4.6, systemimager-common = %{version}, perl-AppConfig, dosfstools, /sbin/chkconfig, perl, perl-XML-Simple
@@ -71,7 +69,6 @@
Group: Applications/System
BuildRoot: /tmp/%{name}-%{ver}-root
Packager: dann frazier <[EMAIL PROTECTED]>
-Docdir: %{prefix}/share/doc
URL: http://systemimager.org/
Distribution: System Installation Suite
Requires: systemimager-server = %{version}, /sbin/chkconfig, perl, flamethrower >= 0.1.6
@@ -103,7 +100,6 @@
Group: Applications/System
BuildRoot: /tmp/%{name}-%{ver}-root
Packager: dann frazier <[EMAIL PROTECTED]>
-Docdir: %{prefix}/share/doc
URL: http://systemimager.org/
Distribution: System Installation Suite
Requires: perl, systemconfigurator
@@ -135,7 +131,6 @@
Group: Applications/System
BuildRoot: /tmp/%{name}-%{ver}-root
Packager: dann frazier <[EMAIL PROTECTED]>
-Docdir: %{prefix}/share/doc
URL: http://systemimager.org/
Distribution: System Installation Suite
Requires: systemimager-common = %{version}, systemconfigurator, perl-AppConfig, rsync >= 2.4.6, perl
@@ -169,7 +164,6 @@
Group: Applications/System
BuildRoot: /tmp/%{name}-%{ver}-root
Packager: dann frazier <[EMAIL PROTECTED]>
-Docdir: %{prefix}/share/doc
URL: http://systemimager.org/
Distribution: System Installation Suite
Obsoletes: systemimager-%{_build_arch}boot
@@ -196,6 +190,9 @@
process.
%changelog
+* Fri Mar 12 2004 sis devel <[EMAIL PROTECTED]> 3.2.0-3
+- html documentation returned to systemimager-server package
+
* Wed Mar 10 2004 sis devel <[EMAIL PROTECTED]> 3.2.0-2
- remove more files created by multiple calls to install phases
@@ -315,6 +312,7 @@
cd $RPM_BUILD_DIR/%{name}-%{version}/
make install_server_all DESTDIR=/tmp/%{name}-%{ver}-root PREFIX=%prefix
make install_client_all DESTDIR=/tmp/%{name}-%{ver}-root PREFIX=%prefix
+(cd doc/manual_source;make html)
%else
@@ -335,7 +333,10 @@
rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/pxelinux.cfg/syslinux.cfg~
rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/pxelinux.cfg/syslinux.cfg.localboot~
rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/rsync_stubs/10header~
+# Should I do this?
rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/rsync_stubs/99local.dist~
+rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/rsync_stubs/99local.dist~~
+#
rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/rsync_stubs/README~
rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/updateclient.local.exclude~
@@ -468,6 +469,7 @@
%files server
%defattr(-, root, root)
%doc CHANGE.LOG COPYING CREDITS README VERSION
+%doc doc/manual_source/html
# These should move to a files doc section, because they are missing if you don't do doc
# %doc doc/manual/systemimager* doc/manual/html doc/manual/examples
%doc doc/autoinstall* doc/local.cfg
--- systemimager.spec.1 2004-03-11 22:54:47.000000000 -0700
+++ systemimager.spec.2 2004-03-11 23:04:17.000000000 -0700
@@ -1,6 +1,6 @@
%define name systemimager
%define ver 3.2.0
-%define rel 1
+%define rel 2
%define prefix /usr
%define _build_all 1
%define _boot_flavor standard
@@ -196,6 +196,9 @@
process.
%changelog
+* Wed Mar 10 2004 sis devel <[EMAIL PROTECTED]> 3.2.0-2
+- remove more files created by multiple calls to install phases
+
* Wed Mar 03 2004 sis devel <[EMAIL PROTECTED]> 3.2.0-1
* Wed Nov 12 2003 sis devel <[EMAIL PROTECTED]> 3.1.6-1
@@ -321,9 +324,19 @@
%endif
+# Some things that get duplicated because there are multiple calls to
+# the make install_* phases.
rm -f /tmp/%{name}-%{ver}-root/etc/init.d/systemimager-server-flamethrowerd~
+rm -f /tmp/%{name}-%{ver}-root/etc/init.d/systemimager-server-netbootmond~
rm -f /tmp/%{name}-%{ver}-root/etc/init.d/systemimager-server-rsyncd~
rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/client.conf~
+rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/pxelinux.cfg/default~
+rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/pxelinux.cfg/message.txt~
+rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/pxelinux.cfg/syslinux.cfg~
+rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/pxelinux.cfg/syslinux.cfg.localboot~
+rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/rsync_stubs/10header~
+rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/rsync_stubs/99local.dist~
+rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/rsync_stubs/README~
rm -f /tmp/%{name}-%{ver}-root/etc/systemimager/updateclient.local.exclude~
%clean
