[Lsb-messages] /var/www/bzr/lsb/devel/appbat r960: Remove Xos.h, Xarch.h, and Xfuncs.h from libbat for now

Stew Benedict stewb at linux-foundation.org
Sat May 12 12:32:07 UTC 2012


------------------------------------------------------------
revno: 960
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: appbat
timestamp: Sat 2012-05-12 08:32:07 -0400
message:
  Remove Xos.h, Xarch.h, and Xfuncs.h from libbat for now
modified:
  rpm/lsb-build-libbat.spec.in
-------------- next part --------------
=== modified file 'rpm/lsb-build-libbat.spec.in'
--- a/rpm/lsb-build-libbat.spec.in	2012-02-13 16:48:07 +0000
+++ b/rpm/lsb-build-libbat.spec.in	2012-05-12 12:32:07 +0000
@@ -1,7 +1,7 @@
 Summary: LSB Library Battery
 Name: lsb-build-libbat
 Version: 1.14
-Release: 2.lsb5
+Release: 3.lsb5
 Vendor: Linux Foundation
 Packager: Appbat Team <lsb-appbat at linux-foundation.org>
 License: Open Source Compatible
@@ -606,6 +606,11 @@
   rm -f %headerdir/$badfile
 done
 
+# in build-base as of 5.0 - now we conflict
+for badfile in Xos.h Xarch.h Xfuncs.h; do
+  rm -f %headerdir/$badfile
+done
+
 %clean
 rm -rf %{buildroot}
 
@@ -779,11 +784,8 @@
 # xproto
 %{includedir}/X11/ap_keysym.h
 %{includedir}/X11/Xalloca.h
-%{includedir}/X11/Xarch.h
 %{includedir}/X11/Xdefs.h
 %{includedir}/X11/XF86keysym.h
-%{includedir}/X11/Xfuncs.h
-%{includedir}/X11/Xos.h
 %{includedir}/X11/Xos_r.h
 %{includedir}/X11/Xpoll.h
 %{includedir}/X11/Xthreads.h
@@ -791,6 +793,12 @@
 %{includedir}/X11/XWDFile.h
 %{includedir}/X11/Xwindows.h
 %{includedir}/X11/Xwinsock.h
+
+# now in lsb-build-base as of 5.0
+#%{includedir}/X11/Xarch.h
+#%{includedir}/X11/Xos.h
+#%{includedir}/X11/Xfuncs.h
+
 # xproto - from libX11
 %{includedir}/X11/Xlocale.h
 ### libart_lgpl set



More information about the lsb-messages mailing list