[rpms/ibus] autotool: Updated spec file to work witout pkgconfig.

[Takao Fujiwara <tfujiwar@redhat.com>]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 81afe7cc666c4865d90b9f8c27d7588f3d8f11ed
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2012-11-30T17:11:26+09:00
Stats  : +71/-4 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/81afe7cc666c4865d90b9f8c27d7588f3d8f11ed?branch=autotool

Log:
Updated spec file to work witout pkgconfig.

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index 42f2e66..a48ab7b 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -265,3 +265,59 @@ index 25db578..d064ad6 100644
 -- 
 1.8.0
 
+From ae98b5a58846e1326550027dc8d2a773ed8a24c5 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Fri, 30 Nov 2012 11:43:43 +0900
+Subject: [PATCH] Fix xmllint errors.
+
+Review URL: https://codereview.appspot.com/6842115
+---
+ conf/dconf/dconf.xml.in.in     | 2 +-
+ conf/gconf/gconf.xml.in.in     | 2 +-
+ conf/memconf/memconf.xml.in.in | 2 +-
+ ui/gtk3/gtkpanel.xml.in.in     | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/conf/dconf/dconf.xml.in.in b/conf/dconf/dconf.xml.in.in
+index 0367008..ceb2b0c 100644
+--- a/conf/dconf/dconf.xml.in.in
++++ b/conf/dconf/dconf.xml.in.in
+@@ -1,4 +1,4 @@
+-<?xml version="1.0" encoding="utf-8"?>
++<?xml version=\"1.0\" encoding=\"utf-8\"?>
+ <!-- filename: dconf.xml -->
+ <component>
+ 	<name>org.freedesktop.IBus.Config</name>
+diff --git a/conf/gconf/gconf.xml.in.in b/conf/gconf/gconf.xml.in.in
+index 0644d7e..d82179f 100644
+--- a/conf/gconf/gconf.xml.in.in
++++ b/conf/gconf/gconf.xml.in.in
+@@ -1,4 +1,4 @@
+-<?xml version="1.0" encoding="utf-8"?>
++<?xml version=\"1.0\" encoding=\"utf-8\"?>
+ <!-- filename: pinyin.xml -->
+ <component>
+ 	<name>org.freedesktop.IBus.Config</name>
+diff --git a/conf/memconf/memconf.xml.in.in b/conf/memconf/memconf.xml.in.in
+index b60dbf2..939e40a 100644
+--- a/conf/memconf/memconf.xml.in.in
++++ b/conf/memconf/memconf.xml.in.in
+@@ -1,4 +1,4 @@
+-<?xml version="1.0" encoding="utf-8"?>
++<?xml version=\"1.0\" encoding=\"utf-8\"?>
+ <component>
+ 	<name>org.freedesktop.IBus.Config</name>
+ 	<description>On-memory Config Component</description>
+diff --git a/ui/gtk3/gtkpanel.xml.in.in b/ui/gtk3/gtkpanel.xml.in.in
+index c480bcd..1d2cf73 100644
+--- a/ui/gtk3/gtkpanel.xml.in.in
++++ b/ui/gtk3/gtkpanel.xml.in.in
+@@ -1,4 +1,4 @@
+-<?xml version="1.0" encoding="utf-8"?>
++<?xml version=\"1.0\" encoding=\"utf-8\"?>
+ <!-- filename: gtkpanel.xml -->
+ <component>
+ 	<name>org.freedesktop.IBus.Panel</name>
+-- 
+1.8.0
+

diff --git a/ibus.spec b/ibus.spec
index 0913f2d..75d81a2 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -1,10 +1,9 @@
-%{!?gtk2_binary_version: %global gtk2_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-2.0)}
-%{!?gtk3_binary_version: %global gtk3_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-3.0)}
-
 %global with_xkbfile 1
 %global with_pygobject2 1
 %global with_pygobject3 1
 
+%global with_pkg_config %(pkg-config --version >/dev/null 2>&1 && echo -n "1" || echo -n "0")
+
 %if (0%{?fedora} > 17 || 0%{?rhel} > 6)
 #ifarch ppc ppc64 s390 s390x
 %global with_gjs 0
@@ -17,14 +16,23 @@
 
 %global ibus_api_version 1.0
 
+%if %with_pkg_config
+%{!?gtk2_binary_version: %global gtk2_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-2.0)}
+%{!?gtk3_binary_version: %global gtk3_binary_version %(pkg-config  --variable=gtk_binary_version gtk+-3.0)}
 %global glib_ver %([ -a %{_libdir}/pkgconfig/glib-2.0.pc ] && pkg-config --modversion glib-2.0 | cut -d. -f 1,2 || echo -n "999")
+%else
+%{!?gtk2_binary_version: %global gtk2_binary_version ?.?.?}
+%{!?gtk3_binary_version: %global gtk3_binary_version ?.?.?}
+%global glib_ver 0
+%endif
+
 %global dbus_python_version 0.83.0
 # FIXME: It's better to use the new icon names
 %global gnome_icon_theme_legacy_version 2.91.6
 
 Name:       ibus
 Version:    1.4.99.20121109
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -419,6 +427,9 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Nov 30 2012 Takao Fujiwara <tfujiwar@redhat.com> - 1.4.99.20121109-5
+- Updated spec file to work witout pkgconfig.
+
 * Tue Nov 27 2012 Takao Fujiwara <tfujiwar@redhat.com> - 1.4.99.20121109-4
 - Added comment lines for patches.