\- Add libtool-dont_delete_gnulib_files.patch that prevents deletion
of files from gnulib to be deleted by libtoolize. - BuildRequire help2man. - Remove unneeded clean section. - Use rpm macros where possible. - Pass V=1 to make to make compilation verbose. OBS-URL: https://build.opensuse.org/package/show/Base:System/libtool?expand=0&rev=61
This commit is contained in:
Philipp Thomas
Git OBS Bridge
parent
4dd758a7f1
commit
3675298a88
18
libtool-dont_delete_gnulib_files.patch
Normal file
18
libtool-dont_delete_gnulib_files.patch
Normal file
@ -0,0 +1,18 @@
|
||||
* libtoolize.in (func_require_seen_libtool): Do not remove snippet/* files
|
||||
which are from Gnulib.
|
||||
|
||||
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
|
||||
|
||||
--- libtool-2.4.3/libtoolize.in 2014-10-27 18:20:51.000000000 +0100
|
||||
+++ libtool/libtoolize.in 2014-11-02 11:53:20.000000000 +0100
|
||||
@@ -1896,8 +1896,8 @@
|
||||
# ensure a clean upgrade.
|
||||
# Do not remove config.guess, config.sub or install-sh, we don't
|
||||
# install them without --install, and the project may not be using
|
||||
- # Automake.
|
||||
- all_pkgaux_files="compile depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
|
||||
+ # Automake. Similarly, do not remove Gnulib files.
|
||||
+ all_pkgaux_files="compile depcomp missing ltmain.sh"
|
||||
all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
|
||||
all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c"
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 21 11:00:57 CET 2014 - pth@suse.de
|
||||
|
||||
- Add libtool-dont_delete_gnulib_files.patch that prevents deletion
|
||||
of files from gnulib to be deleted by libtoolize.
|
||||
- BuildRequire help2man.
|
||||
- Remove unneeded clean section.
|
||||
- Use rpm macros where possible.
|
||||
- Pass V=1 to make to make compilation verbose.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 3 22:35:18 UTC 2014 - foss@grueninger.de
|
||||
|
||||
@ -5,6 +15,7 @@ Mon Nov 3 22:35:18 UTC 2014 - foss@grueninger.de
|
||||
folder no longer exists.
|
||||
- Drop patch libtool-ppc64le.patch for ppc handling as it is already
|
||||
part of v2.4.3
|
||||
|
||||
- Update to libtool 2.4.3
|
||||
** New features:
|
||||
|
||||
|
||||
@ -25,6 +25,7 @@ BuildRequires: automake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gcc-fortran
|
||||
BuildRequires: gcc-objc
|
||||
BuildRequires: help2man
|
||||
BuildRequires: lzma
|
||||
BuildRequires: makeinfo
|
||||
BuildRequires: zlib-devel
|
||||
@ -46,6 +47,7 @@ Url: http://www.gnu.org/software/libtool/
|
||||
Source: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.gz
|
||||
Source2: baselibs.conf
|
||||
Source3: libtool-rpmlintrc
|
||||
Patch0: libtool-dont_delete_gnulib_files.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Provides: libltdl-devel
|
||||
# fedora name
|
||||
@ -65,13 +67,14 @@ Library needed by programs that use the ltdl interface of GNU libtool.
|
||||
|
||||
%prep
|
||||
%setup -q -n libtool-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
./configure CFLAGS="$RPM_OPT_FLAGS" \
|
||||
./configure CFLAGS="%{optflags}" \
|
||||
--prefix=/usr --infodir=%{_infodir} --libdir=%{_libdir}
|
||||
# force rebuild with non-broken makeinfo
|
||||
rm -f doc/libtool.info
|
||||
make %{?_smp_mflags}
|
||||
make V=1 %{?_smp_mflags}
|
||||
|
||||
%if "%{name}" == "libtool-testsuite"
|
||||
|
||||
@ -85,7 +88,8 @@ make check
|
||||
%else
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
make V=1 install DESTDIR=%{buildroot}
|
||||
chmod +x %{buildroot}%{_datadir}/libtool/build-aux/ltmain.sh
|
||||
%endif
|
||||
|
||||
%post
|
||||
@ -98,26 +102,23 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
%postun -n libltdl7 -p /sbin/ldconfig
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%if "%{name}" == "libtool"
|
||||
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
%doc AUTHORS NEWS README THANKS ChangeLog COPYING
|
||||
/usr/bin/libtool
|
||||
/usr/bin/libtoolize
|
||||
/usr/include/libltdl
|
||||
/usr/include/ltdl.h
|
||||
%{_bindir}/libtool
|
||||
%{_bindir}/libtoolize
|
||||
%{_includedir}/libltdl
|
||||
%{_includedir}/ltdl.h
|
||||
%{_libdir}/libltdl.a
|
||||
%attr(644, root, root) %{_libdir}/libltdl.la
|
||||
%{_libdir}/libltdl.so
|
||||
/usr/share/aclocal/*.m4
|
||||
%{_datadir}/aclocal/*.m4
|
||||
%doc %{_infodir}/libtool.info*
|
||||
%doc %{_mandir}/man1/libtool.1.gz
|
||||
%doc %{_mandir}/man1/libtoolize.1.gz
|
||||
/usr/share/libtool
|
||||
%{_datadir}/libtool
|
||||
|
||||
%files -n libltdl7
|
||||
%defattr(-, root, root)
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 21 11:00:57 CET 2014 - pth@suse.de
|
||||
|
||||
- Add libtool-dont_delete_gnulib_files.patch that prevents deletion
|
||||
of files from gnulib to be deleted by libtoolize.
|
||||
- BuildRequire help2man.
|
||||
- Remove unneeded clean section.
|
||||
- Use rpm macros where possible.
|
||||
- Pass V=1 to make to make compilation verbose.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 3 22:35:18 UTC 2014 - foss@grueninger.de
|
||||
|
||||
@ -5,6 +15,7 @@ Mon Nov 3 22:35:18 UTC 2014 - foss@grueninger.de
|
||||
folder no longer exists.
|
||||
- Drop patch libtool-ppc64le.patch for ppc handling as it is already
|
||||
part of v2.4.3
|
||||
|
||||
- Update to libtool 2.4.3
|
||||
** New features:
|
||||
|
||||
|
||||
25
libtool.spec
25
libtool.spec
@ -25,6 +25,7 @@ BuildRequires: automake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: gcc-fortran
|
||||
BuildRequires: gcc-objc
|
||||
BuildRequires: help2man
|
||||
BuildRequires: lzma
|
||||
BuildRequires: makeinfo
|
||||
BuildRequires: zlib-devel
|
||||
@ -46,6 +47,7 @@ Url: http://www.gnu.org/software/libtool/
|
||||
Source: http://ftp.gnu.org/gnu/libtool/libtool-%{version}.tar.gz
|
||||
Source2: baselibs.conf
|
||||
Source3: libtool-rpmlintrc
|
||||
Patch0: libtool-dont_delete_gnulib_files.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Provides: libltdl-devel
|
||||
# fedora name
|
||||
@ -65,13 +67,14 @@ Library needed by programs that use the ltdl interface of GNU libtool.
|
||||
|
||||
%prep
|
||||
%setup -q -n libtool-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
./configure CFLAGS="$RPM_OPT_FLAGS" \
|
||||
./configure CFLAGS="%{optflags}" \
|
||||
--prefix=/usr --infodir=%{_infodir} --libdir=%{_libdir}
|
||||
# force rebuild with non-broken makeinfo
|
||||
rm -f doc/libtool.info
|
||||
make %{?_smp_mflags}
|
||||
make V=1 %{?_smp_mflags}
|
||||
|
||||
%if "%{name}" == "libtool-testsuite"
|
||||
|
||||
@ -85,7 +88,8 @@ make check
|
||||
%else
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
make V=1 install DESTDIR=%{buildroot}
|
||||
chmod +x %{buildroot}%{_datadir}/libtool/build-aux/ltmain.sh
|
||||
%endif
|
||||
|
||||
%post
|
||||
@ -98,26 +102,23 @@ make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
%postun -n libltdl7 -p /sbin/ldconfig
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%if "%{name}" == "libtool"
|
||||
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
%doc AUTHORS NEWS README THANKS ChangeLog COPYING
|
||||
/usr/bin/libtool
|
||||
/usr/bin/libtoolize
|
||||
/usr/include/libltdl
|
||||
/usr/include/ltdl.h
|
||||
%{_bindir}/libtool
|
||||
%{_bindir}/libtoolize
|
||||
%{_includedir}/libltdl
|
||||
%{_includedir}/ltdl.h
|
||||
%{_libdir}/libltdl.a
|
||||
%attr(644, root, root) %{_libdir}/libltdl.la
|
||||
%{_libdir}/libltdl.so
|
||||
/usr/share/aclocal/*.m4
|
||||
%{_datadir}/aclocal/*.m4
|
||||
%doc %{_infodir}/libtool.info*
|
||||
%doc %{_mandir}/man1/libtool.1.gz
|
||||
%doc %{_mandir}/man1/libtoolize.1.gz
|
||||
/usr/share/libtool
|
||||
%{_datadir}/libtool
|
||||
|
||||
%files -n libltdl7
|
||||
%defattr(-, root, root)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user