- updated to 1.1.2

- updated noquiet,noclean patches

diff --git a/zstd-noclean.patch b/zstd-noclean.patch
index ce83551dd8c32ba5b96f00a696c1fb052e960eae..a9d3e4441f617fee465fd058f2248f93238aaf5a 100644 (file)
--- a/zstd-noclean.patch
+++ b/zstd-noclean.patch
@@ -1,23 +1,11 @@
---- zstd-0.5.1/lib/Makefile.orig       2016-04-09 17:48:36.367934319 +0200
-+++ zstd-0.5.1/lib/Makefile    2016-04-09 17:56:18.837914911 +0200
-@@ -79,9 +79,9 @@
- 
- .PHONY: default all clean install uninstall
- 
--default: clean libzstd
-+default: libzstd
- 
--all: clean libzstd
-+all: libzstd
- 
- libzstd: $(ZSTD_FILES)
-       @echo compiling static library
-@@ -110,7 +110,7 @@
+--- zstd-1.1.2/lib/Makefile.orig       2016-12-26 12:28:15.143603624 +0100
++++ zstd-1.1.2/lib/Makefile    2016-12-26 12:30:33.816935375 +0100
+@@ -105,7 +105,7 @@
               -e 's|@VERSION@|$(VERSION)|' \
               $< >$@
  
--install: libzstd libzstd.pc
-+install:  libzstd.pc
+-install: libzstd.a libzstd libzstd.pc
++install: libzstd.a $(LIBZSTD) libzstd.pc
        install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-       install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
+       install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
        cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)

diff --git a/zstd-noquiet.patch b/zstd-noquiet.patch
index ee3438313e637f2ac0987f2d2406b2d494f79b2e..c2fc5165cb6bfd2d00388f2f049d3589c7642908 100644 (file)
--- a/zstd-noquiet.patch
+++ b/zstd-noquiet.patch
@@ -1,31 +1,44 @@
---- 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)
+--- zstd-1.1.2/lib/Makefile.orig       2016-12-26 12:13:28.026947087 +0100
++++ zstd-1.1.2/lib/Makefile    2016-12-26 12:27:54.386937195 +0100
+@@ -67,20 +67,20 @@
+ libzstd.a: ARFLAGS = rcs
+ libzstd.a: $(ZSTD_FILES)
        @echo compiling static library
 -      @$(CC) $(FLAGS) -c $^
--      @$(AR) rcs $@.a *.o
+-      @$(AR) $(ARFLAGS) $@ *.o
 +      $(CC) $(FLAGS) -c $^
-+      $(AR) rcs $@.a *.o
++      $(AR) $(ARFLAGS) $@ *.o
+ 
+ $(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden
+ $(LIBZSTD): $(ZSTD_FILES)
        @echo compiling dynamic library $(LIBVER)
--      @$(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
-+      $(CC) $(FLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
+ ifneq (,$(filter Windows%,$(OS)))
+-      @$(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -shared $^ -o dll\libzstd.dll
++      $(CC) $(FLAGS) -DZSTD_DLL_EXPORT=1 -shared $^ -o dll\libzstd.dll
+       dlltool -D dll\libzstd.dll -d dll\libzstd.def -l dll\libzstd.lib
+ else
+-      @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
++      $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
        @echo creating versioned links
--      @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
--      @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
-+      ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR)
-+      ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT)
+-      @ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
+-      @ln -sf $@ libzstd.$(SHARED_EXT)
++      ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
++      ln -sf $@ libzstd.$(SHARED_EXT)
+ endif
+ 
+ libzstd : $(LIBZSTD)
+@@ -88,8 +88,8 @@
+ lib: libzstd.a libzstd
  
  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
+-      @$(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc dll/libzstd.dll dll/libzstd.lib
+-      @$(RM) decompress/*.o
++      $(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc dll/libzstd.dll dll/libzstd.lib
++      $(RM) decompress/*.o
        @echo Cleaning library completed
  
  #------------------------------------------------------------------------
-@@ -83,22 +83,22 @@
+@@ -99,35 +99,35 @@
  libzstd.pc:
  libzstd.pc: libzstd.pc.in
        @echo creating pkgconfig
@@ -36,40 +49,48 @@
               -e 's|@VERSION@|$(VERSION)|' \
               $< >$@
  
- install: libzstd libzstd.pc
+ install: libzstd.a libzstd libzstd.pc
 -      @install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
--      @install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
+-      @install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
 -      @cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
 -      @cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
 -      @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 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
--      @install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
+-      @install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)
+-      @install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)
+-      @install -m 644 common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
+-      @install -m 644 deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR)     # prototypes generate deprecation warnings
+-      @install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
 +      install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/
-+      install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
++      install -m 755 libzstd.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)
 +      cp -a libzstd.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
 +      cp -a libzstd.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
 +      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 common/zbuff.h $(DESTDIR)$(INCLUDEDIR)/zbuff.h
-+      install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)/zdict.h
++      install -m 644 libzstd.a $(DESTDIR)$(LIBDIR)
++      install -m 644 zstd.h $(DESTDIR)$(INCLUDEDIR)
++      install -m 644 common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
++      install -m 644 deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR)     # prototypes generate deprecation warnings
++      install -m 644 dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
        @echo zstd static and shared library installed
  
  uninstall:
-@@ -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
+-      @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
+-      @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
+-      @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
+-      @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
+-      @$(RM) $(DESTDIR)$(LIBDIR)/pkgconfig/libzstd.pc
+-      @$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
+-      @$(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
+-      @$(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h   # Deprecated streaming functions
+-      @$(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
++      $(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
++      $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
++      $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
++      $(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_VER)
++      $(RM) $(DESTDIR)$(LIBDIR)/pkgconfig/libzstd.pc
++      $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd.h
++      $(RM) $(DESTDIR)$(INCLUDEDIR)/zstd_errors.h
++      $(RM) $(DESTDIR)$(INCLUDEDIR)/zbuff.h   # Deprecated streaming functions
++      $(RM) $(DESTDIR)$(INCLUDEDIR)/zdict.h
        @echo zstd libraries successfully uninstalled
  
  endif

diff --git a/zstd.spec b/zstd.spec
index 9f76a297bfaacdd8dc114485008572e747cda320..7b1d956303b63d33507da8f47a7e25c93dd11129 100644 (file)
--- a/zstd.spec
+++ b/zstd.spec
@@ -1,17 +1,17 @@
 Summary:       Zstandard - fast lossless compression algorithm
 Summary(pl.UTF-8):     Zstandard - szybki, bezstratny algorytm kompresji
 Name:          zstd
-Version:       1.0.0
+Version:       1.1.2
 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: ca9a01cd81265ac235acdf611a25122e
+#Source0Download: https://github.com/facebook/zstd/releases
+Source0:       https://github.com/facebook/zstd/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 4c57a080d194bdaac83f2d3251fc7ffc
 Patch0:                %{name}-noquiet.patch
 Patch1:                %{name}-no32.patch
 Patch2:                %{name}-noclean.patch
-URL:           https://github.com/Cyan4973/zstd
+URL:           https://github.com/facebook/zstd
 BuildRequires: gcc >= 5:3.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -77,10 +77,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README.md images
+%doc LICENSE NEWS PATENTS README.md
 %attr(755,root,root) %{_bindir}/unzstd
 %attr(755,root,root) %{_bindir}/zstd
 %attr(755,root,root) %{_bindir}/zstdcat
+%attr(755,root,root) %{_bindir}/zstdgrep
+%attr(755,root,root) %{_bindir}/zstdless
 %attr(755,root,root) %{_libdir}/libzstd.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libzstd.so.1
 %{_mandir}/man1/unzstd.1*
@@ -89,10 +91,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%doc doc/{zstd_compression_format.md,zstd_manual.html,images}
 %attr(755,root,root) %{_libdir}/libzstd.so
 %{_includedir}/zbuff.h
 %{_includedir}/zdict.h
 %{_includedir}/zstd.h
+%{_includedir}/zstd_errors.h
 %{_pkgconfigdir}/libzstd.pc
 
 %files static