OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src openpkg-web Date: 22-Jul-2003 15:39:37 Branch: HEAD Handle: 2003072214393601 Added files: openpkg-src/autoconf autoconf.patch Modified files: openpkg-src/autoconf autoconf.spec openpkg-web news.txt Removed files: openpkg-src/autoconf autoconf-2.13.patch Log: 1. use unversioned patch file; 2. correct subshell usage; 3. remove xemacs cruft Summary: Revision Changes Path 1.2 +0 -13 openpkg-src/autoconf/autoconf-2.13.patch 1.1 +13 -0 openpkg-src/autoconf/autoconf.patch 1.38 +8 -8 openpkg-src/autoconf/autoconf.spec 1.5719 +1 -0 openpkg-web/news.txt ____________________________________________________________________________ rm -f openpkg-src/autoconf/autoconf-2.13.patch <<'@@ .' Index: openpkg-src/autoconf/autoconf-2.13.patch ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 <<'@@ .' Index: openpkg-src/autoconf/autoconf.patch ============================================================================ $ cvs diff -u -r0 -r1.1 autoconf.patch --- /dev/null 2003-07-22 15:39:37.000000000 +0200 +++ autoconf.patch 2003-07-22 15:39:37.000000000 +0200 @@ -0,0 +1,13 @@ +--- autoconf-2.13/acgeneral.m4.old Tue Jan 5 14:27:37 1999 ++++ autoconf-2.13/acgeneral.m4 Thu Mar 2 12:04:32 2000 +@@ -868,6 +868,10 @@ + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break ++ elif test -f $ac_dir/shtool; then ++ ac_aux_dir=$ac_dir ++ ac_install_sh="$ac_aux_dir/shtool install -c" ++ break + fi + done + if test -z "$ac_aux_dir"; then @@ . patch -p0 <<'@@ .' Index: openpkg-src/autoconf/autoconf.spec ============================================================================ $ cvs diff -u -r1.37 -r1.38 autoconf.spec --- openpkg-src/autoconf/autoconf.spec 21 Jul 2003 14:46:03 -0000 1.37 +++ openpkg-src/autoconf/autoconf.spec 22 Jul 2003 13:39:37 -0000 1.38 @@ -37,12 +37,12 @@ Group: Development License: GPL Version: %{V_latest} -Release: 20030721 +Release: 20030722 # list of sources Source1: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{V_latest}.tar.gz Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{V_old}.tar.gz -Patch0: autoconf-%{V_old}.patch +Patch0: autoconf.patch # build information Prefix: %{l_prefix} @@ -64,8 +64,7 @@ %prep %setup0 -q -c -n autoconf-%{V_latest} %setup1 -q -T -D -a 1 - cd autoconf-%{V_old} - %{l_patch} -p0 <%{PATCH autoconf-%{V_old}.patch} + %patch0 -p0 %build ( cd autoconf-%{V_old} @@ -78,14 +77,14 @@ -e 's;\(acdatadir = $(datadir)/autoconf\);\1/old;' \ Makefile %{l_make} %{l_mflags} - ) + ) || exit $? ( cd autoconf-%{V_latest} CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ ./configure \ --prefix=%{l_prefix} %{l_make} %{l_mflags} - ) + ) || exit $? %install rm -rf $RPM_BUILD_ROOT @@ -94,11 +93,12 @@ prefix=$RPM_BUILD_ROOT%{l_prefix} mv $RPM_BUILD_ROOT%{l_prefix}/info/autoconf.info \ $RPM_BUILD_ROOT%{l_prefix}/info/autoconf-old.info - ) + ) || exit $? ( cd autoconf-%{V_latest} %{l_make} %{l_mflags} install \ prefix=$RPM_BUILD_ROOT%{l_prefix} - ) + ) || exit $? + rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/xemacs rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} @@ . patch -p0 <<'@@ .' Index: openpkg-web/news.txt ============================================================================ $ cvs diff -u -r1.5718 -r1.5719 news.txt --- openpkg-web/news.txt 22 Jul 2003 13:33:03 -0000 1.5718 +++ openpkg-web/news.txt 22 Jul 2003 13:39:36 -0000 1.5719 @@ -1,3 +1,4 @@ +22-Jul-2003: Upgraded package: P<autoconf-2.57-20030722> 22-Jul-2003: Upgraded package: P<pgp-6.5.8-20030722> 22-Jul-2003: Upgraded package: P<perl-apache-20030722-20030722> 22-Jul-2003: Upgraded package: P<dhcp-agent-0.41-20030722> @@ . ______________________________________________________________________ The OpenPKG Project www.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]