From 3183bcac89f07a419ea005f06cdb743a0867dac6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Jul 08 2011 16:51:07 +0000 Subject: Update to 2.24.1; dropped the doctooldir patch --- diff --git a/.gitignore b/.gitignore index 3454c05..95dae7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /gtkmm-2.22.0.tar.bz2 /gtkmm-2.24.0.tar.bz2 +/gtkmm-2.24.1.tar.bz2 diff --git a/gtkmm-2.24.0-doctooldir.patch b/gtkmm-2.24.0-doctooldir.patch deleted file mode 100644 index 6c6d76a..0000000 --- a/gtkmm-2.24.0-doctooldir.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 8883144..4b11521 100644 --- a/gtkmm24.spec +++ b/gtkmm24.spec @@ -4,8 +4,8 @@ %global api_ver 2.4 Name: gtkmm24 -Version: 2.24.0 -Release: 4%{?dist} +Version: 2.24.1 +Release: 1%{?dist} Summary: C++ interface for GTK2 (a GUI library for X) @@ -13,7 +13,6 @@ 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 @@ -60,7 +59,6 @@ This package contains the full API documentation for %{name}. %prep %setup -q -n gtkmm-%{version} -%patch0 -p1 %build @@ -112,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/devhelp/ %changelog +* Thu Jul 07 2011 Kalev Lember - 2.24.1-1 +- Update to 2.24.1 +- Dropped the doctooldir patch + * Mon Jul 04 2011 Karsten Hopp 2.24.0-4 - buildrequire mm-common - fix pkg-config call to figure out doctooldir diff --git a/sources b/sources index 8333034..4bb5d08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d0413781fdb884e0ccba52844c94485f gtkmm-2.24.0.tar.bz2 +06d814b49295392b7d529ed89264dd29 gtkmm-2.24.1.tar.bz2