[xfsprogs] Move files out of /lib to /usr/lib
Eric Sandeen
sandeen at fedoraproject.org
Thu Mar 29 02:31:19 UTC 2012
commit 9a1c04681240a67e03bf561733e9b090d4566684
Author: Eric Sandeen <sandeen at redhat.com>
Date: Wed Mar 28 21:31:04 2012 -0500
Move files out of /lib to /usr/lib
xfsprogs.spec | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/xfsprogs.spec b/xfsprogs.spec
index 659b7a0..bedf7d1 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,7 +1,7 @@
Summary: Utilities for managing the XFS filesystem
Name: xfsprogs
Version: 3.1.8
-Release: 2%{?dist}
+Release: 3%{?dist}
# Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
# in source, with no mention of version.
# doc/COPYING file specifies what is GPL and what is LGPL
@@ -75,14 +75,12 @@ make V=1 %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-make V=1 DIST_ROOT=$RPM_BUILD_ROOT install install-dev install-qa PKG_ROOT_SBIN_DIR=%{_sbindir}
+make V=1 DIST_ROOT=$RPM_BUILD_ROOT install install-dev install-qa \
+ PKG_ROOT_SBIN_DIR=%{_sbindir} PKG_ROOT_LIB_DIR=%{_libdir}
# nuke .la files, etc
rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.{la,a}}
-# fix up symlink to be correct
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libhandle.so
-ln -s ../../%{_lib}/libhandle.so.1 $RPM_BUILD_ROOT/%{_libdir}/libhandle.so
-chmod 0755 $RPM_BUILD_ROOT/%{_lib}/libhandle.so.*.*.*
+chmod 0755 $RPM_BUILD_ROOT/%{_libdir}/libhandle.so.*.*.*
# remove non-versioned docs location
rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/
@@ -108,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root)
%doc doc/CHANGES doc/COPYING doc/CREDITS README
-/%{_lib}/*.so.*
+%{_libdir}/*.so.*
%{_mandir}/man8/*
%{_mandir}/man5/*
%{_sbindir}/*
@@ -185,8 +183,11 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/xfs/xfs_types.h
%changelog
+* Wed Mar 28 2012 Eric Sandeen <sandeen at redhat.com> 3.1.8-3
+- Move files out of /lib64 to /usr/lib64
+
* Wed Mar 28 2012 Eric Sandeen <sandeen at redhat.com> 3.1.8-2
-- New upstream release.
+- Move files out of /sbin to /usr/sbin
* Fri Mar 23 2012 Eric Sandeen <sandeen at redhat.com> 3.1.8-1
- New upstream release.
More information about the scm-commits
mailing list