ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/classlib.spec
(Generate patch)

Comparing COMP/CMSDIST/classlib.spec (file contents):
Revision 1.7 by elmer, Sun Mar 6 23:33:06 2011 UTC vs.
Revision 1.14 by davidlt, Mon Apr 30 08:04:13 2012 UTC

# Line 1 | Line 1
1 < ### RPM external classlib 3.1.2
2 < Source: http://cmsmac01.cern.ch/~lat/exports/%n-%realversion.tar.bz2
3 < %define closingbrace )
4 < %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; esac)
5 < Patch0: classlib-3.1.2-gcc46
1 > ### RPM external classlib 3.1.3
2 > %define online %(case %cmsplatf in (*onl_*_*) echo true;; (*) echo false;; esac)
3 > Source: http://lat.web.cern.ch/lat/exports/%n-%realversion.tar.bz2
4 > Patch0: classlib-3.1.3-gcc46
5 > Patch1: classlib-3.1.3-sl6
6  
7   Requires: bz2lib
8   Requires: pcre
9 + Requires: xz
10   %if "%online" != "true"
11   Requires: openssl
12   Requires: zlib
# Line 13 | Line 14 | Requires: zlib
14   Requires: onlinesystemtools
15   %endif
16  
17 + %if "%{?cms_cxx:set}" != "set"
18 + %define cms_cxx g++
19 + %endif
20 +
21 + %if "%{?cms_cxxflags:set}" != "set"
22 + %define cms_cxxflags -std=c++0x
23 + %endif
24 +
25   %prep
26   %setup -n %n-%realversion
18 case %gccver in
19  4.6.*)
27   %patch0 -p1
28 <  ;;
22 < esac
28 > %patch1 -p1
29  
30   %build
31   ./configure --prefix=%i                         \
# Line 30 | Line 36 | esac
36    --with-pcre-includes=$PCRE_ROOT/include       \
37    --with-pcre-libraries=$PCRE_ROOT/lib          \
38    --with-openssl-includes=$OPENSSL_ROOT/include \
39 <  --with-openssl-libraries=$OPENSSL_ROOT/lib
39 >  --with-openssl-libraries=$OPENSSL_ROOT/lib    \
40 >  --with-lzma-includes=$XZ_ROOT/include         \
41 >  --with-lzma-libraries=$XZ_ROOT/lib \
42 >  CXXFLAGS="-Wno-error=extra"
43  
44   perl -p -i -e '
45 <  s{-l(lzo2|lzma)}{}g;
46 <  !/^\S+: / && s{\S+LZ(O|MA)((C|Dec)ompressor|Constants|Error)\S+}{}g' \
45 >  s{-llzo2}{}g;
46 >  !/^\S+: / && s{\S+LZO((C|Dec)ompressor|Constants|Error)\S+}{}g' \
47   Makefile
48  
49 < make %makeprocesses
49 > make %makeprocesses CXX="%cms_cxx %cms_cxxflags"
50  
51   %install
52   make %makeprocesses install

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines