packages: xkeyboard-config/xkeyboard-config.spec - disable runtime deps, li...
qboosh
qboosh at pld-linux.org
Sun Apr 17 11:29:22 CEST 2011
Author: qboosh Date: Sun Apr 17 09:29:22 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- disable runtime deps, libX11 is not in BRs
- runtime versioned libX11 dependency
- xkb/compiled dir is no longer created by make install
---- Files affected:
packages/xkeyboard-config:
xkeyboard-config.spec (1.33 -> 1.34)
---- Diffs:
================================================================
Index: packages/xkeyboard-config/xkeyboard-config.spec
diff -u packages/xkeyboard-config/xkeyboard-config.spec:1.33 packages/xkeyboard-config/xkeyboard-config.spec:1.34
--- packages/xkeyboard-config/xkeyboard-config.spec:1.33 Wed Apr 6 07:18:23 2011
+++ packages/xkeyboard-config/xkeyboard-config.spec Sun Apr 17 11:29:17 2011
@@ -17,6 +17,8 @@
BuildRequires: intltool >= 0.30
BuildRequires: rpmbuild(macros) >= 1.446
BuildRequires: xorg-app-xkbcomp
+# for sinhala layouts
+Requires: xorg-lib-libX11 >= 1.4.3
Provides: xorg-data-xkbdata
Obsoletes: xorg-data-xkbdata < 0.9
BuildArch: noarch
@@ -44,6 +46,7 @@
%{__aclocal}
%{__autoconf}
%configure \
+ --disable-runtime-deps \
--enable-compat-rules \
--with-xkb-rules-symlink=xorg \
--with-xkb-base=%{_datadir}/X11/xkb
@@ -56,7 +59,6 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
ln -s /var/lib/xkb $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
%find_lang %{name}
@@ -89,6 +91,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.34 2011/04/17 09:29:17 qboosh
+- disable runtime deps, libX11 is not in BRs
+- runtime versioned libX11 dependency
+- xkb/compiled dir is no longer created by make install
+
Revision 1.33 2011/04/06 05:18:23 arekm
- up to 2.2.1; --disable-runtime-deps no longer needed
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xkeyboard-config/xkeyboard-config.spec?r1=1.33&r2=1.34&f=u
More information about the pld-cvs-commit
mailing list