SPECS: dbus.spec - added gcj patch (fixes java build), pass GCJFLA...
qboosh
qboosh at pld-linux.org
Mon Jan 23 22:10:34 CET 2006
Author: qboosh Date: Mon Jan 23 21:10:34 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added gcj patch (fixes java build), pass GCJFLAGS (=rpmcflags)
- updated DBUS_QT_LIBS->DBUS_QT3_LIBS hack
---- Files affected:
SPECS:
dbus.spec (1.115 -> 1.116)
---- Diffs:
================================================================
Index: SPECS/dbus.spec
diff -u SPECS/dbus.spec:1.115 SPECS/dbus.spec:1.116
--- SPECS/dbus.spec:1.115 Fri Jan 20 12:59:33 2006
+++ SPECS/dbus.spec Mon Jan 23 22:10:28 2006
@@ -42,6 +42,7 @@
Patch2: %{name}-mint.patch
Patch3: %{name}-python_fixes.patch
Patch4: %{name}-monodir.patch
+Patch5: %{name}-gcj.patch
URL: http://www.freedesktop.org/Software/dbus
BuildRequires: XFree86-devel
BuildRequires: autoconf >= 2.52
@@ -335,8 +336,8 @@
%patch2 -p0
%patch3 -p1
%patch4 -p1
-sed -i 's:JAR.*=.*jar:JAR=fastjar:g' gcj/Makefile.{am,in}
-sed -i -e 's/DBUS_QT_LIBS=.*/DBUS_QT_LIBS="-lqt-mt"/' configure.in
+%patch5 -p1
+sed -i -e 's/DBUS_QT3_LIBS=.*/DBUS_QT3_LIBS="-lqt-mt"/' configure.in
%build
%{__libtoolize}
@@ -345,6 +346,7 @@
%{__autoheader}
%{__automake}
%configure \
+ GCJFLAGS="%{rpmcflags}" \
QTDIR=/usr \
%{?debug:--enable-verbose-mode} \
%{?with_dotnet:--enable-mono} \
@@ -550,7 +552,7 @@
%if %{with python}
%files -n python-dbus
%defattr(644,root,root,755)
-%dir %{py_sitedir}/%{name}/
+%dir %{py_sitedir}/%{name}
%attr(755,root,root) %{py_sitedir}/%{name}/*.so
%{py_sitedir}/dbus.pth
%{py_sitedir}/%{name}/*.py[co]
@@ -562,6 +564,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.116 2006/01/23 21:10:28 qboosh
+- added gcj patch (fixes java build), pass GCJFLAGS (=rpmcflags)
+- updated DBUS_QT_LIBS->DBUS_QT3_LIBS hack
+
Revision 1.115 2006/01/20 11:59:33 freetz
- fix dotnet build
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/dbus.spec?r1=1.115&r2=1.116&f=u
More information about the pld-cvs-commit
mailing list