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

Comparing COMP/CMSDIST/root.spec (file contents):
Revision 1.75 by ratnik, Tue Oct 16 08:38:00 2007 UTC vs.
Revision 1.189 by eulisse, Mon Feb 15 14:12:21 2010 UTC

# Line 1 | Line 1
1 < ### RPM lcg root 5.14.00g-CMS9
1 > ### RPM lcg root 5.26.00a
2   ## INITENV +PATH PYTHONPATH %i/lib/python
3 < ## INITENV SET ROOTSYS %i
4 < Source: cvs://:pserver:cvs@root.cern.ch:2401/user/cvs?passwd=Ah<Z&tag=-rv%(echo %realversion | tr . -)&module=root&output=/%{n}_v%{realversion}.source.tar.gz
5 < #Source: ftp://root.cern.ch/%n/%{n}_v%{realversion}.source.tar.gz
6 <
7 < Patch: root-CINT-maxlongline
8 < Patch1: root_libpng
9 < Patch2: root_PositionVector
10 < Patch3: root-fastmerge-ttree
11 < Patch4: root_TXMLSetup
12 < Patch5: root-Cintex
3 > ## INITENV SET ROOTSYS %i
4 > #Source: cvs://:pserver:cvs@root.cern.ch:2401/user/cvs?passwd=Ah<Z&tag=-rv%(echo %realversion | tr . -)&module=root&output=/%{n}_v%{realversion}.source.tar.gz
5 > Source: ftp://root.cern.ch/%n/%{n}_v%{realversion}.source.tar.gz
6 > %define closingbrace )
7 > %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo false;; esac)
8 >
9 > Patch0:  root-5.18-00-libpng
10 > Patch1:  root-5.22-00-TMVA-shut-the-hell-up-for-once
11 > Patch2:  root-5.22-00a-roofit-silence-static-printout
12 > Patch3:  root-5.22-00d-linker-gnu-hash-style
13 > Patch4:  root-5.26-00a-CINT-maxlongline
14 > Patch5:  root-5.26-00a-silence-TMVA
15  
16   %define cpu %(echo %cmsplatf | cut -d_ -f2)
15 – %define pythonv %(echo $PYTHON_VERSION | cut -d. -f1,2)
17  
18   Requires: gccxml gsl castor libjpg dcap pcre python
19  
20 < %if "%{?online_release:set}" != "set"
21 < Requires: qt openssl mysql libpng zlib oracle libungif
20 > %if "%online" != "true"
21 > Requires: qt openssl libpng zlib libungif xrootd
22   %else
23   %define skiplibtiff true
24   %endif
# Line 32 | Line 33 | Requires: libtiff
33  
34   %prep
35   %setup -n root
36 < %patch -p0
37 < %patch1 -p2
38 < %patch2 -p2
36 > %patch0 -p1
37 > %patch1 -p1
38 > %patch2 -p1
39   %patch3 -p1
40 < %patch4 -p0
40 > %patch4 -p1
41   %patch5 -p1
42 +
43   %build
44 +
45   mkdir -p %i
46   export ROOTSYS=%_builddir/root
47 + export PYTHONV=$(echo $PYTHON_VERSION | cut -f1,2 -d.)
48 +
49 + %if "%online" == "true"
50 + # Use system qt. Also skip xrootd and odbc for online case:
51  
52 < %if "%{?online_release:set}" != "set"
53 < EXTRA_CONFIG_ARGS="
54 < --with-mysql-libdir=${MYSQL_ROOT}/lib --with-mysql-incdir=${MYSQL_ROOT}/include
55 < --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
49 < --with-ssl-incdir=${OPENSSL_ROOT}/include
50 < --with-ssl-libdir=${OPENSSL_ROOT}/lib"
52 > EXTRA_CONFIG_ARGS="--with-f77=/usr
53 >             --disable-xrootd
54 >             --disable-odbc
55 >             --disable-qt --disable-qtgsi"
56   %else
57 < ORACLE_ROOT="/opt/xdaq"
58 < EXTRA_CONFIG_ARGS=" --enable-ssl"
57 > EXTRA_CONFIG_ARGS="--with-f77=${GCC_ROOT}
58 >             --with-xrootd=$XROOTD_ROOT
59 >             --enable-qt --with-qt-libdir=${QT_ROOT}/lib --with-qt-incdir=${QT_ROOT}/include
60 >             --with-ssl-incdir=${OPENSSL_ROOT}/include
61 >             --with-ssl-libdir=${OPENSSL_ROOT}/lib
62 >             --enable-qtgsi"
63   %endif
64  
65   CONFIG_ARGS="--enable-table
# Line 58 | Line 67 | CONFIG_ARGS="--enable-table
67               --disable-builtin-freetype
68               --disable-builtin-zlib
69               --with-gccxml=${GCCXML_ROOT}
70 <             --enable-python
62 <             --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python2.4
63 <             --enable-mysql
70 >             --enable-python --with-python-libdir=${PYTHON_ROOT}/lib --with-python-incdir=${PYTHON_ROOT}/include/python${PYTHONV}
71               --enable-explicitlink
65 –             --enable-qtgsi
66 –             --enable-qt
67 –             --enable-mathcore
72               --enable-mathmore
73               --enable-reflex  
74               --enable-cintex
75               --enable-minuit2
72 –             --enable-roofit
76               --disable-ldap
77               --disable-krb5
78               --with-gsl-incdir=${GSL_ROOT}/include
# Line 77 | Line 80 | CONFIG_ARGS="--enable-table
80               --with-dcap-libdir=${DCAP_ROOT}/lib
81               --with-dcap-incdir=${DCAP_ROOT}/include
82               --disable-pgsql
83 +             --disable-mysql
84               --disable-xml ${EXTRA_CONFIG_ARGS}"
85  
86 < case $(uname)-$(uname -p) in
86 > case $(uname)-$(uname -m) in
87    Linux-x86_64)
88 <    ./configure linuxx8664gcc $CONFIG_ARGS --enable-oracle --with-oracle-libdir=${ORACLE_ROOT}/lib --with-oracle-incdir=${ORACLE_ROOT}/include --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff --disable-cern;;
88 >    ./configure linuxx8664gcc $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift --disable-astiff;;
89    Linux-i*86)
90 <    ./configure linux  $CONFIG_ARGS --enable-oracle --with-oracle-libdir=${ORACLE_ROOT}/lib --with-oracle-incdir=${ORACLE_ROOT}/include --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
90 >    ./configure linux  $CONFIG_ARGS --with-shift-libdir=${CASTOR_ROOT}/lib --with-shift-incdir=${CASTOR_ROOT}/include/shift;;
91    Darwin*)
92 <    ./configure macosx $CONFIG_ARGS --disable-rfio;;
92 >    ./configure macosx $CONFIG_ARGS --disable-rfio --disable-builtin_afterimage ;;
93    Linux-ppc64*)
94      ./configure linux $CONFIG_ARGS --disable-rfio;;
95   esac
96  
97 < make  %makeprocesses
97 > case %cmsplatf in
98 >  osx*)
99 >   makeopts=
100 >  ;;
101 >  *)
102 >   makeopts="%makeprocesses"
103 >  ;;
104 > esac
105 >
106 > make $makeopts
107   make cintdlls
108 +
109   %install
110   # Override installers if we are using GNU fileutils cp.  On OS X
111   # ROOT's INSTALL is defined to "cp -pPR", which only works with
# Line 107 | Line 121 | fi
121   export ROOTSYS=%i
122   make INSTALL="$cp" INSTALLDATA="$cp" install
123   mkdir -p $ROOTSYS/lib/python
124 < cp -r reflex/python/genreflex $ROOTSYS/lib/python
124 > cp -r cint/reflex/python/genreflex $ROOTSYS/lib/python
125   #
126  
127   # SCRAM ToolBox toolfile
128   mkdir -p %i/etc/scram.d
129   # rootcore toolfile
130 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcore
131 < <doc type=BuildSystem::ToolDoc version=1.0>
132 < <Tool name=rootcore version=%v>
133 < <info url="http://root.cern.ch/root/"></info>
134 < <lib name=Cint>
135 < <lib name=Core>
136 < <lib name=Tree>
137 < <Client>
138 < <Environment name=ROOTCORE_BASE default="%i"></Environment>
139 < <Environment name=LIBDIR default="$ROOTCORE_BASE/lib"></Environment>
140 < <Environment name=INCLUDE default="$ROOTCORE_BASE/include"></Environment>
141 < <Environment name=INCLUDE default="$ROOTCORE_BASE/cint"></Environment>
142 < </Client>
143 < <use name=sockets>
144 < <use name=pcre>
145 < <use name=zlib>
146 < <Runtime name=PATH value="$ROOTCORE_BASE/bin" type=path>
147 < <Runtime name=ROOTSYS value="$ROOTCORE_BASE/">
148 < <Runtime name=PYTHONPATH value="$ROOTCORE_BASE/lib" type=path>
149 < </Tool>
150 < EOF_TOOLFILE
151 <
152 < # root toolfile
153 < cat << \EOF_TOOLFILE >%i/etc/scram.d/root
154 < <doc type=BuildSystem::ToolDoc version=1.0>
155 < <Tool name=root version=%v>
156 < <info url="http://root.cern.ch/root/"></info>
157 < <lib name=TreePlayer>
158 < <lib name=Gpad>
159 < <lib name=Graf3d>
160 < <lib name=Graf>
161 < <lib name=Hist>
162 < <lib name=Matrix>
163 < <lib name=Physics>
164 < <lib name=Postscript>
165 < <use name=ROOTCore>
166 < </Tool>
130 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcore.xml
131 >  <tool name="rootcore" version="%v">
132 >    <info url="http://root.cern.ch/root/"/>
133 >    <lib name="Tree"/>
134 >    <lib name="Net"/>
135 >    <lib name="Thread"/>
136 >    <lib name="MathCore"/>
137 >    <lib name="RIO"/>
138 >    <lib name="Core"/>
139 >    <lib name="Cint"/>
140 >    <client>
141 >      <environment name="ROOTCORE_BASE" default="%i"/>
142 >      <environment name="LIBDIR" default="$ROOTCORE_BASE/lib"/>
143 >      <environment name="INCLUDE" default="$ROOTCORE_BASE/include"/>
144 >      <environment name="INCLUDE" default="$ROOTCORE_BASE/cint"/>
145 >    </client>
146 >    <runtime name="PATH" value="$ROOTCORE_BASE/bin" type="path"/>
147 >    <runtime name="ROOTSYS" value="$ROOTCORE_BASE/"/>
148 >    <runtime name="PYTHONPATH" value="$ROOTCORE_BASE/lib" type="path"/>
149 >    <use name="sockets"/>
150 >    <use name="pcre"/>
151 >    <use name="zlib"/>
152 >  </tool>
153 > EOF_TOOLFILE
154 >
155 > # root toolfile, alias for rootphysics. Using rootphysics is preferred.
156 > cat << \EOF_TOOLFILE >%i/etc/scram.d/root.xml
157 >  <tool name="root" version="%v">
158 >    <info url="http://root.cern.ch/root/"/>
159 >    <use name="rootphysics"/>
160 >  </tool>
161 > EOF_TOOLFILE
162 >
163 > # roothistmatrix toolfile
164 > cat << \EOF_TOOLFILE >%i/etc/scram.d/roothistmatrix.xml
165 >  <tool name="roothistmatrix" version="%v">
166 >    <info url="http://root.cern.ch/root/"/>
167 >    <lib name="Hist"/>
168 >    <lib name="Matrix"/>
169 >    <use name="ROOTCore"/>
170 >  </tool>
171 > EOF_TOOLFILE
172 >
173 > # rootgpad toolfile
174 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgpad.xml
175 >  <tool name="rootgpad" version="%v">
176 >    <info url="http://root.cern.ch/root/"/>
177 >    <lib name="Gpad"/>
178 >    <lib name="Graf"/>
179 >    <use name="roothistmatrix"/>
180 >  </tool>
181 > EOF_TOOLFILE
182 >
183 > # rootphysics toolfile
184 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootphysics.xml
185 >  <tool name="rootphysics" version="%v">
186 >    <info url="http://root.cern.ch/root/"/>
187 >    <lib name="Physics"/>
188 >    <use name="roothistmatrix"/>
189 >  </tool>
190 > EOF_TOOLFILE
191 >
192 > # rootgraphics toolfile, identical to old "root" toolfile
193 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootgraphics.xml
194 >  <tool name="rootgraphics" version="%v">
195 >    <info url="http://root.cern.ch/root/"/>
196 >    <lib name="TreePlayer"/>
197 >    <lib name="Graf3d"/>
198 >    <lib name="Postscript"/>
199 >    <use name="rootgpad"/>
200 >  </tool>
201   EOF_TOOLFILE
202  
203   # rootcintex toolfile
204 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcintex
205 < <doc type=BuildSystem::ToolDoc version=1.0>
206 < <Tool name=rootcintex version=%v>
207 < <info url="http://root.cern.ch/root/"></info>
208 < <lib name=Cintex>
209 < <use name=ROOTRflx>
210 < <use name=ROOTCore>
211 < </Tool>
212 < EOF_TOOLFILE
213 <
214 < # rootinteractive toolfile
215 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive
216 < <doc type=BuildSystem::ToolDoc version=1.0>
217 < <Tool name=rootinteractive version=%v>
218 < <info url="http://root.cern.ch/root/"></info>
219 < <lib name=Rint>
220 < <lib name=GQt>
221 < <use name=qt>
222 < <use name=libjpg>
223 < <use name=libpng>
224 < <use name=ROOT>
225 < </Tool>
204 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootcintex.xml
205 >  <tool name="rootcintex" version="%v">
206 >    <info url="http://root.cern.ch/root/"/>
207 >    <lib name="Cintex"/>
208 >    <use name="ROOTRflx"/>
209 >    <use name="ROOTCore"/>
210 >  </tool>
211 > EOF_TOOLFILE
212 >
213 > # rootinteractive toolfile (GQt/qt lib dependencies
214 > # have been moved to rootqt.xml)
215 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootinteractive.xml
216 >  <tool name="rootinteractive" version="%v">
217 >    <info url="http://root.cern.ch/root/"/>
218 >    <lib name="Rint"/>
219 >    <lib name="Gui"/>
220 >    <use name="libjpg"/>
221 >    <use name="libpng"/>
222 >    <use name="rootgpad"/>
223 >  </tool>
224 > EOF_TOOLFILE
225 >
226 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootqt.xml
227 >  <tool name="rootqt" version="%v">
228 >    <info url="http://root.cern.ch/root/"/>
229 >    <lib name="GQt"/>
230 >    <use name="qt"/>
231 >  </tool>
232   EOF_TOOLFILE
233  
234   # rootmath toolfile
235 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath
236 < <doc type=BuildSystem::ToolDoc version=1.0>
237 < <Tool name=rootmath version=%v>
238 < <info url="http://root.cern.ch/root/"></info>
239 < <lib name=MathCore>
240 < <lib name=MathMore>
241 < <use name=ROOTCore>
242 < <use name=gsl>
189 < </Tool>
235 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmath.xml
236 >  <tool name="rootmath" version="%v">
237 >    <info url="http://root.cern.ch/root/"/>
238 >    <lib name="GenVector"/>
239 >    <lib name="MathMore"/>
240 >    <use name="ROOTCore"/>
241 >    <use name="gsl"/>
242 >  </tool>
243   EOF_TOOLFILE
244  
245   # rootminuit toolfile
246 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit
247 < <doc type=BuildSystem::ToolDoc version=1.0>
248 < <Tool name=rootminuit version=%v>
249 < <info url="http://root.cern.ch/root/"></info>
250 < <lib name=Minuit>
251 < <use name=ROOT>
199 < </Tool>
246 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit.xml
247 >  <tool name="rootminuit" version="%v">
248 >    <info url="http://root.cern.ch/root/"/>
249 >    <lib name="Minuit"/>
250 >    <use name="rootgpad"/>
251 >  </tool>
252   EOF_TOOLFILE
253  
254   # rootminuit2 toolfile
255 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit2
256 < <doc type=BuildSystem::ToolDoc version=1.0>
257 < <Tool name=rootminuit2 version=%v>
258 < <info url="http://root.cern.ch/root/"></info>
259 < <lib name=Minuit2>
260 < <use name=ROOT>
209 < </Tool>
255 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootminuit2.xml
256 >  <tool name="rootminuit2" version="%v">
257 >    <info url="http://root.cern.ch/root/"/>
258 >    <lib name="Minuit2"/>
259 >    <use name="rootgpad"/>
260 >  </tool>
261   EOF_TOOLFILE
262  
263   # rootrflx toolfile
264 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootrflx
265 < <doc type=BuildSystem::ToolDoc version=1.0>
266 < <Tool name=rootrflx version=%v>
267 < <info url="http://root.cern.ch/root/"></info>
268 < <lib name=Reflex>
269 < <Client>
270 < <Environment name=ROOTRFLX_BASE default="%i"></Environment>
271 < <Environment name=LIBDIR default="$ROOTRFLX_BASE/lib"></Environment>
272 < <Environment name=INCLUDE default="$ROOTRFLX_BASE/include"></Environment>
273 < </Client>
274 < <use name=sockets>
275 < <use name=gccxml>
276 < <Runtime name=PATH value="$ROOTRFLX_BASE/bin" type=path>
277 < <Runtime name=ROOTSYS value="$ROOTRFLX_BASE/">
278 < <Runtime name=GENREFLEX value="$ROOTRFLX_BASE/bin/genreflex">
228 < </Tool>
264 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootrflx.xml
265 >  <tool name="rootrflx" version="%v">
266 >    <info url="http://root.cern.ch/root/"/>
267 >    <lib name="Reflex"/>
268 >    <client>
269 >      <environment name="ROOTRFLX_BASE" default="%i"/>
270 >      <environment name="LIBDIR" default="$ROOTRFLX_BASE/lib"/>
271 >      <environment name="INCLUDE" default="$ROOTRFLX_BASE/include"/>
272 >    </client>
273 >    <runtime name="PATH" value="$ROOTRFLX_BASE/bin" type="path"/>
274 >    <runtime name="ROOTSYS" value="$ROOTRFLX_BASE/"/>
275 >    <runtime name="GENREFLEX" value="$ROOTRFLX_BASE/bin/genreflex"/>
276 >    <use name="sockets"/>
277 >    <use name="gccxml"/>
278 >  </tool>
279   EOF_TOOLFILE
280  
281   # roothtml toolfile
282 < cat << \EOF_TOOLFILE >%i/etc/scram.d/roothtml
283 < <doc type=BuildSystem::ToolDoc version=1.0>
284 < <Tool name=roothtml version=%v>
285 < <info url="http://root.cern.ch/root/"></info>
286 < <lib name=Html>
287 < <use name=ROOT>
238 < </Tool>
239 < EOF_TOOLFILE
240 <
241 < # rootroofit toolfile
242 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootroofit
243 < <doc type=BuildSystem::ToolDoc version=1.0>
244 < <Tool name=rootroofit version=%v>
245 < <info url="http://root.cern.ch/root/"></info>
246 < <lib name=RooFit>
247 < <use name=ROOTMinuit>
248 < <use name=ROOTHtml>
249 < </Tool>
282 > cat << \EOF_TOOLFILE >%i/etc/scram.d/roothtml.xml
283 >  <tool name="roothtml" version="%v">
284 >    <info url="http://root.cern.ch/root/"/>
285 >    <lib name="Html"/>
286 >    <use name="rootgpad"/>
287 >  </tool>
288   EOF_TOOLFILE
289  
290   # rootmlp toolfile
291 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmlp
292 < <doc type=BuildSystem::ToolDoc version=1.0>
293 < <Tool name=rootmlp version=%v>
294 < <info url="http://root.cern.ch/root/"></info>
295 < <lib name=MLP>
296 < <use name=ROOT>
259 < </Tool>
291 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootmlp.xml
292 >  <tool name="rootmlp" version="%v">
293 >    <info url="http://root.cern.ch/root/"/>
294 >    <lib name="MLP"/>
295 >    <use name="RootGraphics"/>
296 >  </tool>
297   EOF_TOOLFILE
298  
299   # roottmva toolfile
300 < cat << \EOF_TOOLFILE >%i/etc/scram.d/roottmva
301 < <doc type=BuildSystem::ToolDoc version=1.0>
302 < <Tool name=roottmva version=%v>
303 < <info url="http://root.cern.ch/root/"></info>
304 < <lib name=TMVA>
305 < <use name=ROOTMLP>
306 < </Tool>
300 > cat << \EOF_TOOLFILE >%i/etc/scram.d/roottmva.xml
301 >  <tool name="roottmva" version="%v">
302 >    <info url="http://root.cern.ch/root/"/>
303 >    <lib name="TMVA"/>
304 >    <use name="ROOTMLP"/>
305 >    <use name="rootminuit"/>
306 >  </tool>
307   EOF_TOOLFILE
308  
309   # rootthread toolfile
310 < cat << \EOF_TOOLFILE >%i/etc/scram.d/rootthread
311 < <doc type=BuildSystem::ToolDoc version=1.0>
312 < <Tool name=rootthread version=%v>
313 < <info url="http://root.cern.ch/root/"></info>
314 < <lib name=Thread>
278 < <use name=ROOTCore>
279 < </Tool>
310 > cat << \EOF_TOOLFILE >%i/etc/scram.d/rootthread.xml
311 >  <tool name="rootthread" version="%v">
312 >    <info url="http://root.cern.ch/root/"/>
313 >    <use name="ROOTCore"/>
314 >  </tool>
315   EOF_TOOLFILE
316  
317   %post
318 < %{relocateConfig}etc/scram.d/root
284 < %{relocateConfig}etc/scram.d/rootcore
285 < %{relocateConfig}etc/scram.d/rootcintex
286 < %{relocateConfig}etc/scram.d/rootinteractive
287 < %{relocateConfig}etc/scram.d/rootmath
288 < %{relocateConfig}etc/scram.d/rootminuit
289 < %{relocateConfig}etc/scram.d/rootminuit2
290 < %{relocateConfig}etc/scram.d/rootrflx
291 < %{relocateConfig}etc/scram.d/roothtml
292 < %{relocateConfig}etc/scram.d/rootroofit
293 < %{relocateConfig}etc/scram.d/rootmlp
294 < %{relocateConfig}etc/scram.d/roottmva
295 < %{relocateConfig}etc/scram.d/rootthread
318 > perl -p -i -e "s|%{instroot}|$RPM_INSTALL_PREFIX|g" $(find $RPM_INSTALL_PREFIX/%pkgrel/etc/scram.d -type f)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines