From 757f78e3893ab3a48009928350469e71385443680d8fe07c248b055b48d108df Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 8 Sep 2010 12:28:02 +0000
Subject: [PATCH] Accepting request 47447 from
 home:vuntz:branches:GNOME:Factory

ok

OBS-URL: https://build.opensuse.org/request/show/47447
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=94
---
 evolution.changes | 21 ++++++++++++++++++++
 evolution.spec    | 50 ++++++++++++++++++++++++++++++++---------------
 2 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/evolution.changes b/evolution.changes
index 0eded56..5609796 100644
--- a/evolution.changes
+++ b/evolution.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Sep  7 23:43:44 CEST 2010 - vuntz@opensuse.org
+
+- Change old-style BuildRequires to pkgconfig() style
+  BuildRequires:
+  + old-style: NetworkManager-devel, evolution-data-server-devel,
+    gnome-desktop-devel, gnome-icon-theme-devel,
+    gstreamer-0_10-devel, gtkhtml2-devel, gtkimageview-devel,
+    libcanberra-devel, libgdata-devel, libgweather-devel,
+    libnotify-devel, libpst-devel, libunique-devel,
+    mozilla-nss-devel, shared-mime-info
+  + new-style: NetworkManager, atk, gail, gconf-2.0, gio-2.0,
+    gnome-desktop-2.0, gnome-icon-theme, gstreamer-0.10, gtk+-2.0,
+    gtkimageview, gweather, libcanberra-gtk, libedataserver-1.2,
+    libedataserverui-1.2, libgdata, libgtkhtml-3.14, libnotify,
+    libpst, libsoup-2.4, libxml-2.0, nspr, nss, pangoft2,
+    shared-mime-info, unique-1.0.
+- This will make it easier to switch to GNOME 3 libraries.
+- Add pkgconfig(gladeui-1.0) BuildRequires and pass
+  --with-glade-catalog to configure to build the glade catalog.
+
 -------------------------------------------------------------------
 Mon Aug 30 09:07:29 CEST 2010 - dimstar@opensuse.org
 
diff --git a/evolution.spec b/evolution.spec
index 0c7775a..6a5f076 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -19,40 +19,51 @@
 %define USE_EVOLDAP 0
 
 Name:           evolution
-BuildRequires:  NetworkManager-devel
 BuildRequires:  bison
 %if %USE_EVOLDAP
 BuildRequires:  evoldap2-devel
 %else
 BuildRequires:  openldap2-devel
 %endif
-BuildRequires:  evolution-data-server-devel
 BuildRequires:  fdupes
 BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils-devel
-BuildRequires:  gnome-desktop-devel
-BuildRequires:  gnome-icon-theme-devel
-BuildRequires:  gstreamer-0_10-devel
 BuildRequires:  gtk-doc
-BuildRequires:  gtkhtml2-devel
-BuildRequires:  gtkimageview-devel
 BuildRequires:  intltool
 BuildRequires:  krb5-devel
-BuildRequires:  libcanberra-devel
-BuildRequires:  libgdata-devel
-BuildRequires:  libgweather-devel >= 2.25.4
-BuildRequires:  libnotify-devel
-BuildRequires:  libpst-devel
-BuildRequires:  libunique-devel
 # don't you ever enable this! It's experimental and insecure (bnc#609013)
 #BuildRequires:  libytnef-devel
-BuildRequires:  mozilla-nss-devel
 BuildRequires:  psmisc
 BuildRequires:  python-devel
-BuildRequires:  shared-mime-info
 BuildRequires:  sqlite3-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(NetworkManager)
+BuildRequires:  pkgconfig(atk)
+BuildRequires:  pkgconfig(gail)
+BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(gio-2.0)
+BuildRequires:  pkgconfig(gladeui-1.0)
+BuildRequires:  pkgconfig(gnome-desktop-2.0)
+BuildRequires:  pkgconfig(gnome-icon-theme)
+BuildRequires:  pkgconfig(gstreamer-0.10)
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(gtkimageview)
+BuildRequires:  pkgconfig(gweather)
+BuildRequires:  pkgconfig(libcanberra-gtk)
+BuildRequires:  pkgconfig(libedataserver-1.2)
+BuildRequires:  pkgconfig(libedataserverui-1.2)
+BuildRequires:  pkgconfig(libgdata)
+BuildRequires:  pkgconfig(libgtkhtml-3.14)
+BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libpst)
+BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(nspr)
+BuildRequires:  pkgconfig(nss)
+BuildRequires:  pkgconfig(pangoft2)
+BuildRequires:  pkgconfig(shared-mime-info)
+BuildRequires:  pkgconfig(unique-1.0)
 License:        LGPLv2.0 ; LGPLv3
 Group:          Productivity/Networking/Email/Clients
 # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
@@ -173,6 +184,7 @@ autoreconf -f -i
     --enable-smime=yes \
     --enable-mono=yes \
     --enable-python=yes \
+    --with-glade-catalog \
     --disable-static
 # Processing the files in help uses _lots_ of memory, so running that part in parallel is bad.
 pushd help
@@ -281,12 +293,18 @@ fi
 
 %files lang -f evolution-%evolution_base_version.lang
 
-%files devel 
+%files devel
 %defattr(-,root,root)
 %{_includedir}/*
 %{_libdir}/evolution/%{evolution_base_version}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/gtk-doc/html/eshell
+%dir %{_libdir}/glade3
+%dir %{_libdir}/glade3/modules
+%{_libdir}/glade3/modules/libgladeevolution.so
+%dir %{_datadir}/glade3
+%dir %{_datadir}/glade3/catalogs
+%{_datadir}/glade3/catalogs/evolution.xml
 
 %files mono-plugins
 %defattr(-,root,root)