- up to 1.4.5

diff --git a/zstd-noquiet.patch b/zstd-noquiet.patch
deleted file mode 100644 (file)
index ef036cb..0000000
--- a/zstd-noquiet.patch
+++ /dev/null
@@ -1,115 +0,0 @@
---- zstd-1.3.7/lib/Makefile.orig       2018-10-17 05:58:52.000000000 +0200
-+++ zstd-1.3.7/lib/Makefile    2018-11-14 05:40:43.128342635 +0100
-@@ -106,7 +106,7 @@
- libzstd.a: ARFLAGS = rcs
- libzstd.a: $(ZSTD_OBJ)
-       @echo compiling static library
--      @$(AR) $(ARFLAGS) $@ $^
-+      $(AR) $(ARFLAGS) $@ $^
- 
- libzstd.a-mt: CPPFLAGS += -DZSTD_MULTITHREAD
- libzstd.a-mt: libzstd.a
-@@ -125,10 +125,10 @@
- $(LIBZSTD): LDFLAGS += -shared -fPIC -fvisibility=hidden
- $(LIBZSTD): $(ZSTD_FILES)
-       @echo compiling dynamic library $(LIBVER)
--      @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
-+      $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
-       @echo creating versioned links
--      @ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
--      @ln -sf $@ libzstd.$(SHARED_EXT)
-+      ln -sf $@ libzstd.$(SHARED_EXT_MAJOR)
-+      ln -sf $@ libzstd.$(SHARED_EXT)
- 
- endif
- 
-@@ -154,13 +154,13 @@
- libzstd-nomt: $(ZSTD_NOMT_FILES)
-       @echo compiling single-thread dynamic library $(LIBVER)
-       @echo files : $(ZSTD_NOMT_FILES)
--      @$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
-+      $(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
- 
- clean:
--      @$(RM) -r *.dSYM   # macOS-specific
--      @$(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
--      @$(RM) dll/libzstd.dll dll/libzstd.lib libzstd-nomt*
--      @$(RM) common/*.o compress/*.o decompress/*.o dictBuilder/*.o legacy/*.o deprecated/*.o
-+      $(RM) -r *.dSYM   # macOS-specific
-+      $(RM) core *.o *.a *.gcda *.$(SHARED_EXT) *.$(SHARED_EXT).* libzstd.pc
-+      $(RM) dll/libzstd.dll dll/libzstd.lib libzstd-nomt*
-+      $(RM) common/*.o compress/*.o decompress/*.o dictBuilder/*.o legacy/*.o deprecated/*.o
-       @echo Cleaning library completed
- 
- #-----------------------------------------------------------------------------
-@@ -203,7 +203,7 @@ INSTALL_DATA    ?= $(INSTALL) -m 644
- libzstd.pc:
- libzstd.pc: libzstd.pc.in
-       @echo creating pkgconfig
--      @sed -e 's|@PREFIX@|$(PREFIX)|' \
-+      sed -e 's|@PREFIX@|$(PREFIX)|' \
-              -e 's|@VERSION@|$(VERSION)|' \
-              $< >$@
- 
-@@ -209,39 +209,39 @@
-       @echo zstd static and shared library installed
- 
- install-pc: libzstd.pc
--      @$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/
--      @$(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/
-+      $(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/
-+      $(INSTALL_DATA) libzstd.pc $(DESTDIR)$(PKGCONFIGDIR)/
- 
- install-static: libzstd.a
-       @echo Installing static library
--      @$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
--      @$(INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR)
-+      $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
-+      $(INSTALL_DATA) libzstd.a $(DESTDIR)$(LIBDIR)
- 
- install-shared: libzstd
-       @echo Installing shared library
--      @$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
--      @$(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
--      @ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
--      @ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
-+      $(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR)/
-+      $(INSTALL_PROGRAM) $(LIBZSTD) $(DESTDIR)$(LIBDIR)
-+      ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
-+      ln -sf $(LIBZSTD) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
- 
- install-includes:
-       @echo Installing includes
--      @$(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/
--      @$(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)
--      @$(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
--      @$(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR)     # prototypes generate deprecation warnings
--      @$(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
-+      $(INSTALL) -d -m 755 $(DESTDIR)$(INCLUDEDIR)/
-+      $(INSTALL_DATA) zstd.h $(DESTDIR)$(INCLUDEDIR)
-+      $(INSTALL_DATA) common/zstd_errors.h $(DESTDIR)$(INCLUDEDIR)
-+      $(INSTALL_DATA) deprecated/zbuff.h $(DESTDIR)$(INCLUDEDIR)     # prototypes generate deprecation warnings
-+      $(INSTALL_DATA) dictBuilder/zdict.h $(DESTDIR)$(INCLUDEDIR)
- 
- uninstall:
--      @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.a
--      @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT)
--      @$(RM) $(DESTDIR)$(LIBDIR)/libzstd.$(SHARED_EXT_MAJOR)
--      @$(RM) $(DESTDIR)$(LIBDIR)/$(LIBZSTD)
--      @$(RM) $(DESTDIR)$(PKGCONFIGDIR)/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)
-+      $(RM) $(DESTDIR)$(PKGCONFIGDIR)/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 d607c85e205966c40213cd73d9b8ab97d52451a1..6aefdaf97d0a7f5000b772fdf7abd93104ca7a72 100644 (file)
--- a/zstd.spec
+++ b/zstd.spec
@@ -1,14 +1,13 @@
 Summary:       Zstandard - fast lossless compression algorithm
 Summary(pl.UTF-8):     Zstandard - szybki, bezstratny algorytm kompresji
 Name:          zstd
-Version:       1.4.4
+Version:       1.4.5
 Release:       1
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/facebook/zstd/releases
 Source0:       https://github.com/facebook/zstd/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 532aa7b3a873e144bbbedd9c0ea87694
-Patch0:                %{name}-noquiet.patch
+# Source0-md5: 0083d997dc845d9e1fc4249f450b7ce3
 URL:           https://github.com/facebook/zstd
 BuildRequires: gcc >= 5:3.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,18 +48,19 @@ Statyczna biblioteka Zstd.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 CC="%{__cc}" \
 CFLAGS="%{rpmcflags} %{rpmcppflags}" \
 LDFLAGS="%{rpmldflags}" \
-%{__make} -j1 all
+%{__make} -j1 all \
+       V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+       V=1 \
        DESTDIR=$RPM_BUILD_ROOT \
        PREFIX=%{_prefix} \
        LIBDIR=%{_libdir}