summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Hopp <karsten@redhat.com>2011-07-04 13:57:40 (GMT)
committerKarsten Hopp <karsten@redhat.com>2011-07-04 13:57:40 (GMT)
commit1da1c735f3f2f2aba047f497edfe8c5b6717fc7d (patch)
tree9f972098c90766bff311694420ab939230c388ba
parent314ca201f93283b91d296b277f5f5bac3d3730ea (diff)
downloadgtkmm24-1da1c73.zip
gtkmm24-1da1c73.tar.gz
gtkmm24-1da1c73.tar.xz
buildrequire mm-common
fix pkg-config call to figure out doctooldir
-rw-r--r--gtkmm-2.24.0-doctooldir.patch24
-rw-r--r--gtkmm24.spec9
2 files changed, 32 insertions, 1 deletions
diff --git a/gtkmm-2.24.0-doctooldir.patch b/gtkmm-2.24.0-doctooldir.patch
new file mode 100644
index 0000000..6c6d76a
--- /dev/null
+++ b/gtkmm-2.24.0-doctooldir.patch
@@ -0,0 +1,24 @@
+diff -up gtkmm-2.24.0/aclocal.m4.doctooldir gtkmm-2.24.0/aclocal.m4
+--- gtkmm-2.24.0/aclocal.m4.doctooldir 2011-07-04 15:35:58.750733498 +0200
++++ gtkmm-2.24.0/aclocal.m4 2011-07-04 15:37:20.572733508 +0200
+@@ -1199,7 +1199,7 @@ dnl
+ AC_MSG_CHECKING([location of documentation utilities])
+ AS_IF([test "x$MMDOCTOOLDIR" = x],
+ [
+- MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir glibmm-2.4 2>&AS_MESSAGE_LOG_FD`
++ MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir mm-common-util 2>&AS_MESSAGE_LOG_FD`
+ AS_IF([test "[$]?" -ne 0],
+ [AC_MSG_ERROR([[not found
+ The required module glibmm could not be found on this system. If you
+diff -up gtkmm-2.24.0/configure.doctooldir gtkmm-2.24.0/configure
+--- gtkmm-2.24.0/configure.doctooldir 2011-07-04 15:35:57.007733498 +0200
++++ gtkmm-2.24.0/configure 2011-07-04 15:37:02.407733507 +0200
+@@ -15303,7 +15303,7 @@ fi
+ $as_echo_n "checking location of documentation utilities... " >&6; }
+ if test "x$MMDOCTOOLDIR" = x; then :
+
+- MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir glibmm-2.4 2>&5`
++ MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir mm-common-util 2>&5`
+ if test "$?" -ne 0; then :
+ as_fn_error $? "not found
+ The required module glibmm could not be found on this system. If you
diff --git a/gtkmm24.spec b/gtkmm24.spec
index 203f33a..8883144 100644
--- a/gtkmm24.spec
+++ b/gtkmm24.spec
@@ -5,7 +5,7 @@
Name: gtkmm24
Version: 2.24.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: C++ interface for GTK2 (a GUI library for X)
@@ -13,6 +13,7 @@ Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.gtkmm.org/
Source0: http://ftp.gnome.org/pub/GNOME/sources/gtkmm/%{release_version}/gtkmm-%{version}.tar.bz2
+Patch0: gtkmm-2.24.0-doctooldir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glibmm24-devel >= 2.24
@@ -20,6 +21,7 @@ BuildRequires: atkmm-devel >= 2.22
BuildRequires: gtk2-devel >= 2.24
BuildRequires: cairomm-devel >= 1.2.2
BuildRequires: pangomm-devel >= 2.26
+BuildRequires: mm-common >= 0.9.5-1
%description
@@ -58,6 +60,7 @@ This package contains the full API documentation for %{name}.
%prep
%setup -q -n gtkmm-%{version}
+%patch0 -p1
%build
@@ -109,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_datadir}/devhelp/
%changelog
+* Mon Jul 04 2011 Karsten Hopp <karsten@redhat.com> 2.24.0-4
+- buildrequire mm-common
+- fix pkg-config call to figure out doctooldir
+
* Wed Mar 02 2011 Kalev Lember <kalev@smartlink.ee> - 2.24.0-3
- Co-own /usr/share/devhelp/ directory
- Require base package from -doc subpackage