summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>2017-07-25 09:00:53 +0200
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>2017-07-25 09:07:38 +0200
commite44fd9a2d7af2af0a4d869c31248ada6b1167a87 (patch)
tree10cbba3689616ca5f7e37db3756ec5e0d23c8b8a
parenta8da602a35aafd4f1a1e00e915a5435683af90db (diff)
downloadcryptsetup-e44fd9a2d7af2af0a4d869c31248ada6b1167a87.tar.gz
cryptsetup-e44fd9a2d7af2af0a4d869c31248ada6b1167a87.tar.bz2
cryptsetup-e44fd9a2d7af2af0a4d869c31248ada6b1167a87.zip
- Replace hardcoded library path prefix with %{_libdir} macro which may be different depending on architecture. Wrong prefix caused compilation errors in dependent packages on 64bit architecture. - Replace other prefixes with available rpm macros Change-Id: I55bde064bfa3b85797e591d082a5bfefd7c1998e
-rw-r--r--packaging/cryptsetup.spec46
1 files changed, 23 insertions, 23 deletions
diff --git a/packaging/cryptsetup.spec b/packaging/cryptsetup.spec
index b472e7c..8704e7a 100644
--- a/packaging/cryptsetup.spec
+++ b/packaging/cryptsetup.spec
@@ -57,7 +57,7 @@ doc package for cryptsetup
%build
chmod +x ./autogen.sh
-./autogen.sh --prefix=%{_prefix} -localedir=%{_prefix}/share/locale
+./autogen.sh --prefix=%{_prefix} -localedir=%{_datarootdir}/locale -libdir=%{_libdir}
make %{?jobs:-j%jobs}
@@ -76,31 +76,31 @@ cp -a %{SOURCE1} %{buildroot}%{_datadir}/binary_package_name.manifest
%defattr(-,root,root,-)
%manifest %{_datadir}/binary_package_name.manifest
%license COPYING
-%{_prefix}/lib/libcryptsetup.so
-%{_prefix}/lib/libcryptsetup.so.4
-%{_prefix}/lib/libcryptsetup.so.4.7.0
-%{_prefix}/sbin/cryptsetup
-%{_prefix}/sbin/veritysetup
+%{_libdir}/libcryptsetup.so
+%{_libdir}/libcryptsetup.so.4
+%{_libdir}/libcryptsetup.so.4.7.0
+%{_sbindir}/cryptsetup
+%{_sbindir}/veritysetup
%files devel
-%{_prefix}/include/libcryptsetup.h
-%{_prefix}/lib/libcryptsetup.so
-%{_prefix}/lib/pkgconfig/libcryptsetup.pc
+%{_includedir}/libcryptsetup.h
+%{_libdir}/libcryptsetup.so
+%{_libdir}/pkgconfig/libcryptsetup.pc
%files locale
-%{_prefix}/share/locale/cs/LC_MESSAGES/cryptsetup.mo
-%{_prefix}/share/locale/de/LC_MESSAGES/cryptsetup.mo
-%{_prefix}/share/locale/fi/LC_MESSAGES/cryptsetup.mo
-%{_prefix}/share/locale/fr/LC_MESSAGES/cryptsetup.mo
-%{_prefix}/share/locale/id/LC_MESSAGES/cryptsetup.mo
-%{_prefix}/share/locale/it/LC_MESSAGES/cryptsetup.mo
-%{_prefix}/share/locale/nl/LC_MESSAGES/cryptsetup.mo
-%{_prefix}/share/locale/pl/LC_MESSAGES/cryptsetup.mo
-%{_prefix}/share/locale/sv/LC_MESSAGES/cryptsetup.mo
-%{_prefix}/share/locale/uk/LC_MESSAGES/cryptsetup.mo
-%{_prefix}/share/locale/vi/LC_MESSAGES/cryptsetup.mo
-%{_prefix}/share/locale/es/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/cs/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/de/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/fi/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/fr/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/id/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/it/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/nl/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/pl/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/sv/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/uk/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/vi/LC_MESSAGES/cryptsetup.mo
+%{_datarootdir}/locale/es/LC_MESSAGES/cryptsetup.mo
%files doc
-%{_prefix}/share/man/man8/cryptsetup.8.gz
-%{_prefix}/share/man/man8/veritysetup.8.gz
+%{_mandir}/man8/cryptsetup.8.gz
+%{_mandir}/man8/veritysetup.8.gz