|
@@ -6,14 +6,17 @@ Summary: A C binding to the X11 protocol
|
|
|
Summary(ja): X11 プロトコルの C による実装
|
|
Summary(ja): X11 プロトコルの C による実装
|
|
|
Name: libxcb
|
|
Name: libxcb
|
|
|
Version: 1.9
|
|
Version: 1.9
|
|
|
-Release: 1%{?_dist_release}
|
|
|
|
|
|
|
+Release: 2%{?_dist_release}
|
|
|
|
|
|
|
|
Group: System Environment/Libraries
|
|
Group: System Environment/Libraries
|
|
|
License: MIT
|
|
License: MIT
|
|
|
URL: http://xcb.freedesktop.org/
|
|
URL: http://xcb.freedesktop.org/
|
|
|
Source0: http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
|
|
Source0: http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
|
|
|
-
|
|
|
|
|
-Patch10: libxcb-1.8.1-no-pthread-stubs.patch
|
|
|
|
|
|
|
+# This is stolen straight from the pthread-stubs source:
|
|
|
|
|
+# http://cgit.freedesktop.org/xcb/pthread-stubs/blob/?id=6900598192bacf5fd9a34619b11328f746a5956d
|
|
|
|
|
+# we don't need the library because glibc has working pthreads, but we need
|
|
|
|
|
+# the pkgconfig file so libs that link against libxcb know this...
|
|
|
|
|
+Source1: pthread-stubs.pc.in
|
|
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
BuildRequires: autoconf automake libtool pkgconfig
|
|
BuildRequires: autoconf automake libtool pkgconfig
|
|
@@ -72,11 +75,15 @@ developing applications that use %{name}.
|
|
|
|
|
|
|
|
%prep
|
|
%prep
|
|
|
%setup -q
|
|
%setup -q
|
|
|
-%patch10 -p1
|
|
|
|
|
|
|
|
|
|
%build
|
|
%build
|
|
|
|
|
+sed -i 's/pthread-stubs //' configure.ac
|
|
|
autoreconf -v --install
|
|
autoreconf -v --install
|
|
|
-%configure --disable-static --docdir=%{_datadir}/doc/%{name}-%{version} --disable-selinux
|
|
|
|
|
|
|
+%configure --disable-static \
|
|
|
|
|
+ --docdir=%{_datadir}/doc/%{name}-%{version} \
|
|
|
|
|
+ --disable-selinux \
|
|
|
|
|
+ --enable-xkb \
|
|
|
|
|
+ --disable-xprint
|
|
|
make %{?_smp_mflags}
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
|
|
%install
|
|
%install
|
|
@@ -85,6 +92,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
|
|
find $RPM_BUILD_ROOT -name '*.la' | xargs rm -f
|
|
|
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
|
|
|
|
|
+
|
|
|
find $RPM_BUILD_ROOT -name '*.la' -delete
|
|
find $RPM_BUILD_ROOT -name '*.la' -delete
|
|
|
|
|
|
|
|
%clean
|
|
%clean
|
|
@@ -122,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%endif
|
|
%endif
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
|
+* Sat Nov 17 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.9-2
|
|
|
|
|
+- add Source1: pthread-stubs.pc, remove patch10
|
|
|
|
|
+
|
|
|
* Mon Oct 08 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.9-1
|
|
* Mon Oct 08 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.9-1
|
|
|
- new upstream release
|
|
- new upstream release
|
|
|
|
|
|
daisuke