rpms/libX11/devel libX11.spec, 1.57, 1.58 libX11-0.99.3-datadir-locale-dir-fix.patch, 1.2, NONE
Adam Jackson
ajax at fedoraproject.org
Sat Feb 21 20:53:39 UTC 2009
Author: ajax
Update of /cvs/pkgs/rpms/libX11/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3144
Modified Files:
libX11.spec
Removed Files:
libX11-0.99.3-datadir-locale-dir-fix.patch
Log Message:
* Sat Feb 21 2009 Adam Jackson <ajax at redhat.com> 1.2-2
- Merge review cleanups. (#226062)
Index: libX11.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libX11/devel/libX11.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- libX11.spec 18 Feb 2009 18:18:03 -0000 1.57
+++ libX11.spec 21 Feb 2009 20:53:08 -0000 1.58
@@ -1,7 +1,7 @@
Summary: X.Org X11 libX11 runtime library
Name: libX11
Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT
Group: System Environment/Libraries
URL: http://www.x.org
@@ -10,10 +10,6 @@
Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
#Source0: http://cgit.freedesktop.org/xorg/lib/libX11/snapshot/libX11-%{version}.tar.bz2
-# FIXME: https://bugs.freedesktop.org/show_bug.cgi?id=3646 seems to indicate
-# this patch is now committed upstream. When libX11-1.0.4 is released,
-# manually confirm each patch hunk before removal.
-Patch0: libX11-0.99.3-datadir-locale-dir-fix.patch
Patch2: dont-forward-keycode-0.patch
BuildRequires: pkgconfig autoconf automake libtool
@@ -27,8 +23,6 @@
Requires(pre): xorg-x11-filesystem >= 0.99.2-3
-Obsoletes: XFree86-libs, xorg-x11-libs
-
%description
X.Org X11 libX11 runtime library
@@ -43,21 +37,16 @@
Requires: libXau-devel, libXdmcp-devel, libxcb-devel
Requires: pkgconfig
-Obsoletes: XFree86-devel, xorg-x11-devel
-
%description devel
X.Org X11 libX11 development package
%prep
%setup -q
-# FIXME: We are keeping this around, as upstream has a tendency for random
-# people to revert fixes other people have applied, and have a 6-8 month tug
-# of war with these things. It's easier to leave this here than to try and
-# find it later.
-#%patch0 -p0 -b .datadir-locale-dir-fix
%patch2 -p1 -b .dont-forward-keycode-0
%build
+# sodding libtool
+autoreconf -v --install
%configure \
--disable-dependency-tracking \
--disable-static
@@ -70,10 +59,10 @@
make install DESTDIR=$RPM_BUILD_ROOT
# We intentionally don't ship *.la files
-find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
+find $RPM_BUILD_ROOT -type f -name '*.la' -delete
# FIXME: Don't install Xcms.txt - find out why upstream still ships this.
-find $RPM_BUILD_ROOT -name 'Xcms.txt' -exec rm -f {} \;
+find $RPM_BUILD_ROOT -name 'Xcms.txt' -delete
%clean
rm -rf $RPM_BUILD_ROOT
@@ -112,10 +101,12 @@
%{_libdir}/libX11-xcb.so
%{_libdir}/pkgconfig/x11.pc
%{_libdir}/pkgconfig/x11-xcb.pc
-#%dir %{_mandir}/man3x
%{_mandir}/man3/*.3*
%changelog
+* Sat Feb 21 2009 Adam Jackson <ajax at redhat.com> 1.2-2
+- Merge review cleanups. (#226062)
+
* Wed Feb 18 2009 Adam Jackson <ajax at redhat.com> 1.2-1
- libX11 1.2
--- libX11-0.99.3-datadir-locale-dir-fix.patch DELETED ---
More information about the fedora-extras-commits
mailing list