[emacs-bbdb] Remove the info file. It currently does not contain any real documentation
Göran Uddeborg
goeran at fedoraproject.org
Thu Feb 26 20:18:40 UTC 2015
commit 0ebb3af147d97c7f72b42b27a97c21b9ae0a49f7
Author: Göran Uddeborg <goeran at uddeborg.se>
Date: Thu Feb 26 21:18:35 2015 +0100
Remove the info file. It currently does not contain any real documentation
but just a template (BZ #1192873)
- Clean up a warning during RPM build.
emacs-bbdb.spec | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/emacs-bbdb.spec b/emacs-bbdb.spec
index ff799e5..b2bb313 100644
--- a/emacs-bbdb.spec
+++ b/emacs-bbdb.spec
@@ -11,7 +11,7 @@
Name: emacs-bbdb
Version: 3.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
Summary: A contact management utility for use with Emacs
Summary(sv): Ett verktyg för att hantera kontakter i Emacs
@@ -19,6 +19,7 @@ Summary(sv): Ett verktyg för att hantera kontakter i Emacs
License: GPLv3+
URL: http://savannah.nongnu.org/projects/bbdb/
Requires: emacs(bin) >= %{_emacs_version}
+Requires(pre): info
Source0: http://download.savannah.gnu.org/releases/bbdb/bbdb-%{version}.tar.gz
Patch0: bbdb-3.1.2-migrate-fix.patch
@@ -70,24 +71,29 @@ cat > $RPM_BUILD_ROOT%{_emacs_sitestartdir}/bbdb-init.el << EOF
(require 'bbdb-loaddefs)
EOF
-# Adapt to Fedora-specific naming.
+# Adapt to Fedora-specific naming for doc directory.
mv %{buildroot}%{_docdir}/bbdb %{buildroot}%{_pkgdocdir}
+# The COPYING file belongs in the license directory instead.
+rm %{buildroot}%{_pkgdocdir}/COPYING
+
# The install creates a dir file, but this has to be done in package
# installation.
rm %{buildroot}%{_infodir}/dir
-%post
-/usr/sbin/install-info %{_infodir}/bbdb.info.gz %{_infodir}/dir 2>/dev/null || :
+# The current info file is just a template, it doesn't contain any real
+# documentation.
+rm %{buildroot}%{_infodir}/bbdb.info
+
-%preun
-if [ $1 -eq 0 ]; then
+%pre
+# Remove any remaining info entry from previous releases when upgrading.
+if [ $1 -gt 1 ]; then
/usr/sbin/install-info --delete %{_infodir}/bbdb.info.gz %{_infodir}/dir 2>/dev/null || :
fi
+
%files
-%doc %{_infodir}/bbdb.info.gz
-%doc AUTHORS NEWS README TODO
%license COPYING
%{_datadir}/bbdb
%{lispdir}/
@@ -96,6 +102,11 @@ fi
%changelog
+* Thu Feb 26 2015 Göran Uddeborg <goeran at uddeborg.se> 1:3.1.2-3
+- Remove the info file. It currently does not contain any real documentation
+ but just a template (BZ #1192873)
+- Clean up a warning during RPM build.
+
* Sun Dec 14 2014 Göran Uddeborg <goeran at uddeborg.se> 1:3.1.2-2
- Allow either 2 and 3 semicolons in databases (BZ #1172912).
- Fix ":" (bbdb-mua-display-sender) in mh-folder mode (BZ #1172915).
More information about the scm-commits
mailing list