This commit is contained in:
parent
6e046a6220
commit
99b7a59abb
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:1608411ed3909c4617ef29a02efff4668d14a1cd3da2a1545912cd3b1dd4fb04
|
|
||||||
size 31970
|
|
@ -1,3 +1,15 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 8 20:53:21 CEST 2009 - sndirsch@suse.de
|
||||||
|
|
||||||
|
- drop libXft1, since it's no longer required by current versions
|
||||||
|
of Intel's Debugger (bnc #198432)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Jun 7 11:07:02 CEST 2009 - sndirsch@suse.de
|
||||||
|
|
||||||
|
- force removal of .la files on openSUSE > 11.1 (fixes build on
|
||||||
|
IA64)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jun 5 12:58:51 CEST 2009 - eich@suse.de
|
Fri Jun 5 12:58:51 CEST 2009 - eich@suse.de
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ Obsoletes: xorg-x11-libs-64bit
|
|||||||
#
|
#
|
||||||
Url: http://xorg.freedesktop.org/
|
Url: http://xorg.freedesktop.org/
|
||||||
Version: 7.4
|
Version: 7.4
|
||||||
Release: 21
|
Release: 22
|
||||||
License: GPL v2 or later; X11/MIT
|
License: GPL v2 or later; X11/MIT
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
@ -65,7 +65,6 @@ Source24: liboldX-X11R7.0-1.0.1.tar.bz2
|
|||||||
Source25: libxkbui-X11R7.1-1.0.2.tar.bz2
|
Source25: libxkbui-X11R7.1-1.0.2.tar.bz2
|
||||||
Source26: xbitmaps-X11R7.0-1.0.1.tar.bz2
|
Source26: xbitmaps-X11R7.0-1.0.1.tar.bz2
|
||||||
Source27: libXres-1.0.3.tar.bz2
|
Source27: libXres-1.0.3.tar.bz2
|
||||||
Source28: libXft1-X11R6.9-1.2.tar.bz2
|
|
||||||
Source29: libvnc-20070501.tar.bz2
|
Source29: libvnc-20070501.tar.bz2
|
||||||
Source30: libXcliplist-20070501.tar.bz2
|
Source30: libXcliplist-20070501.tar.bz2
|
||||||
Source31: xcb-util-0.3.5.tar.bz2
|
Source31: xcb-util-0.3.5.tar.bz2
|
||||||
@ -244,13 +243,10 @@ pushd libXTrap-*
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
%build
|
%build
|
||||||
for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
|
for dir in xbitmaps-* $(ls | grep -v -e xbitmaps); do
|
||||||
pushd $dir
|
pushd $dir
|
||||||
option=""; echo $dir | grep -q libXvMC && option="--sysconfdir=/etc"
|
option=""; echo $dir | grep -q libXvMC && option="--sysconfdir=/etc"
|
||||||
case $dir in
|
case $dir in
|
||||||
libXft1-*)
|
|
||||||
xmkmf -a
|
|
||||||
;;
|
|
||||||
*)
|
*)
|
||||||
echo $dir | grep -q -E "libvnc|libXcliplist" && autoreconf -fi
|
echo $dir | grep -q -E "libvnc|libXcliplist" && autoreconf -fi
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||||
@ -274,7 +270,7 @@ done
|
|||||||
/sbin/ldconfig -n $RPM_BUILD_ROOT/usr/%_lib
|
/sbin/ldconfig -n $RPM_BUILD_ROOT/usr/%_lib
|
||||||
mkdir -p $RPM_BUILD_ROOT/usr/include/X11/pixmaps/
|
mkdir -p $RPM_BUILD_ROOT/usr/include/X11/pixmaps/
|
||||||
%if %suse_version > 1110
|
%if %suse_version > 1110
|
||||||
rm $RPM_BUILD_ROOT/%{_libdir}/*.la
|
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
@ -333,6 +329,12 @@ exit 0
|
|||||||
/usr/%{_lib}/libpciaccess.so
|
/usr/%{_lib}/libpciaccess.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 08 2009 sndirsch@suse.de
|
||||||
|
- drop libXft1, since it's no longer required by current versions
|
||||||
|
of Intel's Debugger (bnc #198432)
|
||||||
|
* Sun Jun 07 2009 sndirsch@suse.de
|
||||||
|
- force removal of .la files on openSUSE > 11.1 (fixes build on
|
||||||
|
IA64)
|
||||||
* Fri Jun 05 2009 eich@suse.de
|
* Fri Jun 05 2009 eich@suse.de
|
||||||
- Add patches from Moblin:
|
- Add patches from Moblin:
|
||||||
* libXft:
|
* libXft:
|
||||||
|
Loading…
Reference in New Issue
Block a user