From c6077ec37f37e526ba17af767d1f51491dec85f1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jaros=C5=82aw=20Kruk?= <jareq@pld-linux.org>
Date: Sat, 29 Oct 2011 11:27:39 +0000
Subject: [PATCH] - simplification static build; rel 2

Changed files:
    ghex-static.patch -> 1.2
    ghex.spec -> 1.40
---
 ghex-static.patch | 12 ------------
 ghex.spec         |  7 +++----
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 ghex-static.patch

diff --git a/ghex-static.patch b/ghex-static.patch
deleted file mode 100644
index 1912414..0000000
--- a/ghex-static.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN ghex-3.0.0/configure.ac ghex-3.0.0.static/configure.ac
---- ghex-3.0.0/configure.ac	2011-09-26 19:27:22.000000000 +0200
-+++ ghex-3.0.0.static/configure.ac	2011-10-29 11:03:59.000000000 +0200
-@@ -15,7 +15,7 @@
- 
- # Initialize libtool
- LT_PREREQ([2.2.6])
--LT_INIT([disable-static])
-+LT_INIT()
- 
- # Check for header files.
- AC_CHECK_HEADERS([string.h unistd.h])
diff --git a/ghex.spec b/ghex.spec
index cb10272..fc31824 100644
--- a/ghex.spec
+++ b/ghex.spec
@@ -2,13 +2,12 @@ Summary:	GNOME2 binary editor
 Summary(pl.UTF-8):	Edytor binarny dla GNOME2
 Name:		ghex
 Version:	3.0.0
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		X11/Applications/Editors
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/ghex/3.0/%{name}-%{version}.tar.xz
 # Source0-md5:	ffa346d6fa97b9e787680159a5479b84
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-static.patch
 URL:		http://www.gnu.org/directory/text/editors/ghex.html
 BuildRequires:	atk-devel >= 1:1.22.0
 BuildRequires:	autoconf >= 2.53
@@ -67,7 +66,6 @@ Biblioteka statyczna GHex.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__glib_gettextize}
@@ -78,7 +76,8 @@ Biblioteka statyczna GHex.
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-schemas-compile
+	--disable-schemas-compile \
+	--enable-static
 %{__make}
 
 %install
-- 
2.44.0