From 6f9e50ca360717f0aa2ba9d0216919ce75089594 Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Aug 18 2015 00:56:25 +0000
Subject: Merge branch 'master' into epel7


---

diff --git a/.gitignore b/.gitignore
index 1acb262..fb622ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /reposurgeon-3.11.tar.gz
 /reposurgeon-3.12.tar.gz
 /reposurgeon-3.19.tar.gz
+/reposurgeon-3.28.tar.gz
diff --git a/reposurgeon.spec b/reposurgeon.spec
index 6945b55..1ced33c 100644
--- a/reposurgeon.spec
+++ b/reposurgeon.spec
@@ -1,5 +1,5 @@
 Name:           reposurgeon
-Version:        3.19
+Version:        3.28
 Release:        1%{?dist}
 Summary:        SCM Repository Manipulation Tool
 License:        BSD
@@ -9,15 +9,16 @@ BuildArch:      noarch
 BuildRequires:  asciidoc
 BuildRequires:  python
 BuildRequires:  xmlto
+Requires:       emacs-filesystem
 Requires:       python
 
 %description
-Reposurgeon enables risky operations that version-control systems don't want 
-to let you do, such as editing past comments and metadata and removing 
-commits. It works with any version control system that can export and import 
-git fast-import streams, including git, hg, fossil, bzr, CVS and RCS. It can 
+Reposurgeon enables risky operations that version-control systems don't want
+to let you do, such as editing past comments and metadata and removing
+commits. It works with any version control system that can export and import
+git fast-import streams, including git, hg, fossil, bzr, CVS and RCS. It can
 also read Subversion dump files directly and can thus be used to script 
-production of very high-quality conversions from Subversion to any supported 
+production of very high-quality conversions from Subversion to any supported
 DVCS.
 
 %prep
@@ -27,24 +28,29 @@ DVCS.
 make %{?_smp_mflags}
 
 %install
-make install INSTALL="install -p" target="%{buildroot}%{_prefix}"
-# We use %%doc to install docs.
-rm -rfv %{buildroot}%{_docdir}
+%make_install prefix=%{_prefix} INSTALL="install -p"
 
-%check
-make check
+install -pDm644 reposurgeon-mode.el %{buildroot}%{_datadir}/emacs/site-lisp/reposurgeon-mode.el
+
+# Use %%doc to install docs.
+rm -frv %{buildroot}%{_docdir}
 
 %files
-%doc AUTHORS NEWS README TODO features.html
+%doc AUTHORS NEWS README TODO *.html
+%doc conversion.mk
 %license COPYING
 %{_bindir}/%{name}
-%{_bindir}/repopuller
 %{_bindir}/repodiffer
+%{_bindir}/repotool
+%{_datadir}/emacs/site-lisp/reposurgeon-mode.el
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man1/repodiffer.1*
-%{_mandir}/man1/repopuller.1*
+%{_mandir}/man1/repotool.1*
 
 %changelog
+* Sun Jul 19 2015 Christopher Meng <rpm@cicku.me> - 3.28-1
+- Update to 3.28
+
 * Thu Jan 22 2015 Christopher Meng <rpm@cicku.me> - 3.19-1
 - Update to 3.19
 
diff --git a/sources b/sources
index 1fee3b2..c1c71d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7fa9fb6fd5c367f5a9a6e17db3e12a71  reposurgeon-3.19.tar.gz
+0c56038c4772e2c267eaa8c3fa13de36  reposurgeon-3.28.tar.gz