Эх сурвалжийг харах

updated 2 packages

dracut-049-2

xz-5.2.4-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12213 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 5 жил өмнө
parent
commit
42024a31a2

+ 16 - 1
d/dracut/dracut-vl.spec

@@ -9,7 +9,7 @@
 # Variables must be defined
 # Variables must be defined
 %define with_nbd                0
 %define with_nbd                0
 
 
-%define dist_free_release 1
+%define dist_free_release 2
 
 
 Name: dracut
 Name: dracut
 Version: 049
 Version: 049
@@ -56,6 +56,16 @@ Patch22: 0022.patch
 Patch23: 0023.patch
 Patch23: 0023.patch
 Patch24: 0024.patch
 Patch24: 0024.patch
 
 
+# https://github.com/dracutdevs/dracut/pull/541
+# Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1676357
+# dracut-install crash during kernel scriptlets
+Patch100: 541.patch
+
+# https://github.com/dracutdevs/dracut/pull/578
+# Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1719057
+# installer boot fails if network is required during initramfs
+Patch101: 578.patch
+
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 
 
 Source1000: dracut-warpclock.tar.gz
 Source1000: dracut-warpclock.tar.gz
@@ -120,6 +130,7 @@ Requires: grep
 Requires: kmod
 Requires: kmod
 Requires: sed
 Requires: sed
 Requires: xz
 Requires: xz
+Requires: xz-lzma-compat
 Requires: gzip
 Requires: gzip
 
 
 Recommends: grubby
 Recommends: grubby
@@ -563,6 +574,10 @@ rm -rf -- $RPM_BUILD_ROOT
 %{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
 %{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
 
 
 %changelog
 %changelog
+* Fri Sep 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 049-2
+- imported Patch100 and 101 from rawhide.
+- added R:xz-lzma-compat.
+
 * Tue Jan 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 049-1
 * Tue Jan 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 049-1
 - new upstream release.
 - new upstream release.
 
 

+ 18 - 14
x/xz/xz-vl.spec

@@ -1,17 +1,17 @@
-Summary:	LZMA compression utilities
-Summary(ja):	LZMA 圧縮ユーティリティ
-Name:		xz
-Version:	5.2.2
-Release:	1%{?_dist_release}
-License:	LGPLv2+
-Group:		Applications/Archiving
-Source0:        http://tukaani.org/%{name}/%{name}-%{version}.tar.xz
-URL:		http://tukaani.org/%{name}/
+Summary:        LZMA compression utilities
+Summary(ja):    LZMA 圧縮ユーティリティ
+Name:           xz
+Version:        5.2.4
+Release:        1%{?_dist_release}
+License:        LGPLv2+
+Group:          Applications/Archiving
+URL:            https://tukaani.org/xz/
+Source0:        https://tukaani.org/xz/%{name}-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 
 %description
 %description
 XZ Utils are an attempt to make LZMA compression easy to use on free (as in
 XZ Utils are an attempt to make LZMA compression easy to use on free (as in
@@ -90,13 +90,14 @@ rm -rf %{buildroot}
 
 
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc AUTHORS README THANKS COPYING.* ChangeLog 
+%license COPYING.*
+%doc AUTHORS README THANKS ChangeLog 
 %{_bindir}/*xz*
 %{_bindir}/*xz*
 %{_mandir}/man1/*xz*
 %{_mandir}/man1/*xz*
 
 
 %files libs -f %{name}.lang
 %files libs -f %{name}.lang
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc COPYING.*
+%license COPYING.*
 %{_libdir}/lib*.so.*
 %{_libdir}/lib*.so.*
 
 
 %files devel
 %files devel
@@ -113,6 +114,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/*lz*
 %{_mandir}/man1/*lz*
 
 
 %changelog
 %changelog
+* Fri Sep 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.2.4-1
+- new upstream release.
+
 * Thu Nov 10 2016 Toshiaki Ara <ara_t@384.jp> 5.2.2-1
 * Thu Nov 10 2016 Toshiaki Ara <ara_t@384.jp> 5.2.2-1
 - new upstream release
 - new upstream release