- Fix libnautilus-extensions pkg-config files

This commit is contained in:
Bastien Nocera 2010-06-23 18:22:29 +00:00
parent eaa8e9b2ed
commit 72368b446b
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,37 @@
From 0187296a18d2e30f5f30fab4528e42de42f7692a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Wed, 23 Jun 2010 18:31:25 +0100
Subject: [PATCH] Update pkg-config files for GTK+ 3.x
---
.../libnautilus-extension-uninstalled.pc.in | 2 +-
libnautilus-extension/libnautilus-extension.pc.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libnautilus-extension/libnautilus-extension-uninstalled.pc.in b/libnautilus-extension/libnautilus-extension-uninstalled.pc.in
index 77d93d3..f0bcdc1 100644
--- a/libnautilus-extension/libnautilus-extension-uninstalled.pc.in
+++ b/libnautilus-extension/libnautilus-extension-uninstalled.pc.in
@@ -7,6 +7,6 @@ extensiondir=@libdir@/nautilus/extensions-2.0
Name: libnautilus-extension
Description: A library to create Nautilus view extensions
Version: @VERSION@
-Requires: glib-2.0 gtk+-2.0
+Requires: glib-2.0 gtk+-3.0
Libs: ${pc_top_builddir}/${pcfiledir}/libnautilus-extension.la
Cflags: -I${pc_top_builddir}/${pcfiledir}/..
diff --git a/libnautilus-extension/libnautilus-extension.pc.in b/libnautilus-extension/libnautilus-extension.pc.in
index c46ff23..65f8e4b 100644
--- a/libnautilus-extension/libnautilus-extension.pc.in
+++ b/libnautilus-extension/libnautilus-extension.pc.in
@@ -7,6 +7,6 @@ extensiondir=@libdir@/nautilus/extensions-2.0
Name: libnautilus-extension
Description: A library to create Nautilus view extensions
Version: @VERSION@
-Requires: glib-2.0 gio-2.0 gtk+-2.0
+Requires: glib-2.0 gio-2.0 gtk+-3.0
Libs: -L${libdir} -lnautilus-extension
Cflags: -I${includedir}/nautilus
--
1.7.0.1

View File

@ -16,7 +16,7 @@
Name: nautilus Name: nautilus
Summary: File manager for GNOME Summary: File manager for GNOME
Version: 2.31.3 Version: 2.31.3
Release: 3.%{alphatag}%{?dist} Release: 4.%{alphatag}%{?dist}
License: GPLv2+ License: GPLv2+
Group: User Interface/Desktops Group: User Interface/Desktops
Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}-%{alphatag}.tar.gz Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}-%{alphatag}.tar.gz
@ -90,6 +90,7 @@ Patch17: nautilus-filetype-symlink-fix.patch
Patch18: 0001-build-link-against-gail-3.0-GNOME-bug-622155.patch Patch18: 0001-build-link-against-gail-3.0-GNOME-bug-622155.patch
Patch19: nautilus-gir-deps.patch Patch19: nautilus-gir-deps.patch
Patch20: 0001-Update-pkg-config-files-for-GTK-3.x.patch
%description %description
Nautilus is the file manager and graphical shell for the GNOME desktop Nautilus is the file manager and graphical shell for the GNOME desktop
@ -131,6 +132,7 @@ for developing nautilus extensions.
%patch17 -p0 -b .symlink %patch17 -p0 -b .symlink
%patch18 -p1 -b .gail %patch18 -p1 -b .gail
%patch19 -p1 -b .gir-deps %patch19 -p1 -b .gir-deps
%patch20 -p1 -b .pkg-config
%build %build
@ -269,6 +271,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%changelog %changelog
* Wed Jun 23 2010 Bastien Nocera <bnocera@redhat.com> 2.31.3-4.20100618git
- Fix libnautilus-extensions pkg-config files
* Wed Jun 23 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.3-3.20100618git * Wed Jun 23 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.3-3.20100618git
- Rebuild to get rid of mixed gtk deps - Rebuild to get rid of mixed gtk deps