summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2015-11-04 10:17:22 +0100
committerPavel Raiskup <praiskup@redhat.com>2015-11-04 10:17:22 +0100
commit9383a4ddd7f33b65a2b2406de78867b44ac0283e (patch)
tree0c994a7f00fa62910dab8a9f2fac361ac9929864
parent34ecf9ca32bf68cd0f972ee6e549e080dd44889a (diff)
downloadscl-autotools-9383a4ddd7f33b65a2b2406de78867b44ac0283e.tar.gz
scl-autotools-9383a4ddd7f33b65a2b2406de78867b44ac0283e.tar.xz
scl-autotools-9383a4ddd7f33b65a2b2406de78867b44ac0283e.zip
autotools-git-libtool: rebase
-rwxr-xr-xrepos/autotools/autotools-git/libtool/PREP_TARBALL1
-rw-r--r--repos/autotools/autotools-git/libtool/libtool.spec15
2 files changed, 10 insertions, 6 deletions
diff --git a/repos/autotools/autotools-git/libtool/PREP_TARBALL b/repos/autotools/autotools-git/libtool/PREP_TARBALL
index b3dbf46..30b2d53 100755
--- a/repos/autotools/autotools-git/libtool/PREP_TARBALL
+++ b/repos/autotools/autotools-git/libtool/PREP_TARBALL
@@ -13,6 +13,7 @@ fi
./bootstrap && {
if test -f boostrap.new; then
mv bootstrap.new bootstrap
+ ./bootstrap
fi
} && ./configure && make dist
diff --git a/repos/autotools/autotools-git/libtool/libtool.spec b/repos/autotools/autotools-git/libtool/libtool.spec
index de106d1..80af2a9 100644
--- a/repos/autotools/autotools-git/libtool/libtool.spec
+++ b/repos/autotools/autotools-git/libtool/libtool.spec
@@ -6,20 +6,20 @@
# Detect gcc version, (workaround) see the bug #429880
%global gcc_version %(gcc -dumpversion || echo "666")
-%global git_hash 6289a
-%global upstream_vr 2.4.5.6-%{git_hash}
+%global git_hash aabc
+%global upstream_vr 2.4.6.19
%{?scl:%scl_package libtool}
Summary: The GNU Portable Library Tool
Name: %{?scl_prefix}libtool
-Version: 2.4.5~git
-Release: 6.%{git_hash}%{?dist}
+Version: %{upstream_vr}~git
+Release: 1.%{git_hash}%{?dist}
License: GPLv2+ and LGPLv2+ and GFDL
URL: http://www.gnu.org/software/libtool/
Group: Development/Tools
-Source: libtool-%{upstream_vr}.tar.gz
+Source: libtool-%{upstream_vr}-%{git_hash}.tar.gz
# /usr/bin/libtool includes paths within gcc's versioned directories
# Libtool must be rebuilt whenever a new upstream gcc is built
@@ -99,7 +99,7 @@ Static libraries and header files for development with ltdl.
%prep
-%setup -q -n libtool-%{upstream_vr}
+%setup -q -n libtool-%{upstream_vr}-%{git_hash}
# to use this, we should 100% *know* what the patches do
find -exec touch --date=`date -I` {} +
@@ -188,6 +188,9 @@ fi
%{_libdir}/libltdl.so
%changelog
+* Wed Nov 04 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.6.19~git-1.aabc
+- rebase to latest git
+
* Wed Aug 12 2015 Pavel Raiskup <praiskup@redhat.com> - 2.4.5~git-6.6289a
- help2man is needed