3:58 p.m.
Fedora is perpetually low on space for its live cd, and a bug was filed
asking libvirt to drop the rather large ChangeLog from the RPM:
https://bugzilla.redhat.com/show_bug.cgi?id=977099
Really though, what's the point of a static ChangeLog these days? git
has won, and is far more useful for querying log info than a large
static blob.
This patch drops the ChangeLog generation. In its place there's now
a small stub file pointing to the online git log.
Additionally, the RPM was installing the ChangeLog and other doc
bits twice, once with the daemon and once with the client. Drop the
docs from the daemon package, it requires the client anyways.
---
I clipped the removal of ChangeLog-old since it exceeded mail size for
the list.
.gitignore | 1 -
ChangeLog | 8 +
ChangeLog-old | 16699 ------------------------------------------------------
Makefile.am | 15 +-
bootstrap.conf | 4 +-
cfg.mk | 2 +-
libvirt.spec.in | 4 +-
7 files changed, 13 insertions(+), 16720 deletions(-)
create mode 100644 ChangeLog
delete mode 100644 ChangeLog-old
diff --git a/.gitignore b/.gitignore
index 8a94748..07594f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,6 @@
.sc-start-sc_*
/ABOUT-NLS
/AUTHORS
-/ChangeLog
/GNUmakefile
/INSTALL
/NEWS
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..13c0fa4
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,8 @@
+The git repository log is the canonical changelog. It can be viewed online
+at:
+
+http://libvirt.org/git/?p=libvirt.git;a=log
+
+The historical ChangeLog from pre-git times is at:
+
+http://libvirt.org/git/?p=libvirt.git;a=blob;f=ChangeLog-old;h=b5d44d5dced1382e62b43db7e16614231aeb15dd;hb=HEAD
diff --git a/Makefile.am b/Makefile.am
index 4e24ecf..92ba1d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,6 @@ XML_EXAMPLES = \
test/*.xml storage/*.xml)))
EXTRA_DIST = \
- ChangeLog-old \
libvirt.spec libvirt.spec.in \
mingw-libvirt.spec.in \
libvirt.pc.in \
@@ -95,19 +94,7 @@ MAINTAINERCLEANFILES = .git-module-status
# disable this check
distuninstallcheck:
-dist-hook: gen-ChangeLog gen-AUTHORS
-
-# Generate the ChangeLog file (with all entries since the switch to git)
-# and insert it into the directory we're about to use to create a tarball.
-gen_start_date = 2009-07-04
-.PHONY: gen-ChangeLog
-gen-ChangeLog:
- $(AM_V_GEN)if test -d .git; then \
- $(top_srcdir)/build-aux/gitlog-to-changelog \
- --since=$(gen_start_date) > $(distdir)/cl-t; \
- rm -f $(distdir)/ChangeLog; \
- mv $(distdir)/cl-t $(distdir)/ChangeLog; \
- fi
+dist-hook: gen-AUTHORS
.PHONY: gen-AUTHORS
gen-AUTHORS:
diff --git a/bootstrap.conf b/bootstrap.conf
index 68c4a89..63f79c9 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -228,8 +228,8 @@ if `(${PYTHON_CONFIG-python-config} --version;
PYTHON_CONFIG=true
fi
-# Automake requires that ChangeLog and AUTHORS exist.
-touch AUTHORS ChangeLog || exit 1
+# Automake requires that AUTHORS exists.
+touch AUTHORS || exit 1
# Override bootstrap's list - we don't use mdate-sh or texinfo.tex.
gnulib_extra_files="
diff --git a/cfg.mk b/cfg.mk
index 9a9616c..d223e48 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -874,7 +874,7 @@ ifeq (0,$(MAKELEVEL))
_clean_requested = $(filter %clean,$(MAKECMDGOALS))
ifeq (1,$(_update_required)$(_clean_requested))
$(info INFO: gnulib update required; running ./autogen.sh first)
- $(shell touch $(srcdir)/AUTHORS $(srcdir)/ChangeLog)
+ $(shell touch $(srcdir)/AUTHORS)
maint.mk Makefile: _autogen
endif
endif
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 85881ae..dd9702e 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1413,7 +1413,6 @@ of recent versions of Linux (and other OSes).
--enable-expensive-tests \
%{init_scripts}
make %{?_smp_mflags}
-gzip -9 ChangeLog
%install
rm -fr %{buildroot}
@@ -1739,7 +1738,6 @@ fi
%files daemon
%defattr(-, root, root)
-%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
%if %{with_network}
@@ -2011,7 +2009,7 @@ fi
%files client -f %{name}.lang
%defattr(-, root, root)
-%doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO
+%doc AUTHORS ChangeLog NEWS README COPYING COPYING.LESSER TODO
%config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf
%config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
--
1.8.3.1