[glibmm24/f15] Install doc-install.pl so that older mm modules can find it (#740790)
Kalev Lember
kalev at fedoraproject.org
Tue Oct 18 15:08:28 UTC 2011
commit 83c4fcb193a93ddab3b8ddc22669ec4e4f202a6f
Author: Kalev Lember <kalevlember at gmail.com>
Date: Tue Oct 18 18:06:32 2011 +0300
Install doc-install.pl so that older mm modules can find it (#740790)
Requested by the ARM people. Instead of backporting fixes to various
modules that are looking for doc-install.pl in the wrong place
(gconfmm26, goocanvasmmm, gtkmm24, libvtemm), just ship it in glibmm24
as a temporary workaround in F15.
https://bugzilla.redhat.com/show_bug.cgi?id=740790
glibmm24.spec | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/glibmm24.spec b/glibmm24.spec
index 6488c9c..0c1e177 100644
--- a/glibmm24.spec
+++ b/glibmm24.spec
@@ -5,7 +5,7 @@
Name: glibmm24
Version: 2.28.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: C++ interface for the GLib library
Group: System Environment/Libraries
@@ -63,6 +63,11 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+# Install doc-install.pl so that older mm modules can find it
+# https://bugzilla.redhat.com/show_bug.cgi?id=740790
+install -Dpm 755 docs/doc-install.pl \
+ $RPM_BUILD_ROOT%{_datadir}/glibmm-2.4/doctool/doc-install.pl
+
rm -rf tools
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -91,6 +96,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/giomm-2.4/
%{_libdir}/pkgconfig/*.pc
%{_datadir}/aclocal/*.m4
+%{_datadir}/glibmm-2.4/
%files doc
%defattr(-,root,root,-)
@@ -99,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 18 2011 Kalev Lember <kalevlember at gmail.com> - 2.28.1-2
+- Install doc-install.pl so that older mm modules can find it (#740790)
+
* Mon May 09 2011 Kalev Lember <kalev at smartlink.ee> - 2.28.1-1
- Update to 2.28.1
More information about the scm-commits
mailing list