diff --git a/libtool-no_host_name.patch b/libtool-no_host_name.patch deleted file mode 100644 index 84070a2..0000000 --- a/libtool-no_host_name.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Philipp Thomas -Date: 2015-02-09 12:43:23+01:00 -Subject: Remove coment - -Libtool records the host it was configured on. This makes -comparing packages in a build system useless. - ---- - m4/libtool.m4 | 1 - - 1 file changed, 1 deletion(-) - -Index: m4/libtool.m4 -=================================================================== ---- m4/libtool.m4.orig 2015-01-16 19:52:04.000000000 +0100 -+++ m4/libtool.m4 2015-02-09 12:37:05.352880312 +0100 -@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([ - cat <<_LT_EOF >> "$cfgfile" - #! $SHELL - # Generated automatically by $as_me ($PACKAGE) $VERSION --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - - # Provide generalized library-building support services. diff --git a/libtool-testsuite.changes b/libtool-testsuite.changes index 0c5c071..dabfd3b 100644 --- a/libtool-testsuite.changes +++ b/libtool-testsuite.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu May 3 14:16:43 UTC 2018 - dimstar@opensuse.org + +- Drop libtool-no_host_name.patch for now: since we are upgrading + to automake 1.16, we can't have any patch that would require us + to bootstrap libtool, as this is not exactly trivial. +- Remove the line containing 'uname -m' from the libtool.m4 package + after installation: this has the same effect as the patch above + had. + ------------------------------------------------------------------- Wed Mar 16 15:29:34 UTC 2016 - dimstar@opensuse.org diff --git a/libtool-testsuite.spec b/libtool-testsuite.spec index e6b66f3..f607315 100644 --- a/libtool-testsuite.spec +++ b/libtool-testsuite.spec @@ -1,7 +1,7 @@ # # spec file for package libtool-testsuite # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,15 +25,14 @@ Name: libtool-testsuite Version: 2.4.6 Release: 0 Summary: A Tool to Build Shared Libraries -License: GPL-2.0+ and LGPL-2.1+ and GFDL-1.2+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GFDL-1.2-or-later Group: Development/Tools/Building -Url: http://www.gnu.org/software/libtool/ +URL: http://www.gnu.org/software/libtool/ Source0: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz Source1: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz.sig Source2: libtool.keyring Source3: baselibs.conf Source4: libtool-rpmlintrc -Patch0: libtool-no_host_name.patch BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: gcc-fortran @@ -46,12 +45,11 @@ Requires: automake > 1.4 Requires: libltdl7 = %{version} Requires: m4 >= 1.4.16 Requires: tar -Requires(preun): %{install_info_prereq} Requires(post): %{install_info_prereq} +Requires(preun): %{install_info_prereq} Provides: libltdl-devel # fedora name Provides: libtool-ltdl-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GNU libtool is a set of shell scripts to automatically configure UNIX @@ -59,7 +57,7 @@ architectures to build shared libraries in a generic fashion. %package -n libltdl7 Summary: Libtool Runtime Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ %description -n libltdl7 @@ -67,11 +65,10 @@ Library needed by programs that use the ltdl interface of GNU libtool. %prep %setup -q -n libtool-%{version} -%patch0 %build ./configure CFLAGS="%{optflags}" \ - --prefix=/usr --infodir=%{_infodir} --libdir=%{_libdir} + --prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} # force rebuild with non-broken makeinfo rm -f doc/libtool.info make V=1 %{?_smp_mflags} @@ -88,6 +85,8 @@ make %{?_smp_mflags} check %install make DESTDIR=%{buildroot} install %{?_smp_mflags} chmod +x %{buildroot}%{_datadir}/libtool/build-aux/ltmain.sh +# Do not add builder's hostname into generated scripts +sed -i "/uname -n/d" %{buildroot}%{_datadir}/aclocal/libtool.m4 %endif %post @@ -107,7 +106,8 @@ chmod +x %{buildroot}%{_datadir}/libtool/build-aux/ltmain.sh %if "%{name}" == "libtool" %files %defattr(-, root, root) -%doc AUTHORS NEWS README THANKS ChangeLog COPYING +%license COPYING +%doc AUTHORS NEWS README THANKS ChangeLog %{_bindir}/libtool %{_bindir}/libtoolize %{_includedir}/libltdl @@ -116,9 +116,9 @@ chmod +x %{buildroot}%{_datadir}/libtool/build-aux/ltmain.sh %attr(644, root, root) %{_libdir}/libltdl.la %{_libdir}/libltdl.so %{_datadir}/aclocal/*.m4 -%doc %{_infodir}/libtool.info* -%doc %{_mandir}/man1/libtool.1.gz -%doc %{_mandir}/man1/libtoolize.1.gz +%{_infodir}/libtool.info* +%{_mandir}/man1/libtool.1.gz +%{_mandir}/man1/libtoolize.1.gz %{_datadir}/libtool %files -n libltdl7 diff --git a/libtool.changes b/libtool.changes index 0c5c071..dabfd3b 100644 --- a/libtool.changes +++ b/libtool.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu May 3 14:16:43 UTC 2018 - dimstar@opensuse.org + +- Drop libtool-no_host_name.patch for now: since we are upgrading + to automake 1.16, we can't have any patch that would require us + to bootstrap libtool, as this is not exactly trivial. +- Remove the line containing 'uname -m' from the libtool.m4 package + after installation: this has the same effect as the patch above + had. + ------------------------------------------------------------------- Wed Mar 16 15:29:34 UTC 2016 - dimstar@opensuse.org diff --git a/libtool.spec b/libtool.spec index 1a792a6..4a2be07 100644 --- a/libtool.spec +++ b/libtool.spec @@ -1,7 +1,7 @@ # # spec file for package libtool # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,15 +25,14 @@ Name: libtool Version: 2.4.6 Release: 0 Summary: A Tool to Build Shared Libraries -License: GPL-2.0+ and LGPL-2.1+ and GFDL-1.2+ +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GFDL-1.2-or-later Group: Development/Tools/Building -Url: http://www.gnu.org/software/libtool/ +URL: http://www.gnu.org/software/libtool/ Source0: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz Source1: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.xz.sig Source2: libtool.keyring Source3: baselibs.conf Source4: libtool-rpmlintrc -Patch0: libtool-no_host_name.patch BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: gcc-fortran @@ -46,12 +45,11 @@ Requires: automake > 1.4 Requires: libltdl7 = %{version} Requires: m4 >= 1.4.16 Requires: tar -Requires(preun): %{install_info_prereq} Requires(post): %{install_info_prereq} +Requires(preun): %{install_info_prereq} Provides: libltdl-devel # fedora name Provides: libtool-ltdl-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GNU libtool is a set of shell scripts to automatically configure UNIX @@ -59,7 +57,7 @@ architectures to build shared libraries in a generic fashion. %package -n libltdl7 Summary: Libtool Runtime Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ %description -n libltdl7 @@ -67,11 +65,10 @@ Library needed by programs that use the ltdl interface of GNU libtool. %prep %setup -q -n libtool-%{version} -%patch0 %build ./configure CFLAGS="%{optflags}" \ - --prefix=/usr --infodir=%{_infodir} --libdir=%{_libdir} + --prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} # force rebuild with non-broken makeinfo rm -f doc/libtool.info make V=1 %{?_smp_mflags} @@ -88,6 +85,8 @@ make %{?_smp_mflags} check %install make DESTDIR=%{buildroot} install %{?_smp_mflags} chmod +x %{buildroot}%{_datadir}/libtool/build-aux/ltmain.sh +# Do not add builder's hostname into generated scripts +sed -i "/uname -n/d" %{buildroot}%{_datadir}/aclocal/libtool.m4 %endif %post @@ -107,7 +106,8 @@ chmod +x %{buildroot}%{_datadir}/libtool/build-aux/ltmain.sh %if "%{name}" == "libtool" %files %defattr(-, root, root) -%doc AUTHORS NEWS README THANKS ChangeLog COPYING +%license COPYING +%doc AUTHORS NEWS README THANKS ChangeLog %{_bindir}/libtool %{_bindir}/libtoolize %{_includedir}/libltdl @@ -116,9 +116,9 @@ chmod +x %{buildroot}%{_datadir}/libtool/build-aux/ltmain.sh %attr(644, root, root) %{_libdir}/libltdl.la %{_libdir}/libltdl.so %{_datadir}/aclocal/*.m4 -%doc %{_infodir}/libtool.info* -%doc %{_mandir}/man1/libtool.1.gz -%doc %{_mandir}/man1/libtoolize.1.gz +%{_infodir}/libtool.info* +%{_mandir}/man1/libtool.1.gz +%{_mandir}/man1/libtoolize.1.gz %{_datadir}/libtool %files -n libltdl7