- Fix leftover libcm-snapshot-date, buildrequire libXcomposite-devel >= 0.3

This commit is contained in:
sandmann 2006-04-03 15:55:46 +00:00
parent 7bb043136f
commit cd243ad2de

View File

@ -7,7 +7,7 @@
Summary: Metacity window manager Summary: Metacity window manager
Name: metacity Name: metacity
Version: %{metacity_version} Version: %{metacity_version}
Release: 1 Release: 2
URL: http://ftp.gnome.org/pub/gnome/sources/metacity/ URL: http://ftp.gnome.org/pub/gnome/sources/metacity/
Source0: metacity-%{metacity_version}.%{metacity_snapshot}.tar.gz Source0: metacity-%{metacity_version}.%{metacity_snapshot}.tar.gz
Source1: libcm-%{libcm_version}.tar.gz Source1: libcm-%{libcm_version}.tar.gz
@ -27,7 +27,7 @@ BuildRequires: xorg-x11-proto-devel >= 7.0-3
BuildRequires: libSM-devel, libGL-devel, libGLU-devel, libICE-devel, libX11-devel BuildRequires: libSM-devel, libGL-devel, libGLU-devel, libICE-devel, libX11-devel
BuildRequires: libXext-devel, libXinerama-devel, libXrandr-devel, libXrender-devel BuildRequires: libXext-devel, libXinerama-devel, libXrandr-devel, libXrender-devel
BuildRequires: libXcursor-devel, libXdamage-devel, libXtst-devel, libXfixes-devel, BuildRequires: libXcursor-devel, libXdamage-devel, libXtst-devel, libXfixes-devel,
BuildRequires: libXcomposite-devel BuildRequires: libXcomposite-devel >= 0.3
BuildRequires: mesa-libGL-devel >= 6.4.2-3 BuildRequires: mesa-libGL-devel >= 6.4.2-3
Requires: startup-notification >= 0.7 Requires: startup-notification >= 0.7
@ -64,7 +64,7 @@ LIBS="$LIBS -lX11 -lXext -lXinerama -lXrandr"
LIBS="$LIBS -lXrender -lXcursor" LIBS="$LIBS -lXrender -lXcursor"
LIBS="$LIBS -lXdamage -lXtst -lXfixes -lXcomposite" LIBS="$LIBS -lXdamage -lXtst -lXfixes -lXcomposite"
%ifnarch s390 s390x ppc64 %ifnarch s390 s390x ppc64
LIBS="$LIBS $PWD/libcm-%{libcm_version}.0.%{libcm_snapshot_date}/src/.libs/libcm.a" LIBS="$LIBS $PWD/libcm-%{libcm_version}/src/.libs/libcm.a"
%endif %endif
export LIBS export LIBS
@ -138,6 +138,9 @@ done
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Mon Apr 3 2006 Soren Sandmann <sandmann@redhat.com> - 2.15.0-2
- Fix leftover libcm-snapshot-date, buildrequire libXcomposite-devel >= 0.3
* Fri Mar 31 2006 Soren Sandmann <sandmann@redhat.com> - 2.15.0 * Fri Mar 31 2006 Soren Sandmann <sandmann@redhat.com> - 2.15.0
- Update to 2.15.0 - Update to 2.15.0