allow nonstatic build

diff --git a/Makefile.am b/Makefile.am
index 7f427e36962439ac6de39200d94d54f063b5f440..47ccc75896d24df4c53bba9ff6f686cc7c6e2763 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -146,25 +146,25 @@ zzip64-install: zzip64-install.tmp
 zzip64-install.tmp : zzip64-build.tmp
        cd zzip64 && $(MAKE) install $(_RELEASEINFO64)
        cd $(DESTDIR)$(libdir) && mv    libzzip.so   libzzip64.so
-       cd $(DESTDIR)$(libdir) && mv    libzzip.a    libzzip64.a
+       - cd $(DESTDIR)$(libdir) && mv    libzzip.a    libzzip64.a
        cd $(DESTDIR)$(libdir) && \
-        sed -e 's/zzip.so/zzip64.so/' \
-            -e 's/zzip.a/zzip64.a/'     libzzip.la > libzzip64.la
+        sed -e 's/zzip.so/zzip64.so/' -e 's/zzip.a/zzip64.a/' \
+             libzzip.la > libzzip64.la
        cd $(DESTDIR)$(libdir)/pkgconfig && \
        sed -e 's/largefile=/largefile= %_FILE_OFFSET64/' \
-           -e 's/-lzzip/-lzzip64/' \
-           -e 's/zziplib/zziplib64/'   zziplib.pc > zziplib64.pc
+           -e 's/-lzzip/-lzzip64/' -e 's/zziplib/zziplib64/' \
+            zziplib.pc > zziplib64.pc
 zzip32-postinstall:
-       cd $(DESTDIR)$(libdir) && mv    libzzip.so   libzzip32.so
-       cd $(DESTDIR)$(libdir) && mv    libzzip.a    libzzip32.a
-       cd $(DESTDIR)$(libdir) && ln -s libzzip32.so libzzip.so
-       cd $(DESTDIR)$(libdir) && ln -s libzzip32.a  libzzip.a
+       cd   $(DESTDIR)$(libdir) && mv    libzzip.so   libzzip32.so
+       - cd $(DESTDIR)$(libdir) && mv    libzzip.a    libzzip32.a
+       cd   $(DESTDIR)$(libdir) && ln -s libzzip32.so libzzip.so
+       - cd $(DESTDIR)$(libdir) && ln -s libzzip32.a  libzzip.a
        cd $(DESTDIR)$(libdir) && \
-       sed -e 's/zzip.so/zzip32.so/' \
-           -e 's/zzip.a/zzip32.a/'     libzzip.la > libzzip32.la
+       sed -e 's/zzip.so/zzip32.so/' -e 's/zzip.a/zzip32.a/' \
+           libzzip.la > libzzip32.la
        cd $(DESTDIR)$(libdir)/pkgconfig && \
-       sed -e 's/-lzzip/-lzzip32/' \
-            -e 's/zziplib/zziplib32/'  zziplib.pc > zziplib32.pc
+       sed -e 's/-lzzip/-lzzip32/' -e 's/zziplib/zziplib32/' \
+           zziplib.pc > zziplib32.pc
 zzip-postinstall:
        : "the 12.8x and 11.8x and 10.8x packages are all the same actually"
        cd $(DESTDIR)$(libdir) || exit 1 \

diff --git a/zziplib.spec b/zziplib.spec
index 8ae9bdd38f418f01e1ebb691b4678cc272b70aee..c9d0ca1f2ec1e921ab139b340efd42a07ade7a17 100644 (file)
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -33,20 +33,20 @@ Provides:     zziplib-lib010 = %version
 
 %package doc
 Summary:      ZZipLib - Documentation Files
-Group:        Development/Libraries/C and C++
+Group:        Development/Languages/C and C++
 BuildRequires: python
 BuildRequires: xmlto
 PreReq: scrollkeeper
 
 %package devel
 Summary:      ZZipLib - Development Files
-Group:        Development/Libraries/C and C++
+Group:        Development/Languages/C and C++
 Requires:     zziplib = %version
 Requires:     pkgconfig
 
 %package SDL_rwops-devel
 Summary:      ZZipLib - Development Files for SDL_rwops
-Group:        Development/Libraries/C and C++
+Group:        Development/Languages/C and C++
 Requires:     zziplib = %version
 Requires:     pkgconfig
 BuildRequires: SDL-devel
@@ -99,8 +99,8 @@ sh configure --prefix=%{_prefix} \
 %__make %{?jobs:-j%jobs} doc
 
 %check
-%__make check || exit 0
-%__make test-sdl || exit 0
+%__make check
+%__make test-sdl
 
 %install
 %__rm -rf %{buildroot}