- updated to 1.0.0 (note: new soname)

- updated noquiet,no32 patches

diff --git a/zstd-no32.patch b/zstd-no32.patch
index 0d533fe38868e8a6980d2646b208ab8c977e2e10..5ade0354aaf4c1986fc29002c3d4a479f5a411c5 100644 (file)
--- a/zstd-no32.patch
+++ b/zstd-no32.patch
@@ -1,11 +1,13 @@
---- zstd-0.5.1/programs/Makefile.orig  2016-02-18 12:04:02.000000000 +0100
-+++ zstd-0.5.1/programs/Makefile       2016-04-09 17:53:32.607921888 +0200
-@@ -82,7 +82,7 @@
+--- zstd-1.0.0/Makefile.orig   2016-08-31 18:09:10.000000000 +0200
++++ zstd-1.0.0/Makefile        2016-09-16 20:33:14.848164855 +0200
+@@ -25,8 +25,8 @@
  
- default: zstd
+ all:
+       $(MAKE) -C $(ZSTDDIR) $@
+-      $(MAKE) -C $(PRGDIR) $@ zstd32
+-      $(MAKE) -C $(TESTDIR) $@ all32
++      $(MAKE) -C $(PRGDIR) $@
++      $(MAKE) -C $(TESTDIR) $@
  
--all: zstd zstd32 fullbench fullbench32 fuzzer fuzzer32 zbufftest zbufftest32 paramgrill datagen
-+all: zstd fullbench fuzzer zbufftest paramgrill datagen
- 
- zstd  : $(ZSTD_FILES) $(ZSTD_FILES_LEGACY) $(ZSTDDIR)/zbuff.c $(ZSTDDIR)/zdict.c $(ZSTDDIR)/divsufsort.c \
-         zstdcli.c fileio.c bench.c xxhash.c datagen.c dibio.c
+ zstd:
+       $(MAKE) -C $(PRGDIR)

diff --git a/zstd-noquiet.patch b/zstd-noquiet.patch
index 31669b51776ccf8771a26c71c8eeba8190c8a628..ee3438313e637f2ac0987f2d2406b2d494f79b2e 100644 (file)
--- a/zstd-noquiet.patch
+++ b/zstd-noquiet.patch
@@ -1,6 +1,6 @@
---- zstd-0.5.1/lib/Makefile.orig       2016-02-18 12:04:02.000000000 +0100
-+++ zstd-0.5.1/lib/Makefile    2016-04-09 17:32:37.197974571 +0200
-@@ -85,16 +85,16 @@
+--- zstd-1.0.0/lib/Makefile.orig       2016-09-16 19:05:28.934891649 +0200
++++ zstd-1.0.0/lib/Makefile    2016-09-16 19:14:06.861552399 +0200
+@@ -63,17 +63,17 @@
  
  libzstd: $(ZSTD_FILES)
        @echo compiling static library
@@ -19,11 +19,13 @@
  
  clean:
 -      @rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
+-      @rm -f decompress/*.o
 +      rm -f core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
++      rm -f decompress/*.o
        @echo Cleaning library completed
  
  #------------------------------------------------------------------------
-@@ -104,33 +104,33 @@
+@@ -83,22 +83,22 @@
  libzstd.pc:
  libzstd.pc: libzstd.pc.in
        @echo creating pkgconfig
@@ -42,8 +44,8 @@
 -      @cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
 -      @install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
 -      @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
--      @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
--      @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
+-      @install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
+-      @install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
 +      install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
 +      install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
 +      cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
@@ -51,27 +53,23 @@
 +      cp -a libzstd.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
 +      install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)/libzstd.a
 +      install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zstd.h
-+      install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
-+      install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
++      install -m 644 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
++      install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
        @echo zstd static and shared library installed
  
  uninstall:
--      @rm -f $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
--      @rm -f $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
--      @rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/libzstd.pc
--      @[ -x $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER) ] && rm -f $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
--      @[ -f $(DESTDIR)$(LIBDIR)/libzstd.a ] && rm -f $(DESTDIR)$(LIBDIR)/libzstd.a
--      @[ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zstd.h
--      @[ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zbuff.h
--      @[ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zdict.h
-+      rm -f $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
-+      rm -f $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
-+      rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/libzstd.pc
-+      [ -x $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER) ] && rm -f $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
-+      [ -f $(DESTDIR)$(LIBDIR)/libzstd.a ] && rm -f $(DESTDIR)$(LIBDIR)/libzstd.a
-+      [ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zstd.h
-+      [ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zbuff.h
-+      [ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && rm -f $(DESTDIR)$(INCLUDEDIR)/zdict.h
+@@ -106,10 +106,10 @@
+       $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
+       $(RM) $(DESTDIR)$(LIBDIR)/pkgconfig/libzstd.pc
+       [ -x $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER) ] && $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
+-      @[ -f $(DESTDIR)$(LIBDIR)/libzstd.a ] && $(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
+-      @[ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
+-      @[ -f $(DESTDIR)$(INCLUDEDIR)/zbuff.h ] && $(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h
+-      @[ -f $(DESTDIR)$(INCLUDEDIR)/zdict.h ] && $(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
++      [ -f $(DESTDIR)$(LIBDIR)/libzstd.a ] && $(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
++      [ -f $(DESTDIR)$(INCLUDEDIR)/zstd.h ] && $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
++      [ -f $(DESTDIR)$(INCLUDEDIR)/zbuff.h ] && $(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h
++      [ -f $(DESTDIR)$(INCLUDEDIR)/zdict.h ] && $(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
        @echo zstd libraries successfully uninstalled
  
  endif

diff --git a/zstd.spec b/zstd.spec
index b7e81f36f0a9d617c47664f2eaff60b5baaeb85c..9f76a297bfaacdd8dc114485008572e747cda320 100644 (file)
--- a/zstd.spec
+++ b/zstd.spec
@@ -1,13 +1,13 @@
 Summary:       Zstandard - fast lossless compression algorithm
 Summary(pl.UTF-8):     Zstandard - szybki, bezstratny algorytm kompresji
 Name:          zstd
-Version:       0.5.1
+Version:       1.0.0
 Release:       1
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/Cyan4973/zstd/releases
 Source0:       https://github.com/Cyan4973/zstd/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 0f972162c5ec73d04bb2243d520d18f0
+# Source0-md5: ca9a01cd81265ac235acdf611a25122e
 Patch0:                %{name}-noquiet.patch
 Patch1:                %{name}-no32.patch
 Patch2:                %{name}-noclean.patch
@@ -82,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/zstd
 %attr(755,root,root) %{_bindir}/zstdcat
 %attr(755,root,root) %{_libdir}/libzstd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libzstd.so.0
+%attr(755,root,root) %ghost %{_libdir}/libzstd.so.1
 %{_mandir}/man1/unzstd.1*
 %{_mandir}/man1/zstd.1*
 %{_mandir}/man1/zstdcat.1*