[notion] master: * Fixed man patch. * Updated patches and changelog in spec file. (2fa7e13)

Repository : http://git.fedorahosted.org/cgit/notion.git

On branch  : master

> ---------------------------------------------------------------
commit 2fa7e13423fbc1bbf9bafedb54f23f7c6572e7d1
Author: Jeff Backus <jeff.backus(a)gmail.com&gt;
Date:   Sun Jan 12 11:18:27 2014 -0500

    * Fixed man patch.
    * Updated patches and changelog in spec file.


> ---------------------------------------------------------------
 notion-3.2014010900.p01-man_utf8.patch |    6 +++---
 notion.spec                            |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/notion-3.2014010900.p01-man_utf8.patch
b/notion-3.2014010900.p01-man_utf8.patch
index 4d608f5..3163921 100644
--- a/notion-3.2014010900.p01-man_utf8.patch
+++ b/notion-3.2014010900.p01-man_utf8.patch
@@ -1,11 +1,11 @@
 diff -rupN notion-3-2014010900/man/Makefile notion-3-2014010900_patched/man/Makefile
 --- notion-3-2014010900/man/Makefile	2014-01-09 14:02:16.000000000 -0500
-+++ notion-3-2014010900_patched/man/Makefile	2014-01-11 13:22:42.301524339 -0500
++++ notion-3-2014010900_patched/man/Makefile	2014-01-12 10:46:14.661966471 -0500
 @@ -19,6 +19,7 @@ TARGETS=notion.1 notionflux.1 $(foreach
  
  MKMAN=$(LUA) ../build/mkman.lua $(MKMAN_DEFS)
  MKMAN_DEFS=-D ETCDIR $(REL)$(ETCDIR) -D DOCDIR $(REL)$(DOCDIR)
-++ICONV=`which iconv`
++ICONV=`which iconv`
  
  ifeq ($(RELOCATABLE),1)
  REL="/..."
@@ -13,7 +13,7 @@ diff -rupN notion-3-2014010900/man/Makefile
notion-3-2014010900_patched/man/Make
  
  notion.%.1: notion.%.in $(CONFIGS) ../po/%.po
  	$(MKMAN) -po ../po/$*.po -i $< -o $@ $(CONFIGS)
-++	$(ICONV) -f LATIN1 -t UTF8 -o $@ $@
++	$(ICONV) -f LATIN1 -t UTF8 -o $@ $@
  
  notionflux.1: notionflux.in $(CONFIGS)
  	$(MKMAN) -i $< -o $@ $(CONFIGS)
diff --git a/notion.spec b/notion.spec
index 6aacaba..84b4c07 100644
--- a/notion.spec
+++ b/notion.spec
@@ -14,8 +14,8 @@ Source1:       
https://fedorahosted.org/released/%{name}/%{name}-doc-%{majorver
 Source2:        https://fedorahosted.org/released/%{name}/%{name}.desktop
 
 Patch0:         %{name}-%{majorver}.%{datever}.p00-ChangeLog_update.patch
-Patch1:         %{name}-%{majorver}.%{datever}.p03-x11_prefix.patch
-Patch2:         %{name}-%{majorver}.%{datever}.p04-man_utf8.patch
+Patch1:         %{name}-%{majorver}.%{datever}.p01-man_utf8.patch
+Patch2:         %{name}-%{majorver}.%{datever}.p02-x11_prefix.patch
 #Patch3:         %{name}-%{majorver}.%{datever}.p01-fonts.patch
 
 BuildRequires:  gettext
@@ -121,7 +121,7 @@ tar -xvf %SOURCE1
 
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 #%patch3 -p1
 
 sed -e 's|^\(PREFIX\s*?=\s*\).*$|\1%{_prefix}|' \
@@ -245,7 +245,7 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging
TOPDIR=..
 %{_includedir}/%{name}
 
 %changelog
-* Sat Jan  4 2014 Jeff Backus <jeff.backus(a)gmail.com&gt; - 3.2014010505-1
+* Sat Jan  12 2014 Jeff Backus <jeff.backus(a)gmail.com&gt; - 3.2014010900-1
 - New upstream release.
 - Fixed issue where contrib files where getting picked up by main package.