rpm/automake
SHA256
1
0
Fork 0
forked from pool/automake
Code Pull Requests Activity

Accepting request 127065 from home:coolo:branches:openSUSE:Factory

Browse Source 
- make sure we still define $(mkdir_p) for the time being

OBS-URL: https://build.opensuse.org/request/show/127065
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=19
This commit is contained in:
Philipp Thomas 2012-07-04 09:03:51 +00:00 committed by Git OBS Bridge
parent 73af3cafdc
commit e8bc2e38cd
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
automake-add-mkdir_p-temporarly.patch Normal file
View File

@ -0,0 +1,12 @@
Index: automake-1.12.1/m4/init.m4
===================================================================
--- automake-1.12.1.orig/m4/init.m4 2012-06-01 15:47:10.000000000 +0200
+++ automake-1.12.1/m4/init.m4 2012-06-01 15:47:10.000000000 +0200
@@ -82,6 +82,7 @@ AM_MISSING_PROG([MAKEINFO], [makeinfo])
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl

6
automake-require_file.patch
View File

@ -1,8 +1,8 @@
Index: automake.in
===================================================================
--- automake.in.orig 2012-04-21 16:38:05.000000000 +0200
+++ automake.in 2012-04-26 16:31:55.925021393 +0200
@@ -7709,12 +7709,14 @@ sub required_file_check_or_copy ($$$)
--- automake.in.orig 2012-06-01 15:47:09.000000000 +0200
+++ automake.in 2012-07-04 09:17:39.816973055 +0200
@@ -7751,12 +7751,14 @@ sub required_file_check_or_copy ($$$)
my $fullfile = "$dir/$file";
my $found_it = 0;
my $dangling_sym = 0;

5
automake.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jul 4 07:21:17 UTC 2012 - coolo@suse.com
- make sure we still define $(mkdir_p) for the time being
-------------------------------------------------------------------
Wed Jun 27 15:46:00 UTC 2012 - tom.mbrt@googlemail.com

10
automake.spec
View File

@ -17,7 +17,7 @@
Name: automake
BuildRequires: autoconf
BuildRequires: autoconf >= 2.69
BuildRequires: bison
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
@ -29,7 +29,7 @@ Requires: libtool
BuildRequires: flex
Requires: flex
%endif
Requires: autoconf >= 2.62
Requires: autoconf >= 2.69
Requires: info
Version: 1.12.1
Release: 0
@ -42,6 +42,10 @@ Source: automake-%{version}.tar.xz
Source1: automake-rpmlintrc
Patch1: automake-SuSE.patch
Patch3: automake-require_file.patch
# this patch makes sure packages that do not call AM_PROG_MKDIR, but use $(mkdir_p) work
# this patch should be removed after 12.2 is done, packages need to be fixed to use $(MKDIR_P)
# or avoid autoreconf at all
Patch4: automake-add-mkdir_p-temporarly.patch
BuildArch: noarch
%description
@ -54,8 +58,10 @@ definitions (with rules occasionally thrown in). The generated
%setup -q -n automake-%{version}
%patch1
%patch3
%patch4 -p1
%build
sh bootstrap.sh
%configure --docdir=%{_docdir}/%{name}
make %{?_smp_mflags}