From e95d5a79519fe49b56d5e3a34edc37367dfea60a Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 26 Oct 2005 14:10:29 +0000 Subject: [PATCH] update to 4.6 --- .cvsignore | 1 + sharutils.spec | 41 +++++++++-------------------------------- sources | 2 +- 3 files changed, 11 insertions(+), 33 deletions(-) diff --git a/.cvsignore b/.cvsignore index 79f4b99..d9ec73b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ sharutils-4.2.1.tar.gz +sharutils-4.6.tar.bz2 diff --git a/sharutils.spec b/sharutils.spec index cd43315..1d6443b 100644 --- a/sharutils.spec +++ b/sharutils.spec @@ -1,22 +1,11 @@ Summary: The GNU shar utilities for packaging and unpackaging shell archives. Name: sharutils -Version: 4.2.1 -Release: 27 +Version: 4.6 +Release: 1 License: GPL Group: Applications/Archiving -Source: ftp://prep.ai.mit.edu/pub/gnu/sharutils/sharutils-%{version}.tar.gz -Patch1: sharutils-4.2-gmo.patch -Patch2: sharutils-4.2-man.patch -Patch3: sharutils-4.2-po.patch -Patch4: sharutils-4.2-share.patch -Patch5: sharutils-4.2-uudecode.patch -Patch6: sharutils-4.2.1-mktemp.patch -Patch7: sharutils-4.2.1-uudecode.patch -Patch8: sharutils-opto.dif -Patch9: sharutils-4.2.1-sec.patch -Patch10: sharutils-4.2.1-getcwd.patch -Patch11: sharutils-4.2.1-CAN-2005-0990.patch - +Source: ftp://ftp.gnu.org/gnu/sharutils/REL-%{version}/sharutils-%{version}.tar.bz2 +URL: http://www.gnu.org/software/sharutils/ BuildRequires: gettext Prereq: /sbin/install-info Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -38,17 +27,6 @@ Install sharutils if you send binary files through e-mail. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p0 -b .ooption -%patch9 -p1 -%patch10 -p1 -b .getcwd -%patch11 -p1 -b .CAN-2005-0990 %build %configure @@ -57,12 +35,7 @@ make %install rm -rf ${RPM_BUILD_ROOT} -%makeinstall install-man -gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/{sharutils*,remsync*} - -# fix jp location -mv ${RPM_BUILD_ROOT}%{_datadir}/locale/ja_JP.EUC \ - ${RPM_BUILD_ROOT}%{_datadir}/locale/ja +%makeinstall %find_lang %{name} @@ -79,11 +52,15 @@ rm -rf ${RPM_BUILD_ROOT} %files -f %{name}.lang %defattr(-,root,root) +%attr(644,root,root) %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO %{_bindir}/* %{_infodir}/*info* %{_mandir}/*/* %changelog +* Wed Oct 26 2005 Than Ngo 4.6-1 +- update to 4.6 + * Mon Apr 11 2005 Than Ngo 4.2.1-27 - apply debian patch to fix insecure temporary file creation in unshar #154049, CAN-2005-0990 diff --git a/sources b/sources index 11bb86c..5b18df7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8ba1d409f07edcb335ff72a27bd9828 sharutils-4.2.1.tar.gz +c081e3acfeab71cf76dca79f8f76c62d sharutils-4.6.tar.bz2