fix LD_LIBRARY_PATH for multilib environment

- fix LD_LIBRARY_PATH for multilib environment (bug 1241527)
- update License: tag
- don't strip the libraries in install, just keep the executable bit
- when converting from latin1 to utf8, don't use the converted file
  if the conversion failed: the pt manpage is already utf8
i9ce
Dominik 'Rathann' Mierzejewski 9 years ago
parent 1820dfed3f
commit 523416deca

@ -0,0 +1,12 @@
diff -up fakeroot-1.20.2/scripts/fakeroot.in.multilib fakeroot-1.20.2/scripts/fakeroot.in
--- fakeroot-1.20.2/scripts/fakeroot.in.multilib 2014-10-05 17:16:00.000000000 +0200
+++ fakeroot-1.20.2/scripts/fakeroot.in 2015-09-28 09:56:43.891990046 +0200
@@ -35,7 +35,7 @@ FAKEROOT_BINDIR=@bindir@
USEABSLIBPATH=@LDPRELOADABS@
LIB=lib@fakeroot_transformed@@DLSUFFIX@
-PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib32/libfakeroot
+PATHS=@libdir@:${FAKEROOT_PREFIX}/lib64/libfakeroot:${FAKEROOT_PREFIX}/lib/libfakeroot
FAKED=${FAKEROOT_BINDIR}/@faked_transformed@
FAKED_MODE="unknown-is-root"

@ -1,13 +1,18 @@
Summary: Gives a fake root environment
Name: fakeroot
Version: 1.20.2
Release: 1%{?dist}
License: GPL+
Release: 2%{?dist}
# setenv.c: LGPLv2+
# contrib/Fakeroot-Stat-1.8.8: Perl (GPL+ or Artistic)
# the rest: GPLv3+
License: GPLv3+ and LGPLv2+ and (GPL+ or Artistic)
Group: Development/Tools
URL: http://fakeroot.alioth.debian.org/
Source0: http://ftp.debian.org/debian/pool/main/f/fakeroot/%{name}_%{version}.orig.tar.bz2
# Address some POSIX-types related problems.
Patch0: fakeroot-inttypes.patch
# Fix LD_LIBRARY_PATH for multilib: https://bugzilla.redhat.com/show_bug.cgi?id=1241527
Patch1: fakeroot-multilib.patch
BuildRequires: /usr/bin/getopt
BuildRequires: libcap-devel
# uudecode used by tests/tartest
@ -36,9 +41,10 @@ This package contains the libraries required by %{name}.
%prep
%setup -q
%patch0 -p1 -b .inttypes
%patch1 -p1 -b .multilib
for file in ./doc/*/*.1; do
iconv -f latin1 -t utf8 < $file > $file.new
iconv -f latin1 -t utf8 < $file > $file.new && \
mv -f $file.new $file
done
@ -64,10 +70,8 @@ done
%install
for type in sysv tcp; do
make -C obj-$type install libdir=%{_libdir}/libfakeroot DESTDIR=%{buildroot}
chmod 644 %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so
mv %{buildroot}%{_libdir}/libfakeroot/libfakeroot-0.so \
%{buildroot}%{_libdir}/libfakeroot/libfakeroot-$type.so
strip -s %{buildroot}%{_libdir}/libfakeroot/libfakeroot-$type.so
rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.so
rm -f %{buildroot}%{_libdir}/libfakeroot/libfakeroot.*la
%find_lang faked-$type --without-mo --with-man
@ -172,6 +176,13 @@ fi
%ghost %{_libdir}/libfakeroot/libfakeroot-0.so
%changelog
* Mon Sep 28 2015 Dominik Mierzejewski <rpm@greysector.net> - 1.20.2-2
- fix LD_LIBRARY_PATH for multilib environment (bug 1241527)
- update License: tag
- don't strip the libraries in install, just keep the executable bit
- when converting from latin1 to utf8, don't use the converted file
if the conversion failed: the pt manpage is already utf8
* Thu Jun 18 2015 Dominik Mierzejewski <rpm@greysector.net> - 1.20.2-1
- update to 1.20.2
- alternativize libfakeroot and faked as well (bug 817088)

Loading…
Cancel
Save