Hello community, here is the log from the commit of package xorg-x11-libs for openSUSE:Factory checked in at 2012-05-08 12:06:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-libs (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-libs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-libs", Maintainer is "sndirsch@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-libs/xorg-x11-libs.changes 2012-02-25 07:31:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-libs.new/xorg-x11-libs.changes 2012-05-08 12:06:33.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 19 10:05:33 UTC 2012 - vuntz@opensuse.org + +- Remove all tarballs and patches, since they're not used anymore + with the split packages. +- Stop making xorg-x11-devel have a Requires on xorg-x11-libs: both + are metapackages, so it's useless. +- Add a README.meta file to explain the goal of the compatibility + metapackages, and update their summaries and descriptions as + well. + +------------------------------------------------------------------- Old: ---- U_libXfont_LZW-decompress-fix-for-CVE-2011-2895.patch baselibs.conf libFS-1.0.3.tar.bz2 libWindowsWM-1.0.1.tar.bz2 libXScrnSaver-1.2.1.tar.bz2 libXTrap-X11R7.0-1.0.0.tar.bz2 libXaw-1.0.8.tar.bz2 libXcliplist-20070501.tar.bz2 libXcomposite-0.4.3.tar.bz2 libXcursor-1.1.11.tar.bz2 libXdamage-1.1.3.tar.bz2 libXevie-1.0.3.tar.bz2 libXfont-1.4.3.tar.bz2 libXfontcache-1.0.5.tar.bz2 libXft-2.1.7-lcd-filter-2.patch libXft-2.2.0.tar.bz2 libXinerama-1.1.1.tar.bz2 libXprintAppUtil-X11R7.0-1.0.1.tar.bz2 libXrandr-1.3.1.tar.bz2 libXres-1.0.5.tar.bz2 libXtst-1.2.0.tar.bz2 libXvMC-1.0.6.tar.bz2 libXxf86dga-1.1.2.tar.bz2 libXxf86misc-1.0.3.tar.bz2 libXxf86misc-xcb.diff libXxf86vm-1.1.1.tar.bz2 libdmx-1.1.1.tar.bz2 liblbxutil-1.1.0.tar.bz2 liboldX-X11R7.0-1.0.1.tar.bz2 libvnc-20070501.tar.bz2 libxkbui-X11R7.1-1.0.2.tar.bz2 libxkbui.diff xbitmaps-1.1.1.tar.bz2 xcb-util-0.3.8.tar.bz2 New: ---- README.meta ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libs.spec ++++++ --- /var/tmp/diff_new_pack.N816qv/_old 2012-05-08 12:06:35.000000000 +0200 +++ /var/tmp/diff_new_pack.N816qv/_new 2012-05-08 12:06:35.000000000 +0200 @@ -16,106 +16,28 @@ # -%define meta 1 - Name: xorg-x11-libs -BuildRequires: fdupes -BuildRequires: fontconfig-devel -BuildRequires: freetype2-devel -BuildRequires: gperf -BuildRequires: libXi6-devel -BuildRequires: libexpat-devel -BuildRequires: libtool -BuildRequires: libxslt -BuildRequires: pkgconfig -BuildRequires: xorg-x11-libICE-devel -BuildRequires: xorg-x11-libSM-devel -BuildRequires: xorg-x11-libX11-devel -BuildRequires: xorg-x11-libXau-devel -BuildRequires: xorg-x11-libXdmcp-devel -BuildRequires: xorg-x11-libXext-devel -BuildRequires: xorg-x11-libXfixes-devel -BuildRequires: xorg-x11-libXmu-devel -BuildRequires: xorg-x11-libXp-devel -BuildRequires: xorg-x11-libXpm-devel -BuildRequires: xorg-x11-libXprintUtil-devel -BuildRequires: xorg-x11-libXrender-devel -BuildRequires: xorg-x11-libXt-devel -BuildRequires: xorg-x11-libXv-devel -BuildRequires: xorg-x11-libfontenc-devel -BuildRequires: xorg-x11-libxkbfile-devel -BuildRequires: xorg-x11-proto-devel -BuildRequires: xorg-x11-util-devel -BuildRequires: xorg-x11-xtrans-devel -%if !%{meta} -%ifarch ppc64 s390x x86_64 -Provides: libXaw.so.6()(64bit) -Provides: libXaw.so.7()(64bit) -Provides: libXaw.so.8()(64bit) -Provides: libXaw6.so.6()(64bit) -Provides: libXaw7.so.7()(64bit) -Provides: libXaw8.so.8()(64bit) -%else -Provides: libXaw.so.6 -Provides: libXaw.so.7 -Provides: libXaw.so.8 -Provides: libXaw6.so.6 -Provides: libXaw7.so.7 -Provides: libXaw8.so.8 -%endif -%endif +Version: 7.6 +Release: 0 +Summary: Compatibility metapackage for X.Org libraries +License: GPL-2.0+ ; MIT +Group: System/Libraries +Url: http://xorg.freedesktop.org/ +Source0: README.meta # bug437293 %ifarch ppc64 Obsoletes: xorg-x11-libs-64bit %endif # -Url: http://xorg.freedesktop.org/ -Version: 7.6 -Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Summary: Remaining X.Org libraries -License: GPL-2.0+ ; MIT -Group: System/Libraries -Source1: libFS-1.0.3.tar.bz2 -Source2: libWindowsWM-1.0.1.tar.bz2 -Source3: libXScrnSaver-1.2.1.tar.bz2 -Source4: libXTrap-X11R7.0-1.0.0.tar.bz2 -Source5: libXaw-1.0.8.tar.bz2 -Source6: libXcomposite-0.4.3.tar.bz2 -Source7: libXcursor-1.1.11.tar.bz2 -Source8: libXdamage-1.1.3.tar.bz2 -Source9: libXevie-1.0.3.tar.bz2 -Source10: libXfont-1.4.3.tar.bz2 -Source11: libXfontcache-1.0.5.tar.bz2 -Source12: libXft-2.2.0.tar.bz2 -Source14: libXinerama-1.1.1.tar.bz2 -Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2 -Source16: libXrandr-1.3.1.tar.bz2 -Source17: libXtst-1.2.0.tar.bz2 -Source18: libXvMC-1.0.6.tar.bz2 -Source19: libXxf86dga-1.1.2.tar.bz2 -Source20: libXxf86misc-1.0.3.tar.bz2 -Source21: libXxf86vm-1.1.1.tar.bz2 -Source22: libdmx-1.1.1.tar.bz2 -Source23: liblbxutil-1.1.0.tar.bz2 -Source24: liboldX-X11R7.0-1.0.1.tar.bz2 -Source25: libxkbui-X11R7.1-1.0.2.tar.bz2 -Source26: xbitmaps-1.1.1.tar.bz2 -Source27: libXres-1.0.5.tar.bz2 -Source29: libvnc-20070501.tar.bz2 -Source30: libXcliplist-20070501.tar.bz2 -Source31: xcb-util-0.3.8.tar.bz2 -Source90: baselibs.conf -Patch2: libXft-2.1.7-lcd-filter-2.patch -Patch5: libxkbui.diff -Patch10: libXxf86misc-xcb.diff -Patch11: U_libXfont_LZW-decompress-fix-for-CVE-2011-2895.patch +BuildArch: noarch %description -This package contains the remaining X.Org libraries. +This package is a compatibility metapackage. It used to contain the +X.Org libraries. %package -n xorg-x11-devel -Summary: Include Files and Libraries mandatory for X11 Development +Summary: Compatibility metapackage for X.Org development libraries Group: Development/Libraries/X11 Provides: XFree86-devel Provides: xorg-x11-compat70-devel @@ -126,7 +48,6 @@ %ifarch ppc64 Obsoletes: xorg-x11-devel-64bit %endif -Requires: %{name} = %{version} Requires: Mesa-libEGL-devel Requires: Mesa-libGL-devel Requires: fontconfig-devel @@ -194,121 +115,23 @@ Requires: xorg-x11-xtrans-devel %description -n xorg-x11-devel -This package contains all necessary include files and libraries needed -to develop X11 applications that require these. +This package is a compatibility metapackage. It used to contain the +X.Org development libraries. %prep -%setup -q -T -c %{name} -%if !%{meta} -for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done -pushd libXft-*/src -%patch2 -p1 -popd -pushd libxkbui-* -%patch5 -popd -pushd libXxf86misc-* -%patch10 -p0 -popd -pushd libXfont-* -%patch11 -p1 -popd -%else -touch meta -%endif +%setup -T -c +cp %{SOURCE0} . %build -%if !%{meta} -for dir in $(ls); do - pushd $dir - case $dir in - libXvMC-*) option="--sysconfdir=/etc" ;; - libvnc*|libXcliplist*) autoreconf -fi ;; - *) ;; - esac - autoreconf -fiv - export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - %configure --disable-silent-rules \ - --disable-static \ - --with-pic --enable-type1 ${option} - %{__make} %{?_smp_mflags} - popd -done -%endif %install -%if !%{meta} -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 -# for compatibility reasons -ln -s libXaw7.so.7 $RPM_BUILD_ROOT/%{_libdir}/libXaw8.so.8 -ln -s libXaw.so.7 $RPM_BUILD_ROOT/%{_libdir}/libXaw.so.8 -# create fake libxcb-* libs being replaced now by libxcb-util (bnc #741465 -# and reported by others) -for ext_version in atom:1 aux:0 event:1 icccm:1 image:0 keysyms:1 property:1 render-util:0 reply:1; do - ext=${ext_version%:*} - version=${ext_version#*:} - > xcb-${ext}.c - gcc -Wall -ansi -pedantic -c xcb-${ext}.c -fPIC - gcc -shared -Wl,-soname,libxcb-${ext}.so.${version} \ - -Wl,-L$RPM_BUILD_ROOT%{_libdir},--no-as-needed,-lxcb-util \ - -o $RPM_BUILD_ROOT%{_libdir}/libxcb-${ext}.so.${version} xcb-${ext}.o -done -%if %suse_version > 1110 -%{__rm} -f %{buildroot}%{_libdir}/*.la -%endif -%fdupes -s $RPM_BUILD_ROOT/%_mandir -%endif - -%clean -rm -rf "$RPM_BUILD_ROOT" - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig %files %defattr(-,root,root) -%if %{meta} -%doc meta -%else -/usr/include/X11/bitmaps/ -/usr/include/X11/pixmaps/ -/usr/%{_lib}/*.so.* -%endif +%doc README.meta %files -n xorg-x11-devel %defattr(-,root,root) -%if %{meta} -%doc meta -%else -%doc /usr/share/doc/* -/usr/include/X11/*.h -/usr/include/X11/Xaw/ -/usr/include/X11/Xcursor/ -/usr/include/X11/Xft/ -/usr/include/X11/XprintAppUtil/ -/usr/include/X11/extensions/*.h -/usr/include/X11/fonts/*.h -/usr/include/xcb/ -/usr/%{_lib}/*.so -%if %suse_version <= 1110 -/usr/%{_lib}/*.la -%endif -/usr/%{_lib}/pkgconfig/*.pc -%{_datadir}/pkgconfig/*.pc -%{_mandir}/man3/* -%doc %{_datadir}/doc/libXvMC/ -%doc %{_datadir}/doc/libXaw/ -%doc %{_datadir}/doc/libFS/ -%endif +%doc README.meta %changelog ++++++ README.meta ++++++ This package is a metapackage, created for compatibility. The X.Org libraries now are all split following the shared library packaging policy, and all have their own devel package. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org