Accepting request 80478 from X11:XOrg

- split off libpciaccess to avoid build cycles; latest intel driver
  now buildrequires libpciaccess

- Don't delete .la files for SLE11-SP1

OBS-URL: https://build.opensuse.org/request/show/80478
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-libs?expand=0&rev=105

libpciaccess-0.12.0.tar.bz2

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

xorg-x11-libs.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Aug 30 13:04:47 UTC 2011 - sndirsch@suse.com
+
+- split off libpciaccess to avoid build cycles; latest intel driver
+  now buildrequires libpciaccess
+
+-------------------------------------------------------------------
+Mon Jun 20 16:29:40 UTC 2011 - mhopf@novell.com
+
+- Don't delete .la files for SLE11-SP1
+
 -------------------------------------------------------------------
 Tue May 31 09:12:57 UTC 2011 - eich@suse.de
 

xorg-x11-libs.spec

@@ -68,7 +68,6 @@ Source27:       libXres-1.0.5.tar.bz2
 Source29:       libvnc-20070501.tar.bz2
 Source30:       libXcliplist-20070501.tar.bz2
 Source31:       xcb-util-0.3.6.tar.bz2
-Source33:       libpciaccess-0.12.0.tar.bz2
 Source90:       baselibs.conf
 Patch2:         libXft-2.1.7-lcd-filter-2.patch
 Patch5:         libxkbui.diff
@@ -123,75 +122,6 @@ to develop X11 applications that require these.
 
 
 
-Authors:
---------
-    
-    Apple Computer Corporation
-    Dave Lemke
-    David Dawes
-    Derek Wang
-    Frank Giessler
-    Jim Gettys
-    Juliusz Chroboczek
-    Jungshik Shin
-    Keith Packard
-    Kensuke Matsuzaki
-    Marc La France
-    Mark Leisher
-    Noah Levitt
-    Phil Karlton
-    Ralf Habacker
-    Shunsuke Akiyama
-    Suhaib Siddiqi
-    Susan Angebrandt
-
-%package -n libpciaccess0
-License:        MIT License (or similar)
-Summary:        pciaccess library
-Group:          System/Libraries
-Provides:       xorg-x11-libs:/usr/X11R6/%{_lib}/usr/lib64/libpciaccess.so.0
-AutoReqProv:    on
-
-%description -n libpciaccess0
-pciaccess library.
-
-
-
-Authors:
---------
-    
-    Apple Computer Corporation
-    Dave Lemke
-    David Dawes
-    Derek Wang
-    Frank Giessler
-    Jim Gettys
-    Juliusz Chroboczek
-    Jungshik Shin
-    Keith Packard
-    Kensuke Matsuzaki
-    Marc La France
-    Mark Leisher
-    Noah Levitt
-    Phil Karlton
-    Ralf Habacker
-    Shunsuke Akiyama
-    Suhaib Siddiqi
-    Susan Angebrandt
-
-%package -n libpciaccess0-devel
-License:        MIT License (or similar)
-Summary:        Include Files and Libraries mandatory for X11 Development
-Group:          Development/Libraries/X11
-Provides:       xorg-x11-devel:/usr/X11R6/%{_lib}/usr/lib64/libpciaccess.so
-Requires:       libpciaccess0
-
-%description -n libpciaccess0-devel
-This package contains all necessary include files and libraries needed
-to develop X11 applications that require these.
-
-
-
 Authors:
 --------
     
@@ -233,7 +163,6 @@ for dir in $(ls); do
     case $dir in
       libXvMC-*) option="--sysconfdir=/etc" ;;
       libvnc*|libXcliplist*) autoreconf -fi ;;
-      libpciaccess-*) option="--with-pciids-path=/usr/share/" ;;
       *) ;;
     esac
     autoreconf -fiv
@@ -253,7 +182,9 @@ for dir in $(ls); do
 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
@@ -266,22 +197,15 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %postun -p /sbin/ldconfig
 
-%post -n libpciaccess0 -p /sbin/ldconfig
-
-%postun -n libpciaccess0 -p /sbin/ldconfig
-
 %files
 %defattr(-,root,root)
 /usr/include/X11/bitmaps/
 /usr/include/X11/pixmaps/
 /usr/%{_lib}/*.so.*
-%exclude /usr/%{_lib}/libpciaccess.so.0*
 
 %files -n xorg-x11-devel
 %defattr(-,root,root)
 %doc /usr/share/doc/*
-/usr/include/*.h
-%exclude /usr/include/pciaccess.h
 /usr/include/X11/*.h
 /usr/include/X11/Xaw/
 /usr/include/X11/Xcursor/
@@ -291,23 +215,14 @@ rm -rf "$RPM_BUILD_ROOT"
 /usr/include/X11/fonts/*.h
 /usr/include/xcb/
 /usr/%{_lib}/*.so
-%exclude /usr/%{_lib}/libpciaccess.so
+%if %suse_version <= 1110
+/usr/%{_lib}/*.la
+%endif
 /usr/%{_lib}/pkgconfig/*.pc
-%exclude /usr/%{_lib}/pkgconfig/pciaccess.pc
 %{_datadir}/pkgconfig/*.pc
 %{_mandir}/man3/*
 %doc %{_datadir}/doc/libXvMC/
 %doc %{_datadir}/doc/libXaw/
 %doc %{_datadir}/doc/libFS/
 
-%files -n libpciaccess0
-%defattr(-,root,root)
-/usr/%{_lib}/libpciaccess.so.0*
-
-%files -n libpciaccess0-devel
-%defattr(-,root,root)
-/usr/include/pciaccess.h
-/usr/%{_lib}/libpciaccess.so
-/usr/%{_lib}/pkgconfig/pciaccess.pc
-
 %changelog