Author: sparky Date: Sun Jan 30 02:35:09 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- *DO NOT SET BuildArch: noarch IN SUBPACKAGES* -- this is a global option and
switches to noarch build of the whole project
- above change magically fixed x8664 build
- BR: automake (for _aclocaldir macro), pkgconfig
- improved/fixed includelist generation
---- Files affected:
packages/root:
root.spec (1.47 -> 1.48)
---- Diffs:
================================================================
Index: packages/root/root.spec
diff -u packages/root/root.spec:1.47 packages/root/root.spec:1.48
--- packages/root/root.spec:1.47 Thu Dec 16 14:15:05 2010
+++ packages/root/root.spec Sun Jan 30 03:35:03 2011
@@ -28,6 +28,7 @@
Patch3: %{name}-krb5_functions.patch
URL: http://root.cern.ch/
BuildRequires: OpenGL-GLU-devel
+BuildRequires: automake
BuildRequires: fftw3-devel
BuildRequires: freetype-devel >= 2.0
BuildRequires: ftgl-devel >= 2.1.3-0.rc5.1
@@ -48,6 +49,7 @@
BuildRequires: openldap-devel
BuildRequires: openssl-devel
BuildRequires: pcre-devel >= 3.9
+BuildRequires: pkgconfig
BuildRequires: postgresql-devel
BuildRequires: python-devel >= 1:2.6
BuildRequires: python-modules
@@ -84,7 +86,6 @@
Summary(pl.UTF-8): Zbiór icon dla ROOT
Group: Applications/Engineering
Requires: %{name}-core = %{version}-%{release}
-BuildArch: noarch
%description icons
This package contains icons used by the ROOT GUI.
@@ -98,7 +99,6 @@
License: LGPL v2+ and GPL v2+ and BSD
Group: Documentation
Requires: %{name}-cint = %{version}-%{release}
-BuildArch: noarch
%description doc
This package contains the automatically generated ROOT class
@@ -188,17 +188,18 @@
#%%{__rm} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.MONALISA
# Create includelist files ...
+RPM_BUILD_DIR=$(pwd)
for module in `find * -name Module.mk` ; do
module=`dirname $module`
- make -f %{SOURCE1} includelist MODULE=$module
+ make -f %{SOURCE1} includelist MODULE=$module ROOT_SRCDIR=$RPM_BUILD_DIR
done
# ... and merge some of them
-cat includelist-core-[^w]* > includelist-core
+cat includelist-core-[^we]* > includelist-core
cat includelist-io-io >> includelist-core
cat includelist-geom-geom* > includelist-geom
cat includelist-roofit-* > includelist-roofit
-cat includelist-gui-qt* > includelist-gui-qt
+cat includelist-gui-qt* > includelist-guiqt
cat includelist-graf2d-x11ttf >> includelist-graf2d-x11
cat includelist-gui-guihtml >> includelist-gui-gui
cat includelist-io-xmlparser >> includelist-io-xml
@@ -272,6 +273,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.48 2011/01/30 02:35:03 sparky
+- *DO NOT SET BuildArch: noarch IN SUBPACKAGES* -- this is a global option and
+ switches to noarch build of the whole project
+- above change magically fixed x8664 build
+- BR: automake (for _aclocaldir macro), pkgconfig
+- improved/fixed includelist generation
+
Revision 1.47 2010/12/16 13:15:05 lisu
- more TODO
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/root/root.spec?r1=1.47&r2=1.48&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
