- libxcb 1.3
- List DSO versions explicitly. - Don't package any xprint bits. Seriously, no.
This commit is contained in:
parent
4f22f36ace
commit
fd3394e71d
@ -1,2 +1,3 @@
|
|||||||
libxcb-1.2.tar.bz2
|
libxcb-1.2.tar.bz2
|
||||||
xpyb-1.1.tar.bz2
|
xpyb-1.1.tar.bz2
|
||||||
|
libxcb-1.3.tar.bz2
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac
|
diff -up libxcb-1.3/configure.ac.jx libxcb-1.3/configure.ac
|
||||||
--- libxcb-1.1/configure.ac.pthread-stubs 2007-11-04 18:17:11.000000000 -0500
|
--- libxcb-1.3/configure.ac.jx 2009-07-14 11:40:00.000000000 -0400
|
||||||
+++ libxcb-1.1/configure.ac 2007-11-12 10:27:06.000000000 -0500
|
+++ libxcb-1.3/configure.ac 2009-07-14 11:40:38.000000000 -0400
|
||||||
@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT)
|
@@ -33,7 +33,7 @@ AC_SUBST(HTML_CHECK_RESULT)
|
||||||
|
|
||||||
# Checks for pkg-config packages
|
# Checks for pkg-config packages
|
||||||
PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.1)
|
PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.5)
|
||||||
-NEEDED="pthread-stubs xau >= 0.99.2"
|
-NEEDED="pthread-stubs xau >= 0.99.2"
|
||||||
+NEEDED="xau >= 0.99.2"
|
+NEEDED="xau >= 0.99.2"
|
||||||
PKG_CHECK_MODULES(NEEDED, $NEEDED)
|
PKG_CHECK_MODULES(NEEDED, $NEEDED)
|
||||||
|
37
libxcb.spec
37
libxcb.spec
@ -6,8 +6,8 @@
|
|||||||
#define bootstrap 1
|
#define bootstrap 1
|
||||||
|
|
||||||
Name: libxcb
|
Name: libxcb
|
||||||
Version: 1.2
|
Version: 1.3
|
||||||
Release: 8%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A C binding to the X11 protocol
|
Summary: A C binding to the X11 protocol
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -23,8 +23,7 @@ Source1: pthread-stubs.pc.in
|
|||||||
Source2: http://xcb.freedesktop.org/dist/xpyb-%{xpyb_version}.tar.bz2
|
Source2: http://xcb.freedesktop.org/dist/xpyb-%{xpyb_version}.tar.bz2
|
||||||
|
|
||||||
Patch0: libxcb-1.1-no-pthread-stubs.patch
|
Patch0: libxcb-1.1-no-pthread-stubs.patch
|
||||||
Patch1: libxcb-1.2-to-git-6e2e87d.patch
|
Patch1: libxcb-1.3-to-git-e06955.patch
|
||||||
Patch2: libxcb-1.2-no-nagle.patch
|
|
||||||
|
|
||||||
BuildRequires: autoconf automake libtool pkgconfig
|
BuildRequires: autoconf automake libtool pkgconfig
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -76,7 +75,6 @@ Python bindings for %{name}.
|
|||||||
%setup -q -b2
|
%setup -q -b2
|
||||||
%patch0 -p1 -b .pthread-stubs
|
%patch0 -p1 -b .pthread-stubs
|
||||||
%patch1 -p1 -b .git
|
%patch1 -p1 -b .git
|
||||||
%patch2 -p1 -b .no-nagle
|
|
||||||
|
|
||||||
%if !0%{?bootstrap}
|
%if !0%{?bootstrap}
|
||||||
pushd ../xpyb-%{xpyb_version}
|
pushd ../xpyb-%{xpyb_version}
|
||||||
@ -102,6 +100,8 @@ popd
|
|||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
make install DESTDIR=$RPM_BUILD_ROOT
|
||||||
|
rm -f $RPM_BUILD_ROOT/%{_libdir}/libxcb-xprint.so*
|
||||||
|
rm -f $RPM_BUILD_ROOT/%{_includedir}/xcb/xprint.h
|
||||||
install -m 644 COPYING NEWS README $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
|
install -m 644 COPYING NEWS README $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
|
||||||
sed 's,@libdir@,%{_libdir},;s,@prefix@,%{_prefix},;s,@exec_prefix@,%{_exec_prefix},' %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/pthread-stubs.pc
|
sed 's,@libdir@,%{_libdir},;s,@prefix@,%{_prefix},;s,@exec_prefix@,%{_exec_prefix},' %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/pthread-stubs.pc
|
||||||
|
|
||||||
@ -121,7 +121,27 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/*.so.*
|
%{_libdir}/libxcb-composite.so.0*
|
||||||
|
%{_libdir}/libxcb-damage.so.0*
|
||||||
|
%{_libdir}/libxcb-dpms.so.0*
|
||||||
|
%{_libdir}/libxcb-glx.so.0*
|
||||||
|
%{_libdir}/libxcb-randr.so.0*
|
||||||
|
%{_libdir}/libxcb-record.so.0*
|
||||||
|
%{_libdir}/libxcb-render.so.0*
|
||||||
|
%{_libdir}/libxcb-res.so.0*
|
||||||
|
%{_libdir}/libxcb-screensaver.so.0*
|
||||||
|
%{_libdir}/libxcb-shape.so.0*
|
||||||
|
%{_libdir}/libxcb-shm.so.0*
|
||||||
|
%{_libdir}/libxcb-sync.so.0*
|
||||||
|
%{_libdir}/libxcb-xevie.so.0*
|
||||||
|
%{_libdir}/libxcb-xf86dri.so.0*
|
||||||
|
%{_libdir}/libxcb-xfixes.so.0*
|
||||||
|
%{_libdir}/libxcb-xinerama.so.0*
|
||||||
|
%{_libdir}/libxcb-xselinux.so.0*
|
||||||
|
%{_libdir}/libxcb-xtest.so.0*
|
||||||
|
%{_libdir}/libxcb-xv.so.0*
|
||||||
|
%{_libdir}/libxcb-xvmc.so.0*
|
||||||
|
%{_libdir}/libxcb.so.1*
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
@ -140,6 +160,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jul 14 2009 Adam Jackson <ajax@redhat.com> 1.3-1
|
||||||
|
- libxcb 1.3
|
||||||
|
- List DSO versions explicitly.
|
||||||
|
- Don't package any xprint bits. Seriously, no.
|
||||||
|
|
||||||
* Mon Jul 13 2009 Adam Jackson <ajax@redhat.com> 1.2-8
|
* Mon Jul 13 2009 Adam Jackson <ajax@redhat.com> 1.2-8
|
||||||
- Really fix xpyb build.
|
- Really fix xpyb build.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user