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

Comparing COMP/CMSDIST/zlib.spec (file contents):
Revision 1.9 by elmer, Tue May 22 00:31:14 2007 UTC vs.
Revision 1.17 by elmer, Thu Dec 27 20:28:33 2007 UTC

# Line 1 | Line 1
1 < ### RPM external zlib 1.1.4
2 < Source: http://www.gzip.org/%n/%n-%v.tar.bz2
3 < Patch: zlib-1.1.4-shared-for-32-bit-on-x86_64
1 > ### RPM external zlib 1.2.3-CMS19
2 > Source: http://www.gzip.org/%n/%n-%realversion.tar.bz2
3 > Patch: zlib-1.2.3-shared-for-32-bit-on-x86_64
4  
5   %prep
6 < %setup -n %n-%v
6 > %setup -n %n-%realversion
7   # Apply this patch to force shared libraries to be created. The problem
8   # only appears when building 32-bit on 64-bit machines (./configure gets
9   # confused by the 'skipping /usr/lib64' message), but applying it on all
# Line 13 | Line 13 | Patch: zlib-1.1.4-shared-for-32-bit-on-x
13   %endif
14  
15   %build
16 < case $(uname) in
17 <  Darwin )
18 <    LDSHARED="gcc -dynamiclib" ./configure --shared --prefix=%i
19 <    make LIBS='libz.dylib.$(VER)' SHAREDLIB=libz.dylib # FIXME: libz.$(VER).dylib
20 <    ;;
21 <
22 <  * )
23 <    ./configure --shared --prefix=%i
24 <    make %makeprocesses
25 <    ;;
26 < esac
16 > ./configure --shared --prefix=%i
17 > make %makeprocesses
18  
19   %install
20 < case $(uname) in
21 <  Darwin ) make install LIBS='libz.dylib.$(VER)' SHAREDLIB=libz.dylib ;;
22 <  * ) make install ;;
23 < esac
24 < #
25 < #
20 > make install
21 >
22 > # SCRAM ToolBox toolfile
23 > mkdir -p %i/etc/scram.d
24 > cat << \EOF_TOOLFILE >%i/etc/scram.d/%n
25 > <doc type=BuildSystem::ToolDoc version=1.0>
26 > <Tool name=%n version=%v>
27 > <lib name=z>
28 > <client>
29 > <Environment name=ZLIB_BASE default="%i"></Environment>
30 > <Environment name=INCLUDE default="$ZLIB_BASE/include"></Environment>
31 > <Environment name=LIBDIR  default="$ZLIB_BASE/lib"></Environment>
32 > </client>
33 > </Tool>
34 > EOF_TOOLFILE
35 >
36 > %post
37 > %{relocateConfig}etc/scram.d/%n

Diff Legend

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