Author: qboosh Date: Fri Apr 2 07:15:06 2010 GMT Module: packages Tag: HEAD ---- Log message: - updated to 2.11 - removed locale,pl.po-update patches, added ifdef patch
---- Files affected: packages/cpio: cpio.spec (1.78 -> 1.79) , cpio-ifdef.patch (NONE -> 1.1) (NEW), cpio-locale.patch (1.2 -> NONE) (REMOVED), cpio-pl.po-update.patch (1.4 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/cpio/cpio.spec diff -u packages/cpio/cpio.spec:1.78 packages/cpio/cpio.spec:1.79 --- packages/cpio/cpio.spec:1.78 Sat Nov 1 16:56:04 2008 +++ packages/cpio/cpio.spec Fri Apr 2 09:15:00 2010 @@ -9,20 +9,19 @@ Summary(tr.UTF-8): GNU cpio arşivleme programı Summary(uk.UTF-8): Архівна програма GNU Name: cpio -Version: 2.9 -Release: 3 +Version: 2.11 +Release: 1 License: GPL v3+ Group: Applications/Archiving Source0: http://ftp.gnu.org/gnu/cpio/%{name}-%{version}.tar.bz2 -# Source0-md5: e387abfdae3a0b9a8a5f762db653a96d +# Source0-md5: 20fc912915c629e809f80b96b2e75d7d Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: 027552f4053477462a09fadc162a5e65 Patch0: %{name}-info.patch -Patch1: %{name}-locale.patch -Patch2: %{name}-pl.po-update.patch +Patch1: %{name}-ifdef.patch URL: http://www.gnu.org/software/cpio/ -BuildRequires: autoconf >= 2.59 -BuildRequires: automake >= 1:1.8 +BuildRequires: autoconf >= 2.63 +BuildRequires: automake >= 1:1.11.1 BuildRequires: gettext-devel >= 0.16 BuildRequires: texinfo BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -104,27 +103,17 @@ %prep %setup -q -%patch2 -p1 %patch0 -p1 %patch1 -p1 -rm -f po/stamp-po - -rm m4/extensions.m4 -sed -i -e 's#gl_USE_SYSTEM_EXTENSIONS#AC_USE_SYSTEM_EXTENSIONS#g' configure.ac m4/*.m4 - -rm lib/argp*.h -for f in lib/arg*.c; do - :> $f -done - %build %{__gettextize} -%{__aclocal} -I m4 +%{__aclocal} -I m4 -I am %{__autoconf} %{__autoheader} %{__automake} -%configure +%configure \ + --disable-silent-rules %{__make} @@ -136,15 +125,19 @@ bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} +# in PLD rmt is built from tar.spec +%{__rm} $RPM_BUILD_ROOT%{_libdir}/rmt +%{__rm} $RPM_BUILD_ROOT%{_mandir}{,/es,/ja}/man1/mt.1* + %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/postshell +%post -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%postun -p /sbin/postshell +%postun -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} %files -f %{name}.lang @@ -164,6 +157,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.79 2010/04/02 07:15:00 qboosh +- updated to 2.11 +- removed locale,pl.po-update patches, added ifdef patch + Revision 1.78 2008/11/01 15:56:04 arekm - rel 3; argp hacks to get this building ================================================================ Index: packages/cpio/cpio-ifdef.patch diff -u /dev/null packages/cpio/cpio-ifdef.patch:1.1 --- /dev/null Fri Apr 2 09:15:06 2010 +++ packages/cpio/cpio-ifdef.patch Fri Apr 2 09:15:00 2010 @@ -0,0 +1,22 @@ +--- cpio-2.11/lib/system.h.orig 2010-03-10 10:27:14.000000000 +0100 ++++ cpio-2.11/lib/system.h 2010-04-01 20:11:55.744993924 +0200 +@@ -17,7 +17,7 @@ + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +-#if HAVE_CONFIG_H ++#ifdef HAVE_CONFIG_H + # include <config.h> + #endif + +--- cpio-2.11/lib/sysdep.c.orig 2010-03-10 10:27:14.000000000 +0100 ++++ cpio-2.11/lib/sysdep.c 2010-04-01 20:12:02.508993924 +0200 +@@ -21,7 +21,7 @@ + along with GNU cpiio. If not, see <http://www.gnu.org/licenses/>. */ + + +-#if HAVE_CONFIG_H ++#ifdef HAVE_CONFIG_H + # include <config.h> + #endif + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cpio/cpio.spec?r1=1.78&r2=1.79&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
