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.3 by elmer, Tue Nov 2 21:46:13 2010 UTC vs.
Revision 1.18 by davidlt, Mon Sep 3 16:27:20 2012 UTC

# Line 1 | Line 1
1 < ### RPM external classlib 3.1.1
2 < Source: http://cmsmac01.cern.ch/~lat/exports/%n-%realversion.tar.bz2
3 < # Requires: zlib bz2lib pcre openssl lzo xz
4 < Requires: zlib bz2lib pcre openssl
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 > Patch2: classlib-3.1.3-fix-gcc47-cxx11
7 >
8 > Requires: bz2lib
9 > Requires: pcre
10 > Requires: xz
11 > Requires: openssl
12 > %if "%online" != "true"
13 > Requires: zlib
14 > %else
15 > Requires: onlinesystemtools
16 > %endif
17 >
18 > %if "%{?cms_cxx:set}" != "set"
19 > %define cms_cxx g++
20 > %endif
21 >
22 > %if "%{?cms_cxxflags:set}" != "set"
23 > %define cms_cxxflags -std=c++0x -O2
24 > %endif
25  
26   %prep
27   %setup -n %n-%realversion
28 + %patch0 -p1
29 + %patch1 -p1
30 + %patch2 -p1
31  
32   %build
33   ./configure --prefix=%i                         \
# Line 15 | Line 38 | Requires: zlib bz2lib pcre openssl
38    --with-pcre-includes=$PCRE_ROOT/include       \
39    --with-pcre-libraries=$PCRE_ROOT/lib          \
40    --with-openssl-includes=$OPENSSL_ROOT/include \
41 <  --with-openssl-libraries=$OPENSSL_ROOT/lib
41 >  --with-openssl-libraries=$OPENSSL_ROOT/lib    \
42 >  --with-lzma-includes=$XZ_ROOT/include         \
43 >  --with-lzma-libraries=$XZ_ROOT/lib
44  
45   perl -p -i -e '
46 <  s{-l(lzo2|lzma)}{}g;
47 <  !/^\S+: / && s{\S+LZ(O|MA)((C|Dec)ompressor|Constants|Error)\S+}{}g' \
46 >  s{-llzo2}{}g;
47 >  !/^\S+: / && s{\S+LZO((C|Dec)ompressor|Constants|Error)\S+}{}g' \
48   Makefile
49  
50 < make %makeprocesses
50 > make %makeprocesses CXX="%cms_cxx" CXXFLAGS="-Wno-error=extra -ansi -pedantic -W -Wall -Wno-long-long -Werror %cms_cxxflags"
51  
52   %install
53   make %makeprocesses install

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines