View | Details | Raw Unified | Return to bug 4879
Collapse All | Expand All

(-)e2fsprogs.spec.orig (-6 / +9 lines)
Lines 1-6 Link Here
1
Name: e2fsprogs
1
Name: e2fsprogs
2
Version: 1.35
2
Version: 1.35
3
Release: alt2
3
Release: alt3
4
4
5
Summary: The filesystem utilities for the ext2/ext3 filesystems
5
Summary: The filesystem utilities for the ext2/ext3 filesystems
6
License: GPL
6
License: GPL
Lines 109-127 Link Here
109
done
109
done
110
110
111
%install
111
%install
112
%__mkdir_p $RPM_BUILD_ROOT{/lib,%_includedir/e2p}
112
%__mkdir_p $RPM_BUILD_ROOT{/%_lib,%_includedir/e2p}
113
113
114
%make_install install install-libs \
114
%make_install install install-libs \
115
	DESTDIR="$RPM_BUILD_ROOT" root_prefix=""
115
	DESTDIR="$RPM_BUILD_ROOT" root_prefix=""
116
116
117
# Relocate shared libraries from %_libdir/ to /lib/.
117
# Relocate shared libraries from %_libdir/ to /%_lib/.
118
for f in $RPM_BUILD_ROOT%_libdir/*.so; do
118
for f in $RPM_BUILD_ROOT%_libdir/*.so; do
119
	v="$RPM_BUILD_ROOT$(readlink -n "$f")"
119
	v="$RPM_BUILD_ROOT$(readlink -n "$f")"
120
	t=`objdump -p "$v" |awk '/SONAME/ {print $2}'`
120
	t=`objdump -p "$v" |awk '/SONAME/ {print $2}'`
121
	[ -n "$t" ]
121
	[ -n "$t" ]
122
	%__ln_s -nf ../../lib/"$t" "$f"
122
	%__ln_s -nf ../../%_lib/"$t" "$f"
123
done
123
done
124
mv $RPM_BUILD_ROOT%_libdir/*.so.* $RPM_BUILD_ROOT/lib/
124
mv $RPM_BUILD_ROOT%_libdir/*.so.* $RPM_BUILD_ROOT/%_lib/
125
125
126
pushd $RPM_BUILD_ROOT
126
pushd $RPM_BUILD_ROOT
127
	%__subst 's,^ET_DIR=.*$,ET_DIR=%_datadir/et,' .%_bindir/compile_et
127
	%__subst 's,^ET_DIR=.*$,ET_DIR=%_datadir/et,' .%_bindir/compile_et
Lines 180-186 Link Here
180
%_docdir/%name-%version/RE*
180
%_docdir/%name-%version/RE*
181
181
182
%files -n libe2fs
182
%files -n libe2fs
183
/lib/*.so.*
183
/%_lib/*.so.*
184
%dir %_docdir/%name-%version
184
%dir %_docdir/%name-%version
185
%_docdir/%name-%version/SHLIBS
185
%_docdir/%name-%version/SHLIBS
186
186
Lines 204-209 Link Here
204
%_libdir/evms/*
204
%_libdir/evms/*
205
205
206
%changelog
206
%changelog
207
* Mon Jul 26 2004 Kachalov Anton <mouse@altlinux.ru> 1.35-alt3
208
- Change /lib to /%_lib to make compile on x86_64
209
207
* Mon Apr 12 2004 Dmitry V. Levin <ldv@altlinux.org> 1.35-alt2
210
* Mon Apr 12 2004 Dmitry V. Levin <ldv@altlinux.org> 1.35-alt2
208
- Fixed false "check after next mount" warning.
211
- Fixed false "check after next mount" warning.
209
212

Return to bug 4879