OBS User unknown 2009-04-23 18:18:34 +00:00 committed by Git OBS Bridge
parent 5b4562a313
commit 0fb4a221ea
4 changed files with 25 additions and 18 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7125db8466ae8c27309c7b53c9df8d6b905bd9b0e50653a33111431aaad9c261
size 271220

3
xcb-util-0.3.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eeb723e9be5fa1e6d9c5cf223731d43a9589b4d727b11c2d310bd6157f408d26
size 260359

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Apr 21 21:36:01 CEST 2009 - crrodriguez@suse.de
- remove static libraries and "la" files
-------------------------------------------------------------------
Thu Apr 16 00:57:41 CEST 2009 - sndirsch@suse.de
- xcb-util 0.3.4
-------------------------------------------------------------------
Tue Mar 10 03:10:45 CET 2009 - sndirsch@suse.de

View File

@ -32,7 +32,7 @@ Obsoletes: xorg-x11-libs-64bit
#
Url: http://xorg.freedesktop.org/
Version: 7.4
Release: 17
Release: 18
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@ -68,7 +68,7 @@ Source27: libXres-1.0.3.tar.bz2
Source28: libXft1-X11R6.9-1.2.tar.bz2
Source29: libvnc-20070501.tar.bz2
Source30: libXcliplist-20070501.tar.bz2
Source31: xcb-util-0.3.3.tar.bz2
Source31: xcb-util-0.3.4.tar.bz2
Source33: libpciaccess-0.10.5.tar.bz2
Patch2: libXft-2.1.7-lcd-filter-2.patch
Patch3: p_xft_cjk.diff
@ -108,7 +108,7 @@ Summary: Include Files and Libraries mandatory for X11 Development
Group: Development/Libraries/X11
Provides: xorg-x11-compat70-devel xorg-x11-man XFree86-devel
Obsoletes: xorg-x11-compat70-devel xorg-x11-man
Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXrender-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXt-devel xorg-x11-libXmu-devel xorg-x11-libXfixes-devel xorg-x11-libxkbfile-devel freetype2-devel fontconfig-devel xorg-x11-libs xorg-x11-util-devel xorg-x11-libfontenc-devel xorg-x11-libXv-devel xorg-x11-libXprintUtil-devel xorg-x11-fonts-devel pkgconfig
Requires: xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXrender-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXt-devel xorg-x11-libXmu-devel xorg-x11-libXfixes-devel xorg-x11-libxkbfile-devel freetype2-devel fontconfig-devel %{name} = %{version} xorg-x11-util-devel xorg-x11-libfontenc-devel xorg-x11-libXv-devel xorg-x11-libXprintUtil-devel xorg-x11-fonts-devel pkgconfig
Requires: xorg-x11-libxcb-devel
Requires: libpciaccess0-devel libpixman-1-0-devel
AutoReqProv: on
@ -216,7 +216,7 @@ Authors:
Susan Angebrandt
%prep
%setup -T -c %{name}
%setup -q -T -c %{name}
for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
pushd libXft-*/src
%if %suse_version > 1010
@ -241,14 +241,11 @@ for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
;;
*)
echo $dir | grep -q -E "libvnc|libXcliplist" && autoreconf -fi
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
--enable-type1 \
--prefix=/usr \
--libdir=%{_libdir} \
--mandir=%{_mandir} ${option}
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%configure --disable-static --with-pic --enable-type1 ${option}
;;
esac
make
%{__make} %{?jobs:-j%jobs}
popd
done
@ -261,7 +258,7 @@ done
/sbin/ldconfig -n $RPM_BUILD_ROOT/usr/%_lib
mkdir -p $RPM_BUILD_ROOT/usr/include/X11/pixmaps/
%if %suse_version > 1100
rm $RPM_BUILD_ROOT/%{_libdir}/libXft.{a,la}
rm $RPM_BUILD_ROOT/%{_libdir}/*.la
%endif
%clean
@ -299,9 +296,6 @@ exit 0
/usr/include/X11/extensions/*.h
/usr/include/X11/fonts/*.h
/usr/include/xcb/
/usr/%{_lib}/*.a
/usr/%{_lib}/*.la
%exclude /usr/%{_lib}/libpciaccess.*a
/usr/%{_lib}/*.so
%exclude /usr/%{_lib}/libpciaccess.so.0*
/usr/%{_lib}/pkgconfig/*.pc
@ -316,10 +310,13 @@ exit 0
%files -n libpciaccess0-devel
%defattr(-,root,root)
/usr/include/pciaccess.h
/usr/%{_lib}/libpciaccess.*a
/usr/%{_lib}/libpciaccess.so
%changelog
* Tue Apr 21 2009 crrodriguez@suse.de
- remove static libraries and "la" files
* Thu Apr 16 2009 sndirsch@suse.de
- xcb-util 0.3.4
* Tue Mar 10 2009 sndirsch@suse.de
- libXrandr 1.3.0
- obsoletes libXrandr-70d641c.diff