rpms/libxcb/devel libxcb.spec,1.23,1.24
Adam Jackson
ajax at fedoraproject.org
Mon Jul 6 14:55:19 UTC 2009
- Previous message (by thread): rpms/openswan/F-11 openswan-2.6.21-CVE-2009-2185.patch, NONE, 1.1 openswan-2.6.21-nss-fedora-diff-modified.patch, NONE, 1.1 openswan.spec, 1.78, 1.79
- Next message (by thread): rpms/gdb/F-11 gdb-archer.patch,1.18,1.19 gdb.spec,1.356,1.357
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ajax
Update of /cvs/pkgs/rpms/libxcb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1148
Modified Files:
libxcb.spec
Log Message:
* Mon Jul 06 2009 Adam Jackson <ajax at redhat.com> 1.2-7
- Fix xpyb build
Index: libxcb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libxcb/devel/libxcb.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- libxcb.spec 29 Jun 2009 14:59:34 -0000 1.23
+++ libxcb.spec 6 Jul 2009 14:54:48 -0000 1.24
@@ -2,9 +2,12 @@
%define xpyb_version 1.1
+# Define this when bootstrapping to avoid the xpyb loop
+#define bootstrap 1
+
Name: libxcb
Version: 1.2
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: A C binding to the X11 protocol
Group: System Environment/Libraries
@@ -32,6 +35,9 @@ BuildRequires: python
BuildRequires: xcb-proto >= 1.5
BuildRequires: xorg-x11-proto-devel
BuildRequires: xorg-x11-util-macros
+%if !0%{?bootstrap}
+BuildRequires: libxcb-devel
+%endif
%description
The X protocol C-language Binding (XCB) is a replacement for Xlib featuring a
@@ -56,6 +62,7 @@ BuildArch: noarch
%description doc
The %{name}-doc package contains documentation for the %{name} library.
+%if !0%{?bootstrap}
%package python
Summary: Python bindings for %{name}
Group: Development/Libraries
@@ -63,6 +70,7 @@ Provides: xpyb
%description python
Python bindings for %{name}.
+%endif
%prep
%setup -q -b2
@@ -76,10 +84,12 @@ autoreconf -v --install
--enable-selinux
make %{?_smp_mflags}
+%if !0%{?bootstrap}
pushd ../xpyb-%{xpyb_version}
%configure
make %{?_smp_mflags}
popd
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -87,9 +97,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
install -m 644 COPYING NEWS README $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
sed 's, at libdir@,%{_libdir},;s, at prefix@,%{_prefix},;s, at exec_prefix@,%{_exec_prefix},' %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/pthread-stubs.pc
+%if !0%{?bootstrap}
pushd ../xpyb-%{xpyb_version}
make install DESTDIR=$RPM_BUILD_ROOT
popd
+%endif
find $RPM_BUILD_ROOT -name '*.la' -delete
@@ -113,11 +125,16 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_datadir}/doc/%{name}-%{version}
+%if !0%{?bootstrap}
%files python
%defattr(-,root,root,-)
%{python_sitearch}/xcb
+%endif
%changelog
+* Mon Jul 06 2009 Adam Jackson <ajax at redhat.com> 1.2-7
+- Fix xpyb build
+
* Mon Jun 29 2009 Adam Jackson <ajax at redhat.com> 1.2-6
- BuildRequires: xcb-proto >= 1.5
- Previous message (by thread): rpms/openswan/F-11 openswan-2.6.21-CVE-2009-2185.patch, NONE, 1.1 openswan-2.6.21-nss-fedora-diff-modified.patch, NONE, 1.1 openswan.spec, 1.78, 1.79
- Next message (by thread): rpms/gdb/F-11 gdb-archer.patch,1.18,1.19 gdb.spec,1.356,1.357
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list