Browse Source

1. use unversioned patch file; 2. correct subshell usage; 3. remove xemacs cruft

master
parent
commit
ad93ce7daf
  1. 4
      autoconf/autoconf.patch
  2. 16
      autoconf/autoconf.spec

4
autoconf/autoconf-2.13.patch → autoconf/autoconf.patch

@ -1,5 +1,5 @@
--- acgeneral.m4.old Tue Jan 5 14:27:37 1999
+++ acgeneral.m4 Thu Mar 2 12:04:32 2000
--- 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"

16
autoconf/autoconf.spec

@ -37,12 +37,12 @@ Distribution: OpenPKG [CORE]
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 @@ AutoReqProv: no
%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 @@ AutoReqProv: no
-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 @@ AutoReqProv: no
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}

Loading…
Cancel
Save