[mingw-glibmm24: 32/40] Drop hacks for sed'ing headers
epienbro
epienbro at fedoraproject.org
Wed Mar 7 17:16:35 UTC 2012
commit 74d710faf38f0fcf2f861c0a8e4e424828c14624
Author: Kalev Lember <kalevlember at gmail.com>
Date: Fri Sep 30 19:50:37 2011 +0300
Drop hacks for sed'ing headers
This is now in upstream; unless I remember wrong, it's fixed by my
patches from this bug:
https://bugzilla.gnome.org/show_bug.cgi?id=649182
mingw32-glibmm24.spec | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
---
diff --git a/mingw32-glibmm24.spec b/mingw32-glibmm24.spec
index d3c839d..ac06564 100644
--- a/mingw32-glibmm24.spec
+++ b/mingw32-glibmm24.spec
@@ -39,11 +39,6 @@ freely combined to quickly create complex user interfaces.
%build
%{_mingw32_configure} --disable-static
-# rebuild wrap_init.cc
-pushd gio/src
-rm ../giomm/wrap_init.cc
-make ../giomm/wrap_init.cc
-popd
make %{?_smp_mflags}
@@ -54,11 +49,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
rm -r $RPM_BUILD_ROOT%{_mingw32_docdir}/glibmm-2.4
rm -r $RPM_BUILD_ROOT%{_mingw32_datadir}/devhelp
-# hack: desktopappinfo is not available on win32
-sed -i -e "s,#include <giomm/desktopappinfo.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/giomm-2.4/giomm.h
-sed -i -e "s,#include <giomm/unixinputstream.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/giomm-2.4/giomm.h
-sed -i -e "s,#include <giomm/unixoutputstream.h>,," $RPM_BUILD_ROOT/%{_mingw32_includedir}/giomm-2.4/giomm.h
-
%files
%doc COPYING COPYING.tools
@@ -84,6 +74,7 @@ sed -i -e "s,#include <giomm/unixoutputstream.h>,," $RPM_BUILD_ROOT/%{_mingw32_i
- Update to 2.30.0
- Use automatic mingw dep extraction
- Clean up the spec file for recent rpmbuild
+- Drop hacks for sed'ing headers; this is now in upstream
* Wed Jul 06 2011 Kalev Lember <kalevlember at gmail.com> - 2.28.1-2
- Rebuilt against win-iconv
More information about the scm-commits
mailing list