[mate-common] touch up spec file and add patch for new autoconf and automake on rawhide

Dan Mashal vicodan at fedoraproject.org
Mon Jan 14 17:31:16 UTC 2013 

commit 12100936f6cdb06296149161ff4d176c9053d9b2
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Jan 14 09:30:55 2013 -0800

    touch up spec file and add patch for new autoconf and automake on rawhide

 autotools_fix.patch |   95 +++++++++++++++++++++++++++++++++++++++++++++++++++
 mate-common.spec    |   11 ++++--
 2 files changed, 103 insertions(+), 3 deletions(-)
---
diff --git a/autotools_fix.patch b/autotools_fix.patch
new file mode 100644
index 0000000..50f2bd6
--- /dev/null
+++ b/autotools_fix.patch
@@ -0,0 +1,95 @@
+diff -uNrp b/distro/archlinux/mate.csh a/distro/archlinux/mate.csh
+--- b/distro/archlinux/mate.csh	1969-12-31 16:00:00.000000000 -0800
++++ a/distro/archlinux/mate.csh	2013-01-14 09:20:14.976848462 -0800
+@@ -0,0 +1 @@
++setenv PATH ${PATH}:/opt/mate/bin
+diff -uNrp b/distro/archlinux/mate.sh a/distro/archlinux/mate.sh
+--- b/distro/archlinux/mate.sh	1969-12-31 16:00:00.000000000 -0800
++++ a/distro/archlinux/mate.sh	2013-01-14 09:20:14.976848462 -0800
+@@ -0,0 +1 @@
++export PATH=$PATH:/opt/mate/bin
+diff -uNrp b/distro/archlinux/PKGBUILD a/distro/archlinux/PKGBUILD
+--- b/distro/archlinux/PKGBUILD	1969-12-31 16:00:00.000000000 -0800
++++ a/distro/archlinux/PKGBUILD	2013-01-14 09:20:14.976848462 -0800
+@@ -0,0 +1,27 @@
++pkgname=mate-common
++pkgver=1.2.0
++pkgrel=1
++pkgdesc="Common development macros for MATE"
++arch=('any')
++license=('GPL')
++depends=()
++makedepends=()
++options=('!libtool')
++url="http://matsusoft.com.ar/projects/mate/"
++groups=('mate')
++source=()
++sha256sums=()
++
++build() {
++	# vamos a la carpeta arriba, dos niveles
++	cd "${srcdir}/../../../"
++    ./autogen.sh \
++        --prefix=/usr || return 1
++    make || return 1
++}
++
++package() {
++    cd "${srcdir}/../../../"
++    make DESTDIR="${pkgdir}" install || return 1
++    ln -s mate-autogen ${pkgdir}/usr/bin/mate-autogen.sh
++}
+diff -uNrp b/doc/Makefile.am a/doc/Makefile.am
+--- b/doc/Makefile.am	2012-10-04 01:57:32.000000000 -0700
++++ a/doc/Makefile.am	2013-01-14 09:20:14.976848462 -0800
+@@ -2,5 +2,5 @@ man_MANS = mate-autogen.1 \
+            mate-doc-common.1
+ 
+ EXTRA_DIST = $(man_MANS) \
+-             autoten.sh.example
++             autogen.sh.example
+ 
+diff -uNrp b/macros/mate-autogen a/macros/mate-autogen
+--- b/macros/mate-autogen	2012-10-04 01:57:32.000000000 -0700
++++ a/macros/mate-autogen	2013-01-14 09:20:35.609982904 -0800
+@@ -6,7 +6,7 @@ PKG_NAME=${PKG_NAME:-Package}
+ srcdir=${srcdir:-.}
+ 
+ # default version requirements ...
+-REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.53}
++REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.65}
+ REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.9}
+ REQUIRED_LIBTOOL_VERSION=${REQUIRED_LIBTOOL_VERSION:-1.4.3}
+ REQUIRED_GETTEXT_VERSION=${REQUIRED_GETTEXT_VERSION:-0.10.40}
+@@ -310,20 +310,21 @@ done
+ #tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13
+ WANT_AUTOCONF_2_5=1
+ export WANT_AUTOCONF_2_5
+-version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \
++version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53 autoconf-2.65' $REQUIRED_AUTOCONF_VERSION \
+     "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz"
+ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
+ 
+ case $REQUIRED_AUTOMAKE_VERSION in
+     1.4*) automake_progs="automake-1.4" ;;
+-    1.5*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+-    1.6*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+-    1.7*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+-    1.8*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+-    1.9*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
+-    1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;;
+-    1.11*) automake_progs="automake-1.12 automake-1.11" ;;
+-    1.12*) automake_progs="automake-1.12" ;;
++    1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
++    1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
++    1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
++    1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
++    1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
++    1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
++    1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;;
++    1.12*) automake_progs="automake-1.13 automake-1.12" ;;
++    1.13*) automake_progs="automake-1.13" ;;
+ esac
+ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
+Binary files b/macros/.mate-autogen.swp and a/macros/.mate-autogen.swp differ
diff --git a/mate-common.spec b/mate-common.spec
index 672c9f0..d927601 100644
--- a/mate-common.spec
+++ b/mate-common.spec
@@ -1,11 +1,12 @@
 Name:	mate-common
 Summary:	mate common build files
 Version:	1.5.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 License:	GPLv3+
 URL:		http://mate-desktop.org
 Source0:	http://pub.mate-desktop.org/releases/1.5/mate-common-%{version}.tar.xz
+patch0: autotools_fix.patch
 
 BuildArch: noarch
 
@@ -17,6 +18,7 @@ binaries for building all MATE desktop sub components
 
 %prep
 %setup -q
+%patch0 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -32,10 +34,13 @@ make install DESTDIR=%{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/mate-*
 %{_datadir}/aclocal/mate-*.m4
-%{_datadir}/mate-common/
-%{_mandir}/man1/mate-*
+%{_datadir}/mate-common
+%{_mandir}/man1/*
 
 %changelog
+* Mon Jan 14 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.5.0-2
+- Add patch for latest autoconf and automake on rawhide
+
 * Thu Oct 11 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.5.0-1
 - New upstream release 1.5

More information about the scm-commits mailing list