diff --git a/xfsprogs-2.10.2-fix-lib-perms.patch b/xfsprogs-2.10.2-fix-lib-perms.patch deleted file mode 100644 index af24217..0000000 --- a/xfsprogs-2.10.2-fix-lib-perms.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: xfsprogs-2.10.2/include/buildmacros -=================================================================== ---- xfsprogs-2.10.2.orig/include/buildmacros -+++ xfsprogs-2.10.2/include/buildmacros -@@ -56,7 +56,7 @@ ifeq ($(ENABLE_SHARED),yes) - INSTALL_LTLIB = \ - cd $(TOPDIR)/$(LIBNAME)/.libs; \ - ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \ -+ ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \ - ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR) - endif - diff --git a/xfsprogs.spec b/xfsprogs.spec index 607e6ba..38f1b97 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing the XFS filesystem Name: xfsprogs Version: 2.10.2 -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 @@ -21,7 +21,6 @@ Conflicts: xfsdump < 2.0.0 Patch0: xfsprogs-2.10.1-parallel-build.patch Patch1: xfsprogs-2.10.1-libdisk-gfs2.patch Patch2: xfsprogs-2.10.1-ustat.patch -Patch3: xfsprogs-2.10.2-fix-lib-perms.patch %description A set of commands to use the XFS filesystem, including mkfs.xfs. @@ -55,7 +54,6 @@ also want to install xfsprogs. %patch0 -p2 %patch1 -p2 %patch2 -p2 -%patch3 -p1 %build # xfsprogs abuses libexecdir @@ -78,6 +76,8 @@ rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.la} # 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.*.*.* + # remove non-versioned docs location rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsprogs/ @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Thu Jan 08 2009 Eric Sandeen 2.10.2-3 +- Fix perms of libhandle.so in specfile, not makefile + * Wed Jan 07 2009 Eric Sandeen 2.10.2-2 - Fix perms of libhandle.so so that it's properly stripped