Fix FTBFS (RH #555429)
This commit is contained in:
parent
6c7413bbae
commit
efce7046aa
|
@ -6,7 +6,7 @@ diff -upNr compiz-0.8.4.orign/configure.ac compiz-0.8.4/configure.ac
|
||||||
|
|
||||||
KDE4_CFLAGS="-I$kde4incs"
|
KDE4_CFLAGS="-I$kde4incs"
|
||||||
- KDE4_LIBS="-L$kde4libs -lkdecore -lkdecorations -lplasma"
|
- KDE4_LIBS="-L$kde4libs -lkdecore -lkdecorations -lplasma"
|
||||||
+ KDE4_LIBS="-L$kde4libs -lkdecore -lkdecorations -lplasma -lX11 -lXext -ldl"
|
+ KDE4_LIBS="-L$kde4libs -lkdecore -lkdecorations -lplasma -lX11 -lXext -ldl -lkdeui"
|
||||||
|
|
||||||
QT4_MOC=`pkg-config QtGui --variable=moc_location`
|
QT4_MOC=`pkg-config QtGui --variable=moc_location`
|
||||||
QDBUSXML2CPP=`pkg-config QtGui --variable=exec_prefix`"/bin/qdbusxml2cpp"
|
QDBUSXML2CPP=`pkg-config QtGui --variable=exec_prefix`"/bin/qdbusxml2cpp"
|
||||||
|
|
|
@ -13,7 +13,7 @@ URL: http://www.go-compiz.org
|
||||||
License: GPLv2+ and LGPLv2+ and MIT
|
License: GPLv2+ and LGPLv2+ and MIT
|
||||||
Group: User Interface/Desktops
|
Group: User Interface/Desktops
|
||||||
Version: 0.8.4
|
Version: 0.8.4
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
|
|
||||||
Summary: OpenGL window and compositing manager
|
Summary: OpenGL window and compositing manager
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
@ -57,9 +57,9 @@ Patch106: redhat-logo.patch
|
||||||
Patch107: compiz-0.8.4-wall.patch
|
Patch107: compiz-0.8.4-wall.patch
|
||||||
#Patch110: scale-key.patch
|
#Patch110: scale-key.patch
|
||||||
|
|
||||||
|
|
||||||
Patch127: unknown-key.patch
|
Patch127: unknown-key.patch
|
||||||
Patch128: kde44-api.patch
|
Patch128: kde44-api.patch
|
||||||
|
Patch129: compiz-0.8.4-linkfix.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Compiz is one of the first OpenGL-accelerated compositing window
|
Compiz is one of the first OpenGL-accelerated compositing window
|
||||||
|
@ -129,6 +129,7 @@ and other kde integration related stuff.
|
||||||
%patch127 -p1 -b .unknown-key
|
%patch127 -p1 -b .unknown-key
|
||||||
# http://bugs.opencompositing.org/show_bug.cgi?id=1249
|
# http://bugs.opencompositing.org/show_bug.cgi?id=1249
|
||||||
%patch128 -p1 -b .kde44-api
|
%patch128 -p1 -b .kde44-api
|
||||||
|
%patch129 -p1 -b .linkfix
|
||||||
|
|
||||||
%build
|
%build
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
@ -307,6 +308,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 13 2010 Adel Gadllah <adel.gadllah@gmail.com> - 0.8.4-5
|
||||||
|
- Fix FTBFS (RH #555429)
|
||||||
|
|
||||||
* Mon Feb 08 2010 Leigh Scott <leigh123linux@googlemail.com> - 0.8.4-4
|
* Mon Feb 08 2010 Leigh Scott <leigh123linux@googlemail.com> - 0.8.4-4
|
||||||
- rebuilt for new kde api
|
- rebuilt for new kde api
|
||||||
- drop kde4_decorator_build patch
|
- drop kde4_decorator_build patch
|
||||||
|
|
Loading…
Reference in New Issue