Skip to content
Snippets Groups Projects
Commit 80eea372 authored by Fons Rademakers's avatar Fons Rademakers
Browse files

from Christian Holm: 

Here's the first set of patches. This fixes the problems

* root-plugin-gfal is explicitly disabled by passing
  `--disable-gfal' to the configure script in the generated spec
  file.
* More sophisticated algorithm to discover whether man(1) pages
  are compressed before they are moved into a package.   This
  should work for all systems.
* Made the package build depend on XFree86-devel (rather than
  xorg-devel) as I think all X development packages provide that
  capability (sigh, one can not do alternatives in RPM
  dependencies).
* Fixed problem with different names of mysql-devel on various
  systems (thanks to Anders Waananen for fix).


git-svn-id: http://root.cern.ch/svn/root/trunk@14507 27541ba8-7e3a-0410-8455-c3a389f83636
parent 5050f51c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
build/package/debian/changelog
+ 18
− 0
View file @ 80eea372
root (5.11.01-2) unstable; urgency=low
* Some fixes upstream
-- Christian Holm Christensen <cholm@nbi.dk> Wed, 22 Mar 2006 15:11:49 +0100
root (5.11.01-1) unstable; urgency=low
* New upstream version. No changes to the debian part.
-- Christian Holm Christensen <cholm@nbi.dk> Tue, 21 Mar 2006 01:59:33 +0100
root (5.10.00-1) unstable; urgency=low
* New upstream version
-- Christian Holm Christensen <cholm@nbi.dk> Thu, 2 Mar 2006 10:09:35 +0100
root (5.09.01-10) unstable; urgency=low
* Removed dangling code directory in `minuit2/src'
......
build/package/lib/makebuilddepend.sh
+ 30
− 17
View file @ 80eea372
......@@ -10,46 +10,59 @@ if test "x$1" = "xrpm" ; then
root-bin) ;;
root-cint) ;;
root-doc) ;;
*alien) echo -n ", AliEn-Client" ;;
*alien) echo "BuildRequires: AliEn-Client" ;;
# Build dependency on AfterStep-devel temporarily commented out
# until such a time when ROOT can use the normal libAfterImage.
# Input the build dependencies of the libafterimage-dev package
# *asimage) echo -n ", AfterStep-devel" ;;
*asimage) ;;
*castor) echo -n ", CASTOR-client" ;;
*castor) echo "BuildRequires: CASTOR-client" ;;
*chirp) ;;
*clarens) ;;
*dcache) ;;
*fumili) ;;
*gl) ;;
*globus) echo -n ", globus" ;;
*hbook) echo -n ", gcc-g77" ;;
*krb5) echo -n ", krb5-devel" ;;
*ldap) echo -n ", openldap-devel" ;;
*globus) echo "BuildRequires: globus" ;;
*hbook) echo "BuildRequires: gcc-g77" ;;
*krb5) echo "BuildRequires: krb5-devel" ;;
*ldap) echo "BuildRequires: openldap-devel" ;;
*minuit) ;;
*minuit2) ;;
*mlp) ;;
*mysql) echo -n ", mysql-devel" ;;
# This is kinda special
*mysql)
cat <<EOF
%if %{?_vendor}
%if %{_vendor} == "MandrakeSoft"
BuildRequires: MySQL-devel
%else
BuildRequires: mysql-devel
%endif
%else
BuildRequires: mysql-devel
%endif
EOF
;;
*netx) ;;
*oracle) echo -n ", oracle-instantclient-devel" ;;
*oracle) echo "BuildRequires: oracle-instantclient-devel";;
*peac) ;;
*pgsql) echo -n ", postgresql-devel" ;;
*pgsql) echo "BuildRequires: postgresql-devel" ;;
*proof) ;;
*pythia5) echo -n ", pythia5-devel" ;;
*pythia6) echo -n ", pythia6-devel" ;;
*python) echo -n ", python-devel >= 2.1" ;;
*qt) echo -n ", qt-devel >= 3.3.3" ;;
*pythia5) echo "BuildRequires: pythia5-devel" ;;
*pythia6) echo "BuildRequires: pythia6-devel" ;;
*python) echo "BuildRequires: python-devel >= 2.1" ;;
*qt) echo "BuildRequires: qt-devel >= 3.3.3" ;;
*quadp) ;;
*roofit) ;;
*ruby) echo -n ", ruby-devel >= 1.8" ;;
*maxdb) echo -n ", libsqlod75-dev" ;;
*ruby) echo "BuildRequires: ruby-devel >= 1.8" ;;
*maxdb) echo "BuildRequires: libsqlod75-dev" ;;
*sql) ;;
*srp) ;;
*venus) ;;
*xml) echo -n ", libxml2-devel" ;;
*xml) echo "BuildRequires: libxml2-devel" ;;
root-proofd) ;;
root-rootd) ;;
root-xrootd) echo -n ", krb5-devel" ;;
root-xrootd) echo "BuildRequires: krb5-devel" ;;
ttf-root*) ;;
root-common) ;;
*)
......
build/package/lib/makerpmspec.sh
+ 10
− 4
View file @ 80eea372
#!/bin/sh -e
#
# $Id: makerpmspec.sh,v 1.11 2005/10/12 22:23:47 rdm Exp $
# $Id: makerpmspec.sh,v 1.12 2006/02/28 16:38:23 rdm Exp $
#
# Make the rpm spec file in ../root.spec
#
......@@ -21,6 +21,7 @@ pkglist=`./configure --pkglist \
--enable-explicitlink \
--disable-rpath \
--disable-afs \
--disable-gfal \
--disable-srp \
--disable-builtin-freetype \
--disable-builtin-afterimage \
......@@ -34,12 +35,17 @@ version=`cat build/version_number | tr '/' '.'`
major=`echo $version | cut -f1 -d.`
### echo %%% make sure we've got a fresh file
rm -f root.spec
csplit -f root.spec. build/package/rpm/spec.in '/@builddepends@/'
cat root.spec.00 > root.spec.in
echo "$builddepends" >> root.spec.in
sed '/@builddepends/d' < root.spec.01 >> root.spec.in
rm -f root.spec.00 root.spec.01
### echo %%% Write header stuff
sed -e "s/@version@/${version}/" \
-e "s/@builddepends@/${builddepends}/" \
-e "s/@pkglist@/${dpkglist}/" \
< build/package/rpm/spec.in > root.spec
< root.spec.in > root.spec
rm -f root.spec.in
# -e "s/@builddepends@/${builddepends}/" \
# Write out sub-package information
for p in $pkglist ; do
......
build/package/rpm/spec.in
+ 13
− 7
View file @ 80eea372
......@@ -27,7 +27,8 @@ Source: ftp://root.cern.ch/root/root_v%{ver}.source.tar.gz
Group: Applications/Physics
BuildRoot: /tmp/rootrpm
Summary: Numerical data analysis framework (OO)
BuildRequires: xorg-x11-devel@builddepends@
BuildRequires: XFree86-devel
@builddepends@
Requires: @pkglist@
#
# Over all description - not used, but required
......@@ -140,15 +141,20 @@ echo "%attr(0755, root, root) %{_sysconfdir}/rc.d/init.d/rootd" \
>> rpm/root-rootd.install
# This is for older version of Red Hat. In Red Hat Enterprise 4, RPM
# does not compress the files before installing into package specific
# directories.
# EXT=$(grep -e '^[[:space:]]*COMPRESS_EXT=' /usr/lib/rpm/brp-compress | sed 's/^\([[:space:]]*COMPRESS_EXT=\)\(.*\)/\.1\2/')
EXT=.1
# This is to discover weather the man pages are compressed before they
# are moved into the packages - ugly hack, but there's no 2 ways about it
EXT=
comp=$(echo "%{__os_install_post}" | sed -n 's/[[:space:]]*\([^[:space:]]*compress[^[:space:]]*\).*/\1/p')
if test "x$comp" = "x" ; then
:
else
EXT=$(grep -e '^[[:space:]]*COMPRESS_EXT=' $comp | sed 's/^\([[:space:]]*COMPRESS_EXT=\)\(.*\)/\2/')
fi
# Now fix up the file lists
for i in rpm/*.install ; do
if test ! -f $i ; then continue ; fi
echo "Fixing $i"
sed -e "s/\.1$/${EXT}/g" \
sed -e "s/\.1$/.1${EXT}/g" \
-e "s,%_sysconfdir,%config %_sysconfdir," \
-e "s,%_defaultdocdir,%doc %_defaultdocdir," \
< $i > $i.tmp
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment