Browse Source

updated 4 packages

gzip-1.10-1

mingetty-1.08-3

passwd-0.80-1

webkitgtk4-2.28.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12332 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
1a8cfb3acc
4 changed files with 57 additions and 31 deletions
  1. 33 18
      g/gzip/gzip-vl.spec
  2. 7 3
      m/mingetty/mingetty-vl.spec
  3. 12 5
      p/passwd/passwd-vl.spec
  4. 5 5
      w/webkitgtk4/webkitgtk4-vl.spec

+ 33 - 18
g/gzip/gzip-vl.spec

@@ -1,21 +1,21 @@
 Summary: The GNU data compression program.
 Summary(ja): GNU データ圧縮プログラム
 Name: gzip
-Version: 1.6
+Version: 1.10
 Release: 1%{?_dist_release}
-License: GPLv3+ and GFDL
 Group: Applications/Archiving
+License: GPLv3+ and GFDL
 URL: http://www.gzip.org/
 
-Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.xz
-Patch0: gzip-1.3.12-openbsd-owl-tmp.patch
-Patch1: gzip-1.3.5-zforce.patch
-Patch5: gzip-1.3.13-rsync.patch
+Source: https://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz
+Source1: https://www.gnu.org/licenses/fdl-1.3.txt
 
-Patch14: gzip-1.3.5-cve-2006-4338.patch
-Patch15: gzip-1.3.13-cve-2006-4337.patch
-Patch16: gzip-1.3.5-cve-2006-4337_len.patch
+# downstream solution for coloured z*grep (#1034839)
+Source100: colorzgrep.csh
+Source101: colorzgrep.sh
 
+Patch1: gnulib.patch
+Patch2: gzexe.patch
 
 Requires(post): install-info
 Requires(preun): install-info
@@ -44,22 +44,23 @@ gzip は大変一般的に使われる圧縮プログラムなので,Linux シ
 
 %prep
 %setup -q
-%patch0 -p1 -b .owl-tmp
-%patch1 -p1 -b .zforce
-%patch5 -p1 -b .rsync
 
-%patch14 -p1 -b .4338
-%patch15 -p1 -b .4337
-%patch16 -p1 -b .4337_len
+#%patch1 -p1 -b .gnulib
+%patch2 -p1 -b .gzexe
+cp %{SOURCE1} .
 
+autoreconf
 
 %build
-export DEFS="-DNO_ASM"
+export DEFS="NO_ASM"
 export CPPFLAGS="-DHAVE_LSTAT"
+export CC="%{__cc}"
+export CPP="%{__cpp}"
+export CXX="%{__cxx}"
 %configure  --bindir=/bin
 make %{?_smp_mflags}
-# make 
-# make gzip.info
+make check
+#make gzip.info
 
 
 %clean
@@ -89,6 +90,12 @@ cat > $RPM_BUILD_ROOT%{_bindir}/zless <<EOF
 EOF
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/zless
 
+# coloured z*grep (#1034839)
+%global profiledir %{_sysconfdir}/profile.d
+mkdir -p %{buildroot}%{profiledir}
+install -p -m 644 %{SOURCE100} %{buildroot}%{profiledir}
+install -p -m 644 %{SOURCE101} %{buildroot}%{profiledir}
+
 
 %post
 /sbin/install-info %{_infodir}/gzip.info.gz %{_infodir}/dir 
@@ -101,14 +108,22 @@ fi
 
 %files
 %defattr(-,root,root)
+%license COPYING fdl-1.3.txt
 %doc NEWS README AUTHORS ChangeLog THANKS TODO
 /bin/*
 %{_bindir}/*
 %{_mandir}/*/*
 %{_infodir}/gzip.info*
+%{profiledir}/*
 
 
 %changelog
+* Sun Mar 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10-1
+- new upstream release.
+- dropped all patches.
+- imported Patch1 and 2 from rawhide.
+- imported Source1, 100 and 101 from rawhide.
+
 * Sun Jan 19 2014 Daisuke SUZUKI <daisuke@linux.or.jp> 1.6-1
 - update to 1.6
 - add BR: texinfo

+ 7 - 3
m/mingetty/mingetty-vl.spec

@@ -3,9 +3,10 @@ Summary(ja): 仮想コンソール専用の コンパクトな getty プログ
 Name:        mingetty
 Version:     1.08
 License:     GPL
-Release:     2%{?_dist_release}
+Release:     3%{?_dist_release}
 Group:       System Environment/Base
-Source0:     ftp://jurix.jura.uni-sb.de/pub/linux/source/system/daemons/mingetty-%{version}.tar.gz
+URL:         https://sourceforge.net/projects/mingetty/
+Source0:     https://downloads.sourceforge.net/project/mingetty/mingetty/%{version}/mingetty-%{version}.tar.gz
 Patch:       mingetty-1.00-opt.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-root
 
@@ -45,12 +46,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc COPYING 
+%license COPYING 
 /sbin/mingetty
 %{_mandir}/man8/mingetty.*
 
 
 %changelog
+* Sun Mar 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.08-3
+- rebuilt with current environment.
+
 * Sun Feb 02 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.08-2
 - rebuild with VineSeed environment
 

+ 12 - 5
p/passwd/passwd-vl.spec

@@ -3,13 +3,14 @@
 Summary: The passwd utility for setting/changing passwords using PAM.
 Summary(ja): PAM を使用する、パスワードユーティリティ
 Name: passwd
-Version: 0.79
+Version: 0.80
 Release: 1%{?_dist_release}
-License: BSD
 Group: System Environment/Base
-Source: passwd-%{version}.tar.bz2
+License: BSD
+URL:    https://pagure.io/passwd
+Source: https://pagure.io/passwd/archive/passwd-%{version}/passwd-passwd-%{version}.tar.gz
 
-Buildroot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-root
 Requires: pam >= 0.99, /etc/pam.d/system-auth
 BuildRequires: glib2-devel, libuser-devel, pam-devel
 BuildRequires: popt-devel
@@ -30,7 +31,9 @@ passwdパッケージはパスワードを設定/変更する為のユーティ
 passwdは、PAM(Pluggable Authentication Modules)を使用します。
 
 %prep
-%setup -q
+%setup -q -n passwd-passwd-%{version}
+
+autoreconf -ivf
 
 %build
 %configure \
@@ -56,12 +59,16 @@ install -m 644 passwd.pamd $RPM_BUILD_ROOT/etc/pam.d/passwd
 rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
+%license COPYING
 %defattr(-,root,root)
 %config /etc/pam.d/passwd
 %attr(4511,root,root) %{_bindir}/passwd
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Sun Mar 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.80-1
+- updated to 0.80.
+
 * Sun May 25 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 0.79-1
 - update to 0.79
 

+ 5 - 5
w/webkitgtk4/webkitgtk4-vl.spec

@@ -8,7 +8,7 @@
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
 Name:           webkitgtk4
-Version:        2.26.1
+Version:        2.28.0
 Release:        1%{?_dist_release}
 Summary:        GTK+ Web content engine library
 
@@ -20,9 +20,6 @@ Distribution:   Vine Linux
 
 Source0:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 
-# from upstream
-Patch1:         WebKit-icu-65.1-fix.patch
-
 %if %{with clang}
 BuildRequires:  clang
 BuildRequires:  lld
@@ -116,7 +113,6 @@ files for developing applications that use JavaScript engine from %{name}.
 
 %prep
 %setup -q -n webkitgtk-%{version}
-%patch1 -p1 -b .icu65
 
 # Remove bundled libraries
 rm -rf Source/ThirdParty/leveldb/
@@ -224,6 +220,10 @@ DESTDIR=%{buildroot} ninja -C %{_target_platform} install
 %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
 
 %changelog
+* Sun Mar 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.28.0-1
+- new upstream release.
+- dropped Patch1: fixed in upstream.
+
 * Sun Oct 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.26.1-1
 - new upstream release.
 - built with icu-65.