[gconfmm26] upstream 2.28.3 fix documentation build

Haïkel Guémar hguemar at fedoraproject.org
Sat Oct 22 10:07:17 UTC 2011


commit c72390b92f2c3ed9974ee52d4882d1db0abed680
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Sat Oct 22 12:07:08 2011 +0200

    upstream 2.28.3
    fix documentation build

 .gitignore     |    1 +
 gconfmm26.spec |   21 +++++++--------------
 sources        |    2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7d8a812..c72ef52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gconfmm-2.28.0.tar.bz2
 /gconfmm-2.28.2.tar.bz2
+/gconfmm-2.28.3.tar.bz2
diff --git a/gconfmm26.spec b/gconfmm26.spec
index 1013a96..33e99c8 100644
--- a/gconfmm26.spec
+++ b/gconfmm26.spec
@@ -1,6 +1,6 @@
 Name:           gconfmm26
-Version:        2.28.2
-Release:        3%{?dist}
+Version:        2.28.3
+Release:        1%{?dist}
 
 Summary:        C++ wrapper for GConf2
 
@@ -8,8 +8,6 @@ Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.gtkmm.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.28/gconfmm-%{version}.tar.bz2
-# https://bugzilla.gnome.org/show_bug.cgi?id=648860
-Patch0:         gconfmm26-2.28.2-ftbfs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/ldconfig
@@ -40,7 +38,6 @@ interface to the GTK+.
 
 %prep
 %setup -q -n gconfmm-%{version}
-%patch0 -p1 -b .ftbfs
 # convert README file to UTF-8 
 iconv --from=ISO-8859-1 --to=UTF-8  README > README.new && \
 touch -r README README.new && \
@@ -56,14 +53,6 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-# install documentation
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books/gconfmm-2.6
-cp docs/reference/gconfmm-2.6.devhelp2 $RPM_BUILD_ROOT%{_datadir}/devhelp/books/gconfmm-2.6
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/gconfmm-2.6/reference/
-for i in html gconfmm-2.6.tag
-do
-    cp -r docs/reference/$i $RPM_BUILD_ROOT%{_datadir}/doc/gconfmm-2.6/reference/
-done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -77,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS ChangeLog COPYING NEWS README INSTALL
+%doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/*.so.*
 
 %files devel
@@ -90,6 +79,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/doc/gconfmm-2.6/reference/*
 
 %changelog
+* Sat Oct 22 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 2.28.3-1
+- upstream 2.28.3
+- fix documentation build with glibmm 2.28+
+
 * Tue Oct 18 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 2.28.2-3
 - fix FTBFS (patch from kalev)
 
diff --git a/sources b/sources
index 5bc3612..86a7e5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cca6d249ab766895e1a180b7a4775733  gconfmm-2.28.2.tar.bz2
+ebcf96373cb0c71bc4cfad0e6da83779  gconfmm-2.28.3.tar.bz2


More information about the scm-commits mailing list