- rel 4 for th

[packages/autoconf.git] / autoconf.spec

diff --git a/autoconf.spec b/autoconf.spec
index bfae809115563604c44f767d3d060d96ab9c5ab6..3f5b4300c6e0e840304bb8e10ba82f24c415dd55 100644 (file)
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -1,11 +1,11 @@
 #
 # Conditional build:
-# _without_emacs       - without emacs autoconf-mode
-# _without_xemacs      - without XEmacs autoconf-mode
+%bcond_without emacs   # without emacs autoconf-mode
+%bcond_without xemacs  # without XEmacs autoconf-mode
+#
+%undefine      with_emacs
+%undefine      with_xemacs
 #
-%define                _without_emacs  yes
-%define                _without_xemacs yes
-
 %include       /usr/lib/rpm/macros.perl
 Summary:       GNU autoconf - source configuration tools
 Summary(de):   Ein GNU-Hilfsmittel für Quellencode automatisch konfigurieren
@@ -18,36 +18,38 @@ Summary(pt_BR):     GNU autoconf - ferramentas de configura
 Summary(ru):   GNU autoconf - Á×ÔÏËÏÎÆÉÇÕÒÁÔÏÒ ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×
 Summary(uk):   GNU autoconf - Á×ÔÏËÏÎƦÇÕÒÁÔÏÒ ×ÉȦÄÎÉÈ ÔÅËÓÔ¦×
 Name:          autoconf
-Version:       2.58
-Release:       1.2
+Version:       2.59
+Release:       4
 License:       GPL
 Group:         Development/Building
 # stable releases:
 Source0:       ftp://ftp.gnu.org/gnu/autoconf/%{name}-%{version}.tar.bz2
-# Source0-md5: db3fa3069c6554b3505799c7e1022e2b
+# Source0-md5: 1ee40f7a676b3cfdc0e3f7cd81551b5f
 # devel releases:
 #Source0:      ftp://alpha.gnu.org/pub/gnu/autoconf/%{name}-%{version}.tar.bz2
 Patch0:                %{name}-mawk.patch
 Patch1:                %{name}-version.patch
 Patch2:                %{name}-info.patch
 Patch3:                %{name}-AC_EGREP.patch
-Patch4:                %{name}-bashism.patch
+Patch4:                %{name}-cxxcpp-warnonly.patch
+Patch5:                %{name}-sh.patch
 URL:           http://www.gnu.org/software/autoconf/
 BuildConflicts:        m4 = 1.4o
-%{!?_without_emacs:BuildRequires:      emacs}
+%{?with_emacs:BuildRequires:   emacs}
 BuildRequires: m4 >= 1:1.4p-0.pre2.2
 BuildRequires: rpm-perlprov
 BuildRequires: texinfo >= 4.2
-%{!?_without_xemacs:BuildRequires:     xemacs}
+%{?with_xemacs:BuildRequires:  xemacs}
 Conflicts:     gettext < 0.10.38-3
 Requires:      /bin/awk
 Requires:      diffutils
-Requires:      m4 >= 1:1.4p-0.pre2.2
+#Requires:     m4 >= 1:1.4p-0.pre2.2
+%requires_eq   m4
 Requires:      mktemp
 BuildArch:     noarch
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     autoconf252
 Obsoletes:     autoconf253
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _libdir         %{_datadir}
 
@@ -201,13 +203,14 @@ Tryb edycji autoconf dla emacsa.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p0
 
 %build
 %configure \
-       %{!?_without_xemacs:EMACS=xemacs}
+       %{?with_xemacs:EMACS=xemacs}
 %{__make}
 
 %install
@@ -215,18 +218,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-%if 0%{!?_without_xemacs:1}
+%if %{with xemacs}
        lispdir=%{_datadir}/xemacs-packages/autoconf
 %endif
 
-%if 0%{!?_without_xemacs:1}
+%if %{with xemacs}
 xemacs -batch -no-autoloads -l autoload -f batch-update-directory \
        $RPM_BUILD_ROOT%{_datadir}/xemacs-packages/autoconf
 xemacs -batch -vanilla -f batch-byte-compile \
        $RPM_BUILD_ROOT%{_datadir}/xemacs-packages/autoconf/auto-autoloads.el
 %endif
 
-%if 0%{!?_without_emacs:%{!?_without_xemacs:1}}
+%if %{with emacs} && %{with xemacs}
 rm lib/emacs/*.elc
 %{__make} -C lib/emacs install-dist_lispLISP \
        DESTDIR=$RPM_BUILD_ROOT \
@@ -251,13 +254,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/*.info*
 %{_mandir}/man1/*
 
-%if 0%{!?_without_emacs:1}
+%if %{with emacs}
 %files -n emacs-autoconf-mode-pkg
 %defattr(644,root,root,755)
 %{_emacs_lispdir}/autoconf/*.elc
 %endif
 
-%if 0%{!?_without_xemacs:1}
+%if %{with xemacs}
 %files -n xemacs-autoconf-mode-pkg
 %defattr(644,root,root,755)
 %dir %{_datadir}/xemacs-packages/autoconf