packages: root/root.spec - remove fonts dir from tarball (NOTE) - add root-...

[lisu]

Author: lisu                         Date: Mon Mar 21 12:30:03 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- remove fonts dir from tarball (NOTE)
- add root-fontconfig.patch which forces using of system fonts (from fedora so may be bogus for pld)

---- Files affected:
packages/root:
   root.spec (1.71 -> 1.72) 

---- Diffs:

================================================================
Index: packages/root/root.spec
diff -u packages/root/root.spec:1.71 packages/root/root.spec:1.72
--- packages/root/root.spec:1.71	Mon Mar 21 12:48:19 2011
+++ packages/root/root.spec	Mon Mar 21 13:29:58 2011
@@ -6,6 +6,15 @@
 #	- xrootd is disabled because of errors - re-enable it in future
 #	- files
 #	- check and set proper groups for subpackages if needed
+#	- create script for package generation
+#
+# NOTE: The upstream source is modified to exclude proprietary fonts, fix it by doing:
+#
+# wget -N ftp://root.cern.ch/root/root_v%{version}.source.tar.gz
+# tar -z -x -f root_v%{version}.source.tar.gz
+# rm -rf root/fonts
+# mv root root-%{version}
+# tar -z -c -f root-%{version}.tar.gz root-%{version}
 #
 #Conditional build:
 %bcond_with	krb5	# build with MIT kerberos
@@ -13,22 +22,24 @@
 Summary:	An object-oriented data analysis environment
 Summary(pl.UTF-8):	Obiektowo zorientowane środowisko do analizowania danych
 Name:		root
-Version:	5.28.00a
+Version:	5.28.00b
 Release:	0.1
 License:	LGPL v2.1+
 Group:		Applications/Engineering
-Source0:	ftp://root.cern.ch/root/%{name}_v%{version}.source.tar.gz
-# Source0-md5:	bef76dbbba63ca83575b7b6b04669631
+Source0:	%{name}-%{version}.tar.gz
+# Source0-md5:	257c0c9981698ca3e847020ab61badb3
 # Script to extract the list of include files in a subpackage
 Source1:	%{name}-includelist
 Patch0:		%{name}-docs.patch
 Patch1:		%{name}-namespaces.patch
 Patch2:		%{name}-make_version.patch
 Patch3:		%{name}-krb5_functions.patch
+Patch4:		%{name}-fontconfig.patch
 URL:		http://root.cern.ch/
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	automake
 BuildRequires:	fftw3-devel
+BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	ftgl-devel >= 2.1.3-0.rc5.1
 BuildRequires:	giflib-devel
@@ -390,13 +401,14 @@
 Ten pakiet zawiera bibliotekę Tree dla ROOT.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %if %{with krb5}
 %patch3 -p1
 %endif
+%patch4 -p1
 
 %{__sed} -i '/check_library/s@ \\$@ %{_libdir} \\@' configure
 
@@ -706,6 +718,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2011/03/21 12:29:58  lisu
+- remove fonts dir from tarball (NOTE)
+- add root-fontconfig.patch which forces using of system fonts (from fedora so may be bogus for pld)
+
 Revision 1.71  2011/03/21 11:48:19  lisu
 - disable rpath (set run-time library load path on executables)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/root/root.spec?r1=1.71&r2=1.72&f=u