Hello community, here is the log from the commit of package xorg-x11-libs for openSUSE:Factory checked in at Tue Apr 13 21:14:58 CEST 2010. -------- --- xorg-x11-libs/xorg-x11-libs.changes 2010-04-06 01:56:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-libs/xorg-x11-libs.changes 2010-04-11 16:57:38.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 11 16:40:46 CEST 2010 - sndirsch@suse.de + +- libxtrap-pcfix.patch --> libXTrap-pcfix.diff +- specfile cleanup + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libxtrap-pcfix.patch New: ---- libXTrap-pcfix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libs.spec ++++++ --- /var/tmp/diff_new_pack.ds3SBs/_old 2010-04-13 21:14:38.000000000 +0200 +++ /var/tmp/diff_new_pack.ds3SBs/_new 2010-04-13 21:14:38.000000000 +0200 @@ -34,7 +34,7 @@ # Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 1 +Release: 2 License: GPLv2+ ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Libraries @@ -73,7 +73,7 @@ Patch2: libXft-2.1.7-lcd-filter-2.patch Patch5: libxkbui.diff Patch10: libXxf86misc-xcb.diff -Patch21: libxtrap-pcfix.patch +Patch21: libXTrap-pcfix.diff %description This package contains the remaining X.Org libraries. @@ -219,9 +219,7 @@ %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 %patch2 -p1 -%endif popd pushd libxkbui-* %patch5 @@ -234,35 +232,30 @@ popd %build -for dir in xbitmaps-* $(ls | grep -v -e xbitmaps); do +for dir in $(ls); do pushd $dir - option=""; echo $dir | grep -q libXvMC && option="--sysconfdir=/etc" case $dir in - *) - echo $dir | grep -q -E "libvnc|libXcliplist" && autoreconf -fi + libXvMC-*) option="--sysconfdir=/etc" ;; + libvnc*|libXcliplist*) autoreconf -fi ;; + *) ;; + esac export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure \ -%if %suse_version > 1110 --disable-static \ -%endif --with-pic --enable-type1 ${option} - ;; - esac %{__make} %{?jobs:-j%jobs} popd done %install -for dir in xbitmaps-* $(ls | grep -v xbitmap); do +for dir in $(ls); do pushd $dir make install DESTDIR=$RPM_BUILD_ROOT popd done /sbin/ldconfig -n $RPM_BUILD_ROOT/usr/%_lib mkdir -p $RPM_BUILD_ROOT/usr/include/X11/pixmaps/ -%if %suse_version > 1110 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la -%endif # already in libXext now (same version) rm $RPM_BUILD_ROOT/usr/include/X11/extensions/lbxbuf.h rm $RPM_BUILD_ROOT/usr/include/X11/extensions/lbxbufstr.h @@ -277,10 +270,6 @@ %postun -p /sbin/ldconfig -%pre -n xorg-x11-devel -test -L usr/include/X11 && rm usr/include/X11 -exit 0 - %post -n libpciaccess0 -p /sbin/ldconfig %postun -n libpciaccess0 -p /sbin/ldconfig @@ -308,13 +297,8 @@ /usr/include/xcb/ /usr/%{_lib}/*.so %exclude /usr/%{_lib}/libpciaccess.so -%if %suse_version <= 1110 -/usr/%{_lib}/*.a -/usr/%{_lib}/*.la -%endif /usr/%{_lib}/pkgconfig/*.pc %exclude /usr/%{_lib}/pkgconfig/pciaccess.pc -#/usr/share/aclocal/*.m4 %{_mandir}/man1/* %{_mandir}/man3/* %dir %{_datadir}/doc/libXvMC ++++++ libXTrap-pcfix.diff ++++++ Index: libXTrap-X11R7.0-1.0.0/xtrap.pc.in =================================================================== --- libXTrap-X11R7.0-1.0.0.orig/xtrap.pc.in +++ libXTrap-X11R7.0-1.0.0/xtrap.pc.in @@ -6,7 +6,6 @@ includedir=@includedir@ Name: XTrap Description: X Trap Library Version: @PACKAGE_VERSION@ -Requires: trapproto Requires.private: x11 xext xt Cflags: -I${includedir} Libs: -L${libdir} -lXTrap ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de