updated 2 packages

createrepo_c-0.17.4-1

file-5.40-2

c/createrepo_c/createrepo_c-vl.spec

@@ -9,7 +9,7 @@
 
 Summary:        Creates a common metadata repository
 Name:           createrepo_c
-Version:        0.17.0
+Version:        0.17.4
 Release:        1%{?_dist_release}
 Group:          admin-tools
 Vendor:         Project Vine
@@ -87,29 +87,24 @@ Python 3 bindings for the createrepo_c library.
 
 %prep
 %setup -q
-mkdir build
 
 
 %build
 # Build createrepo_c with Python
-pushd build
-%cmake ../ \
+%cmake \
 	-DPYTHON_DESIRED:FILEPATH=%{__python3} \
 	-DWITH_ZCHUNK=OFF \
 	-DWITH_LIBMODULEMD=OFF \
 	-DENABLE_DRPM=OFF
 
-make %{?_smp_mflags} RPM_OPT_FLAGS="%{optflags}"
+%cmake_build
 # Build C documentation
-make doc-c
-popd
+make -C %{_vpath_builddir} doc-c
 
 
 %install
 rm -rf %{buildroot}
-pushd build
-  make install DESTDIR=%{buildroot}
-popd
+%cmake_install
 
 ln -sr %{buildroot}%{_bindir}/createrepo_c %{buildroot}%{_bindir}/createrepo
 ln -sr %{buildroot}%{_bindir}/mergerepo_c %{buildroot}%{_bindir}/mergerepo
@@ -117,16 +112,8 @@ ln -sr %{buildroot}%{_bindir}/modifyrepo_c %{buildroot}%{_bindir}/modifyrepo
 
 
 %check
-pushd build
-  # Compile C tests
-  make tests
-  # Run Python3 tests
-  make ARGS="-V" test
-popd
-
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+make -C %{_vpath_builddir} tests
+%ctest ARGS="-V"
 
 
 %files
@@ -165,6 +152,10 @@ popd
 
 
 %changelog
+* Thu Aug 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.17.4-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.17.0-1
 - new upstream release.
 

f/file/file-vl.spec

@@ -4,7 +4,7 @@ Summary:        A utility for determining file types.
 Summary(ja):    ファイルの種類を判別するユーティリティー
 Name:           file
 Version:        5.40
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -24,8 +24,15 @@ Source10: magic.printer-j
 Patch0: file-localmagic.patch
 
 # not yet upstream
-Patch3: file-4.17-rpm-name.patch
-Patch4: file-5.04-volume_key.patch
+Patch1: file-4.17-rpm-name.patch
+Patch2: file-5.04-volume_key.patch
+
+# Upstream commit 9b0459afab309a82aa4e46f73a4e50dd641f3d39
+Patch3: file-5.40-magic-xzip.patch
+# Upstream commit f06015040e7ffb3be21bb7622f9f8291b749aaf9
+Patch4: file-5.40-magic-unsigned.patch
+# Upstream commit 7d9b0f0d853957ad88dae0f440fecd58d2740ca7
+Patch5: file-5.40-magic-python.patch
 
 # Vine
 Patch1000: file-5.14-magicbuild-fix.patch
@@ -98,13 +105,7 @@ file(1) command.
 %prep
 %setup -q -n file-FILE%{altver}
 autoreconf -ivf
-# Don't use -b -- it will lead to problems when compiling magic file!
-%patch0 -p1
-%patch3 -p1
-%patch4 -p1
-
-# Vine
-%patch1000 -p1
+%autopatch -p1
 
 cat %{SOURCE10} >> ./magic/Localstuff
 
@@ -161,10 +162,17 @@ cd python
 #  cp %SOURCE1 .%{_datadir}/magic.mime
 #}
 
-# remove unuse files
+# remove unused files
 rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
+%ifarch x86_64
+%check
+export LD_LIBRARY_PATH=$PWD/src/.libs
+make -C tests check
+%endif
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -204,6 +212,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.40-2
+- renumbered patches.
+- imported Patch3-5 from upstream.
+
 * Wed Apr 21 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.40-1
 - new upstream release.
 - dropped ldconfig scriptlets.