[emacs-magit] update to 1.2.2

[Jens Petersen]

commit a5df3569f2616d8c5c2e06455dfe59e1d63cc335
Author: Jens Petersen <petersen at redhat.com>
Date:   Sun Jan 4 18:59:05 2015 +0900

    update to 1.2.2
    
    the install-info Makefile patch is to get install-info:
    I couldn't get it to find install-info even with adding sbin PATH??

 .gitignore                        |    1 +
 emacs-magit.spec                  |   19 +++++++++----------
 magit-1.2.2-mk-install-info.patch |   22 ++++++++++++++++++++++
 sources                           |    2 +-
 4 files changed, 33 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c733578..47a2c08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ magit-0.8.2.tar.gz
 /magit-1.0.0.tar.gz
 /magit-1.1.1.tar.gz
 /magit-1.2.0.tar.gz
+/magit-1.2.2.tar.gz
diff --git a/emacs-magit.spec b/emacs-magit.spec
index bee45cb..ab5bef9 100644
--- a/emacs-magit.spec
+++ b/emacs-magit.spec
@@ -1,6 +1,5 @@
 %define pkg magit
 %define pkgname Magit
-%define git_pull_date 20090122
 
 %if %($(pkg-config emacs) ; echo $?)
 %define emacs_version 22.1
@@ -13,17 +12,16 @@
 %endif
 
 Name:           emacs-%{pkg}
-Version:        1.2.0
-Release:        4%{?dist}
+Version:        1.2.2
+Release:        1%{?dist}
 Summary:        Emacs interface to the most common Git operations
 
 Group:          Applications/Editors
 License:        GPLv3+ and GFDL+
 URL:            http://magit.github.com/magit/
 
-Source0:        http://github.com/downloads/magit/magit/magit-%{version}.tar.gz
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:        https://github.com/magit/magit/releases/download/%{version}/magit-%{version}.tar.gz
+Patch0:         magit-1.2.2-mk-install-info.patch
 
 BuildArch:      noarch
 BuildRequires:  emacs emacs-el texinfo
@@ -46,12 +44,12 @@ package to use %{pkgname} with GNU Emacs.
 
 %prep
 %setup -q -n magit-%{version}
+%patch0 -p1 -b .orig
 
 %build
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
 
 # clean up after magit's installer's assumptions
@@ -64,9 +62,6 @@ mv $RPM_BUILD_ROOT%{emacs_lispdir}/*.el{,c} \
 gzip -9 < magit.info > $RPM_BUILD_ROOT%{_infodir}/magit.info.gz
 rm $RPM_BUILD_ROOT%{_infodir}/dir
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %post
 /sbin/install-info /usr/share/info/magit.info.gz /usr/share/info/dir
@@ -79,6 +74,7 @@ fi
 
 
 %files
+# no license file included
 %doc README.md
 %{emacs_lispdir}/%{pkg}/*.elc
 %{emacs_startdir}/*.el
@@ -89,6 +85,9 @@ fi
 %{emacs_lispdir}/%{pkg}/*.el
 
 %changelog
+* Sun Jan  4 2015 Jens Petersen <petersen at redhat.com> - 1.2.2-1
+- update to 1.2.2 which works with emacs-24.4 (#1172690)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/magit-1.2.2-mk-install-info.patch b/magit-1.2.2-mk-install-info.patch
new file mode 100644
index 0000000..dd01111
--- /dev/null
+++ b/magit-1.2.2-mk-install-info.patch
@@ -0,0 +1,22 @@
+--- magit-1.2.2/Makefile~	2014-12-13 20:11:32.000000000 +0900
++++ magit-1.2.2/Makefile	2015-01-04 18:52:20.332305012 +0900
+@@ -40,7 +40,7 @@
+ magit.elc: magit.el
+ 
+ dir: magit.info
+-	install-info --dir=$@ $<
++	/usr/sbin/install-info --dir=$@ $<
+ 
+ magit.info:
+ 
+@@ -72,7 +72,7 @@
+ install_docs: docs
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/info
+ 	install -m 644 magit.info $(DESTDIR)$(PREFIX)/share/info
+-	install-info --info-dir=$(DESTDIR)$(PREFIX)/share/info $(DESTDIR)$(PREFIX)/share/info/magit.info
++	/usr/sbin/install-info --info-dir=$(DESTDIR)$(PREFIX)/share/info $(DESTDIR)$(PREFIX)/share/info/magit.info
+ 
+ install_contrib: contrib
+ 	mkdir -p $(DESTDIR)$(PREFIX)/share/emacs/site-lisp
+
+Diff finished.  Sun Jan  4 18:52:37 2015
diff --git a/sources b/sources
index 777faf3..11d8864 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72bad34c38e0d5bc153b7fa9045e905c  magit-1.2.0.tar.gz
+3f7eec3d0bb239e4e87f897a785fd28b  magit-1.2.2.tar.gz