rpms/acl
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- do not package a static library (#556036)

Browse Source 
- remove multilib patch no longer useful
- cleanup in BuildRequires
This commit is contained in:
Kamil Dudka 2010-01-19 15:44:59 +00:00
parent b4fdf52602
commit 72bd40792b
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
acl-2.2.3-multilib.patch
View File

@ -1,13 +0,0 @@
diff --git a/include/buildmacros b/include/buildmacros
index ab89182..17423c0 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -88,8 +88,6 @@ INSTALL_LTLIB_DEV = \
../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \
if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so; \
fi
else

29
acl.spec
View File

@ -1,12 +1,13 @@
Summary: Access control list utilities Summary: Access control list utilities
Name: acl Name: acl
Version: 2.2.49 Version: 2.2.49
Release: 3%{?dist} Release: 4%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libattr-devel >= 2.4.1 BuildRequires: gawk
BuildRequires: autoconf, libtool >= 1.5, gettext, gawk BuildRequires: gettext
BuildRequires: libattr-devel
BuildRequires: libtool
Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz Source: http://download.savannah.gnu.org/releases-noredirect/acl/acl-%{version}.src.tar.gz
Patch0: acl-2.2.3-multilib.patch
Patch1: acl-2.2.39-build.patch Patch1: acl-2.2.39-build.patch
Patch2: acl-2.2.49-setfacl-walk.patch Patch2: acl-2.2.49-setfacl-walk.patch
Patch3: acl-2.2.49-bz467936.patch Patch3: acl-2.2.49-bz467936.patch
@ -44,17 +45,15 @@ defined in POSIX 1003.1e draft standard 17.
%prep %prep
%setup -q %setup -q
%patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
autoconf
%build %build
touch .census touch .census
# acl abuses libexecdir # acl abuses libexecdir
%configure --libdir=/%{_lib} --libexecdir=%{_libdir} %configure --libdir=/%{_lib} --libexecdir=%{_libdir}
make LIBTOOL="libtool --tag=CC"%{?_smp_mflags} make %{?_smp_mflags} LIBTOOL="libtool --tag=CC"
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -62,11 +61,14 @@ make install DESTDIR=$RPM_BUILD_ROOT
make install-dev DESTDIR=$RPM_BUILD_ROOT make install-dev DESTDIR=$RPM_BUILD_ROOT
make install-lib DESTDIR=$RPM_BUILD_ROOT make install-lib DESTDIR=$RPM_BUILD_ROOT
# get rid of libacl.la # get rid of libacl.a and libacl.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/libacl.la rm -f $RPM_BUILD_ROOT/%{_lib}/libacl.a
rm -f $RPM_BUILD_ROOT/%{_lib}/libacl.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.a
rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.la
# fix links to shared libs and permissions # fix links to shared libs and permissions
rm -f $RPM_BUILD_ROOT/%{_libdir}/libacl.so rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.so
ln -sf ../../%{_lib}/libacl.so $RPM_BUILD_ROOT/%{_libdir}/libacl.so ln -sf ../../%{_lib}/libacl.so $RPM_BUILD_ROOT/%{_libdir}/libacl.so
chmod 0755 $RPM_BUILD_ROOT/%{_lib}/libacl.so.*.*.* chmod 0755 $RPM_BUILD_ROOT/%{_lib}/libacl.so.*.*.*
@ -93,9 +95,9 @@ rm -rf $RPM_BUILD_ROOT
%files -n libacl-devel %files -n libacl-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
/%{_lib}/libacl.so /%{_lib}/libacl.so
%{_libdir}/libacl.so
%{_includedir}/acl %{_includedir}/acl
%{_includedir}/sys/acl.h %{_includedir}/sys/acl.h
%{_libdir}/libacl.*
%{_mandir}/man3/acl_* %{_mandir}/man3/acl_*
%files -n libacl %files -n libacl
@ -103,6 +105,11 @@ rm -rf $RPM_BUILD_ROOT
/%{_lib}/libacl.so.* /%{_lib}/libacl.so.*
%changelog %changelog
* Tue Jan 19 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-4
- do not package a static library (#556036)
- remove multilib patch no longer useful
- cleanup in BuildRequires
* Tue Jan 05 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-3 * Tue Jan 05 2010 Kamil Dudka <kdudka@redhat.com> 2.2.49-3
- upstream patch for setfacl --restore SUID/SGID bits handling (#467936) - upstream patch for setfacl --restore SUID/SGID bits handling (#467936)