fedora-notion-devel [notion] drop_dev, master: * Removed X11 patch. * Renamed man/utf8 patch to change number. (4b926e5)

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

On branches: drop_dev,master

> ---------------------------------------------------------------
commit 4b926e516ba555f9b58cf0b60859bd098ae93c64
Author: Jeff Backus <jeff.backus(a)gmail.com&gt;
Date:   Mon Jan 20 13:00:15 2014 -0500

    * Removed X11 patch.
    * Renamed man/utf8 patch to change number.


> ---------------------------------------------------------------
 ...patch => notion-3.2014010900.p00-man_utf8.patch |    0
 notion-3.2014010900.p00-x11_prefix.patch           |   75 --------------------
 notion.spec                                        |    8 +-
 3 files changed, 4 insertions(+), 79 deletions(-)

diff --git a/notion-3.2014010900.p01-man_utf8.patch
b/notion-3.2014010900.p00-man_utf8.patch
similarity index 100%
rename from notion-3.2014010900.p01-man_utf8.patch
rename to notion-3.2014010900.p00-man_utf8.patch
diff --git a/notion-3.2014010900.p00-x11_prefix.patch
b/notion-3.2014010900.p00-x11_prefix.patch
deleted file mode 100644
index 3b6c001..0000000
--- a/notion-3.2014010900.p00-x11_prefix.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From f7d05f65a1602d7da52495de0934d0d04494ea14 Mon Sep 17 00:00:00 2001
-From: Jeff Backus <jeff.backus(a)gmail.com&gt;
-Date: Sun, 5 Jan 2014 13:19:29 -0500
-Subject: [PATCH 1/2] * Modified X11_LIBS and X11_INCLUDES statements to use
- pkg-config.
-
----
- system-autodetect.mk | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/system-autodetect.mk b/system-autodetect.mk
-index d61c447..69b21d0 100644
---- a/system-autodetect.mk
-+++ b/system-autodetect.mk
-@@ -77,12 +77,14 @@ include $(TOPDIR)/build/lua-detect.mk
- ##
- 
- # Paths
--X11_PREFIX ?= /usr/X11R6
-+#X11_PREFIX ?= /usr/X11R6
- # SunOS/Solaris
- #X11_PREFIX ?= /usr/openwin
- 
--X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext
--X11_INCLUDES=-I$(X11_PREFIX)/include
-+#X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext
-+#X11_INCLUDES=-I$(X11_PREFIX)/include
-+X11_LIBS := $(or $(shell pkg-config --libs x11 xext), $(error "pkg-config
couldn't find X11 libraries"))
-+X11_INCLUDES := $(shell pkg-config --cflags x11 xext)
- 
- # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
- # The following setting  should  work around that situation.
--- 
-1.8.1.4
-
-
-From c18c8f9865f26b21edcdc99986abc33df526bcf7 Mon Sep 17 00:00:00 2001
-From: Jeff Backus <jeff.backus(a)gmail.com&gt;
-Date: Mon, 20 Jan 2014 12:10:18 -0500
-Subject: [PATCH 2/2] * Reverted back to non-pkg-config method. * Added two new
- variables, X11_LIBDIR and X11_INCDIR that allow the user more fine-grained
- control over X11 lib and inc paths.
-
----
- system-autodetect.mk | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/system-autodetect.mk b/system-autodetect.mk
-index 69b21d0..cb8c65f 100644
---- a/system-autodetect.mk
-+++ b/system-autodetect.mk
-@@ -77,14 +77,15 @@ include $(TOPDIR)/build/lua-detect.mk
- ##
- 
- # Paths
--#X11_PREFIX ?= /usr/X11R6
-+X11_PREFIX ?= /usr/X11R6
- # SunOS/Solaris
- #X11_PREFIX ?= /usr/openwin
- 
--#X11_LIBS=-L$(X11_PREFIX)/lib -lX11 -lXext
--#X11_INCLUDES=-I$(X11_PREFIX)/include
--X11_LIBS := $(or $(shell pkg-config --libs x11 xext), $(error "pkg-config
couldn't find X11 libraries"))
--X11_INCLUDES := $(shell pkg-config --cflags x11 xext)
-+X11_LIBDIR ?= $(X11_PREFIX)/lib
-+X11_INCDIR ?= $(X11_PREFIX)/include
-+
-+X11_LIBS=-L$(X11_LIBDIR) -lX11 -lXext
-+X11_INCLUDES=-I$(X11_INCDIR)
- 
- # XFree86 libraries up to 4.3.0 have a bug that can cause a segfault.
- # The following setting  should  work around that situation.
--- 
-1.8.1.4
-
diff --git a/notion.spec b/notion.spec
index 85cf235..8479085 100644
--- a/notion.spec
+++ b/notion.spec
@@ -13,9 +13,8 @@ Source0:       
http://downloads.sourceforge.net/project/notion/%{name}-%{majorv
 Source1:       
https://fedorahosted.org/released/%{name}/%{name}-doc-%{majorver}-%{datev...
 Source2:        https://fedorahosted.org/released/%{name}/%{name}.desktop
 
-Patch0:         %{name}-%{majorver}.%{datever}.p00-x11_prefix.patch
 # Patch submitted to upstream
-Patch1:         %{name}-%{majorver}.%{datever}.p01-man_utf8.patch
+Patch0:         %{name}-%{majorver}.%{datever}.p00-man_utf8.patch
 
 BuildRequires:  gettext
 BuildRequires:  pkgconfig
@@ -78,8 +77,7 @@ Notion.
 # Decompress doc pkg
 tar -xvf %SOURCE1
 
-#%patch0 -p1
-%patch1 -p1
+%patch0 -p1
 
 sed -e 's|^\(PREFIX\s*?=\s*\).*$|\1%{_prefix}|' \
     -e 's|^\(ETCDIR\s*?=\s*\).*$|\1%{_sysconfdir}/%{name}|' \
@@ -144,6 +142,8 @@ make install DOCDIR=$RPM_BUILD_DIR/%{buildsubdir}/_docs_staging
TOPDIR=..
 * Sun Jan 19 2014 Jeff Backus <jeff.backus(a)gmail.com&gt; - 3.2014010900-3
 - Changed method of correcting manpage text encoding to something upstream can
   apply to source.
+- Removed devel subpackage.
+- Removed unnecessary patches.
 
 * Sat Jan 18 2014 Jeff Backus <jeff.backus(a)gmail.com&gt; - 3.2014010900-2
 - Fixed a typo in required font package name.