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

Merge remote-tracking branch 'origin/master' into f18

Browse Source 
Fix libgfapi, xlator/mount/api dependency between glusterfs and glusterfs-api
Shorter ChangeLog
This commit is contained in:
Kaleb S. KEITHLEY 2013-06-26 08:38:23 -04:00
commit 3b604f6837
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glusterfs.spec
View File

@ -55,7 +55,7 @@ Summary: Cluster File System
%if ( 0%{_for_fedora_koji_builds} ) %if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs Name: glusterfs
Version: 3.4.0 Version: 3.4.0
Release: 0.6%{?prereltag:.%{prereltag}}%{?dist} Release: 0.7%{?prereltag:.%{prereltag}}%{?dist}
%else %else
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
@ -701,7 +701,7 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
# Remove installed docs, they're included by %%doc # Remove installed docs, they're included by %%doc
%{__rm} -rf %{buildroot}%{_datadir}/doc/glusterfs/ %{__rm} -rf %{buildroot}%{_datadir}/doc/glusterfs/
%{__bzip2} ChangeLog tail -50 ChangeLog > ChangeLog.tail && mv ChangeLog.tail ChangeLog
# Remove benchmarking and other unpackaged files # Remove benchmarking and other unpackaged files
%{__rm} -rf %{buildroot}/benchmarking %{__rm} -rf %{buildroot}/benchmarking
@ -887,7 +887,7 @@ cp ufo/bin/gluster-swift-gen-builders %{buildroot}%{_bindir}/
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc ChangeLog.bz2 COPYING-GPLV2 COPYING-LGPLV3 INSTALL README THANKS %doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README THANKS
%config(noreplace) %{_sysconfdir}/logrotate.d/* %config(noreplace) %{_sysconfdir}/logrotate.d/*
%config(noreplace) %{_sysconfdir}/sysconfig/* %config(noreplace) %{_sysconfdir}/sysconfig/*
%exclude %{_libdir}/libgfapi.* %exclude %{_libdir}/libgfapi.*
@ -902,6 +902,7 @@ cp ufo/bin/gluster-swift-gen-builders %{buildroot}%{_bindir}/
%if ( 0%{!?_without_rdma:1} ) %if ( 0%{!?_without_rdma:1} )
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma* %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma*
%endif %endif
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api*
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse* %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse*
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage* %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage*
%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix* %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix*
@ -1014,6 +1015,7 @@ fi
%files api %files api
%exclude %{_libdir}/*.so %exclude %{_libdir}/*.so
%{_libdir}/libgfapi.* %{_libdir}/libgfapi.*
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse*
%if ( 0%{!?_without_ocf:1} ) %if ( 0%{!?_without_ocf:1} )
%files resource-agents %files resource-agents
@ -1435,6 +1437,10 @@ fi
%endif %endif
%changelog %changelog
* Wed Jun 26 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.7.beta3
- prerelease 3.4.0beta3 for oVirt/vdsm dependencies in Fedora19
- libgfapi and xlator/mount/api dependency fix
* Tue Jun 11 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.6.beta3 * Tue Jun 11 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.6.beta3
- prerelease 3.4.0beta3 for oVirt/vdsm dependencies in Fedora19 - prerelease 3.4.0beta3 for oVirt/vdsm dependencies in Fedora19