- up to 0.33

Changed files:
    chmlib-LIBDIR.patch -> 1.2
    chmlib-morearchs.patch -> 1.2
    chmlib.spec -> 1.15

diff --git a/chmlib-LIBDIR.patch b/chmlib-LIBDIR.patch
index 137d14db76e37e343adf555c6f8cd3e8f3e91e52..599ce1b76ba82dbbd220ed82a77eed839b3cab38 100644 (file)
--- a/chmlib-LIBDIR.patch
+++ b/chmlib-LIBDIR.patch
@@ -1,46 +1,47 @@
---- Makefile~  2002-10-10 05:25:54.000000000 +0200
-+++ Makefile   2004-12-27 17:05:51.482129376 +0100
-@@ -10,6 +10,7 @@
- CFLAGS=-DCHM_MT -DCHM_USE_PREAD -DCHM_USE_IO64 -g -DDMALLOC_DISABLE
- LDFLAGS=-lpthread
- INSTALLPREFIX=/usr/local/
+diff -urN chmlib.orig/Makefile chmlib/Makefile
+--- chmlib.orig/Makefile       2004-07-05 15:04:04.000000000 +0200
++++ chmlib/Makefile    2004-07-05 15:02:57.000000000 +0200
+@@ -11,6 +11,7 @@
+ CFLAGS=-g -O2 -DCHM_MT -DCHM_USE_PREAD -DCHM_USE_IO64 -DDMALLOC_DISABLE 
+ LDFLAGS= -lpthread
+ INSTALLPREFIX=/usr/local
 +LIBDIR=/usr/local/lib
- CC=gcc-3.2
- LD=gcc-3.2
- LIBTOOL=libtool
-@@ -24,28 +25,28 @@
-       ${LIBTOOL} ${CC} -c -o $@ $^ ${CFLAGS}
- 
- libchm.la: chm_lib.lo lzx.lo
--      ${LIBTOOL} ${LD} -o $@ $^ ${LDFLAGS} -rpath ${INSTALLPREFIX}/lib
-+      ${LIBTOOL} ${LD} -o $@ $^ ${LDFLAGS} -rpath ${LIBDIR}
- 
- install: libchm.la
-       chmod a+r libchm.la
--      ${LIBTOOL} --mode=install ${CP} libchm.la ${INSTALLPREFIX}/lib
-+      ${LIBTOOL} --mode=install ${CP} libchm.la ${LIBDIR}
-       ${CP} chm_lib.h ${INSTALLPREFIX}/include
+ CC=gcc
+ top_builddir=
+ ifeq ($(top_builddir),)
+@@ -27,28 +28,28 @@
+       ${LIBTOOL} --mode=compile ${CC} -c -o $@ $^ ${CFLAGS}
+ 
+ src/libchm.la: src/chm_lib.lo src/lzx.lo
+-      ${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath ${INSTALLPREFIX}/lib
++      ${LIBTOOL} --mode=link ${CC} -o $@ $^ ${LDFLAGS} -rpath ${LIBDIR}
+ 
+ install: src/libchm.la
+       chmod a+r src/libchm.la
+-      ${LIBTOOL} --mode=install cp src/libchm.la ${INSTALLPREFIX}/lib
++      ${LIBTOOL} --mode=install cp src/libchm.la ${LIBDIR}
+       cp src/chm_lib.h ${INSTALLPREFIX}/include
  
  clean:
-       rm -fr libchm.la *.o *.lo .libs ${EXAMPLES}
+       rm -fr src/libchm.la src/*.o src/*.lo .libs src/.libs src/${EXAMPLES}
  
- test_chmLib: test_chmLib.c
+ test_chmLib: src/test_chmLib.c
 -      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
 +      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
  
- enum_chmLib: enum_chmLib.c
+ enum_chmLib: src/enum_chmLib.c
 -      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
 +      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
  
- enumdir_chmLib: enumdir_chmLib.c
+ enumdir_chmLib: src/enumdir_chmLib.c
 -      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
 +      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
  
- extract_chmLib: extract_chmLib.c
+ extract_chmLib: src/extract_chmLib.c
 -      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm ${CFLAGS}
 +      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm ${CFLAGS}
  
- chm_http: chm_http.c
+ chm_http: src/chm_http.c
 -      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${INSTALLPREFIX}/lib -lchm -lpthread ${CFLAGS}
 +      ${CC} -o $@ $^ -I${INSTALLPREFIX}/include -L${LIBDIR} -lchm -lpthread ${CFLAGS}
  

diff --git a/chmlib-morearchs.patch b/chmlib-morearchs.patch
index 36f3aaf7dc9e615bd0fe123685c60dabda8a6766..91058652c0dd5c2406150ce9098a44d30d73a3d6 100644 (file)
--- a/chmlib-morearchs.patch
+++ b/chmlib-morearchs.patch
@@ -1,11 +1,12 @@
---- chmlib-0.31/chm_lib.c.orig 2003-11-19 08:55:04.000000000 +0000
-+++ chmlib-0.31/chm_lib.c      2003-11-19 09:17:01.000000000 +0000
-@@ -142,14 +142,15 @@
- /* I386, 32-bit, non-Windows */
+diff -urN chmlib.orig/src/chm_lib.c chmlib/src/chm_lib.c
+--- chmlib.orig/src/chm_lib.c  2004-05-03 23:29:04.000000000 +0200
++++ chmlib/src/chm_lib.c       2004-07-05 14:38:31.000000000 +0200
+@@ -157,14 +157,15 @@
  /* Sparc        */
  /* MIPS         */
--#elif __i386__ || __sun || __sgi
-+#elif __i386__ || __sun || __sgi || __linux__
+ /* PPC          */
+-#elif __i386__ || __sun || __sgi || __ppc__
++#elif __i386__ || __sun || __sgi || __ppc__ || __linux__
 +#include <stdint.h>
  typedef unsigned char           UChar;
 -typedef short                   Int16;
@@ -23,7 +24,7 @@
  #else
  
  /* yielding an error is preferable to yielding incorrect behavior */
-@@ -1089,7 +1090,7 @@
+@@ -1123,7 +1124,7 @@
       *      that is provided for us.
       */
      struct chmPmglHeader header;
@@ -32,7 +33,7 @@
      UChar *end;
      UChar *cur;
      UChar *temp;
-@@ -1136,7 +1137,7 @@
+@@ -1165,7 +1166,7 @@
       *      that is provided for us
       */
      struct chmPmgiHeader header;
@@ -41,12 +42,3 @@
      int page=-1;
      UChar *end;
      UChar *cur;
-@@ -1244,7 +1245,7 @@
-                              Int64 *len)
- {
-     UChar buffer[8], *dummy;
--    UInt32 remain;
-+    unsigned long remain;
- 
-     /* for all but the last block, use the reset table */
-     if (block < h->reset_table.block_count-1)

diff --git a/chmlib.spec b/chmlib.spec
index 952680bc407abd85c798c0a64d044b87c469c7ee..0104d1a298ee54c35c5cef9dc2126ff7b4e5935f 100644 (file)
--- a/chmlib.spec
+++ b/chmlib.spec
@@ -1,14 +1,14 @@
 Summary:       chmlib - library designed for accessing MS ITSS files
 Summary(pl):   chmlib - biblioteka pozwalaj±ca na dostêp do plików MS ITSS
 Name:          chmlib
-Version:       0.31
-Release:       5
+Version:       0.33
+Release:       0.1
 License:       GPL
 Group:         Libraries
 Source0:       http://66.93.236.84/~jedwin/projects/chmlib/%{name}-%{version}.tbz
+# Source0-md5: 8bc84e94f1cea65005e5cb0ab40e2e86
 Patch0:                %{name}-morearchs.patch
 Patch1:                %{name}-LIBDIR.patch
-# Source0-md5: c6c9e1658f43715456e00a4893d496ed
 URL:           http://66.93.236.84/~jedwin/projects/chmlib/
 BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,18 +52,18 @@ Static version of chmlib.
 Statyczna wersja chmlib.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p1
-%patch1
+%patch1 -p1
 
 %build
 %{__make} all examples \
-       CFLAGS="%{rpmcflags} -DCHM_MT -DCHM_USE_PREAD -DCHM_USE_IO64 -L.libs" \
+       CFLAGS="%{rpmcflags} -DCHM_MT -DCHM_USE_PREAD -DCHM_USE_IO64 -Lsrc/.libs" \
        LDFLAGS="%{rpmldflags} -lpthread" \
-       CC="%{__cc}" \
        LD="%{__cc}" \
        INSTALLPREFIX="%{_prefix}" \
-       LIBDIR=%{_libdir}
+       LIBDIR=%{_libdir} 
+#      CC="%{__cc}" 
 
 %install
 rm -rf $RPM_BUILD_ROOT