Merge remote-tracking branch 'origin/master' into f18
This commit is contained in:
Kaleb S. KEITHLEY
commit
c47d66b136
123
glusterfs.spec
123
glusterfs.spec
@ -53,7 +53,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.1%{?prereltag:.%{prereltag}}%{?dist}
|
Release: 0.4%{?prereltag:.%{prereltag}}%{?dist}
|
||||||
%else
|
%else
|
||||||
Name: @PACKAGE_NAME@
|
Name: @PACKAGE_NAME@
|
||||||
Version: @PACKAGE_VERSION@
|
Version: @PACKAGE_VERSION@
|
||||||
@ -87,6 +87,64 @@ Source11: glusterfsd.service
|
|||||||
Source12: glusterd.init
|
Source12: glusterd.init
|
||||||
Source13: glusterfsd.init
|
Source13: glusterfsd.init
|
||||||
|
|
||||||
|
%if ( 0%{_for_fedora_koji_builds} )
|
||||||
|
Source15: http://download.gluster.org/pub/gluster/glusterfs/qa-releases/%{version}%{?prereltag}/UFO/gluster-swift-ufo-%{UFOVER}%{?prereltag}.tar.gz
|
||||||
|
%else
|
||||||
|
Source15: gluster-swift-ufo-@PACKAGE_VERSION@.tar.gz
|
||||||
|
%endif
|
||||||
|
Patch15: %{name}-3.3.1.ufo.gluster.swift.common.DiskFile-1.7.4.patch
|
||||||
|
|
||||||
|
# http://launchpad.net/swift/grizzly/%{SWIFTVER}/+download/swift-%{SWIFTVER}.tar.gz
|
||||||
|
Source20: swift-%{SWIFTVER}.tar.gz
|
||||||
|
|
||||||
|
Source30: gluster-swift-account.service
|
||||||
|
Source31: gluster-swift-container.service
|
||||||
|
Source32: gluster-swift-object.service
|
||||||
|
Source33: gluster-swift-proxy.service
|
||||||
|
Source34: gluster-swift-account@.service
|
||||||
|
Source35: gluster-swift-container@.service
|
||||||
|
Source36: gluster-swift-object@.service
|
||||||
|
Source37: gluster-swift.tmpfs
|
||||||
|
Source40: gluster-swift-account.init
|
||||||
|
Source41: gluster-swift-container.init
|
||||||
|
Source42: gluster-swift-object.init
|
||||||
|
Source43: gluster-swift-proxy.init
|
||||||
|
Source44: gluster-swift-functions
|
||||||
|
# these first appeared in openstack-swift-1.7.4-2.fc19
|
||||||
|
Source50: gluster-swift-account-replicator.service
|
||||||
|
Source51: gluster-swift-account-replicator@.service
|
||||||
|
Source52: gluster-swift-account-auditor.service
|
||||||
|
Source53: gluster-swift-account-auditor@.service
|
||||||
|
Source54: gluster-swift-account-reaper.service
|
||||||
|
Source55: gluster-swift-account-reaper@.service
|
||||||
|
Source56: gluster-swift-container-replicator.service
|
||||||
|
Source57: gluster-swift-container-replicator@.service
|
||||||
|
Source58: gluster-swift-container-auditor.service
|
||||||
|
Source59: gluster-swift-container-auditor@.service
|
||||||
|
Source60: gluster-swift-container-updater.service
|
||||||
|
Source61: gluster-swift-container-updater@.service
|
||||||
|
Source62: gluster-swift-object-replicator.service
|
||||||
|
Source63: gluster-swift-object-replicator@.service
|
||||||
|
Source64: gluster-swift-object-auditor.service
|
||||||
|
Source65: gluster-swift-object-auditor@.service
|
||||||
|
Source66: gluster-swift-object-updater.service
|
||||||
|
Source67: gluster-swift-object-updater@.service
|
||||||
|
Source68: gluster-swift-object-expirer.service
|
||||||
|
Source69: gluster-swift-object-expirer@.service
|
||||||
|
# these first appeared in openstack-swift-1.7.4-1.fc18 and -1.7.4-2.el6
|
||||||
|
Source70: account-server.conf
|
||||||
|
Source71: container-server.conf
|
||||||
|
Source72: object-server.conf
|
||||||
|
Source73: proxy-server.conf
|
||||||
|
Source74: swift.conf
|
||||||
|
Source75: object-expirer.conf
|
||||||
|
|
||||||
|
Patch20: 0001-Use-updated-parallel-install-versions-of-epel-packag.patch
|
||||||
|
Patch21: 0002-Add-fixes-for-building-the-doc-package.patch
|
||||||
|
Patch22: glusterfs-3.3.1.swift.constraints.backport-1.7.4.patch
|
||||||
|
Patch23: glusterfs-3.4.0.swift.egginfo-grizzly.patch
|
||||||
|
Patch24: 0002-Add-fixes-for-building-the-doc-package.patch.180
|
||||||
|
|
||||||
%if ( 0%{?_with_systemd:1} )
|
%if ( 0%{?_with_systemd:1} )
|
||||||
%global glusterd_service %{S:%{SOURCE10}}
|
%global glusterd_service %{S:%{SOURCE10}}
|
||||||
%global glusterfsd_service %{S:%{SOURCE11}}
|
%global glusterfsd_service %{S:%{SOURCE11}}
|
||||||
@ -355,56 +413,6 @@ Group: Applications/System
|
|||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
# http://launchpad.net/swift/grizzly/%{SWIFTVER}/+download/swift-%{SWIFTVER}.tar.gz
|
|
||||||
Source20: swift-%{SWIFTVER}.tar.gz
|
|
||||||
|
|
||||||
Source30: gluster-swift-account.service
|
|
||||||
Source31: gluster-swift-container.service
|
|
||||||
Source32: gluster-swift-object.service
|
|
||||||
Source33: gluster-swift-proxy.service
|
|
||||||
Source34: gluster-swift-account@.service
|
|
||||||
Source35: gluster-swift-container@.service
|
|
||||||
Source36: gluster-swift-object@.service
|
|
||||||
Source37: gluster-swift.tmpfs
|
|
||||||
Source40: gluster-swift-account.init
|
|
||||||
Source41: gluster-swift-container.init
|
|
||||||
Source42: gluster-swift-object.init
|
|
||||||
Source43: gluster-swift-proxy.init
|
|
||||||
Source44: gluster-swift-functions
|
|
||||||
# these first appeared in openstack-swift-1.7.4-2.fc19
|
|
||||||
Source50: gluster-swift-account-replicator.service
|
|
||||||
Source51: gluster-swift-account-replicator@.service
|
|
||||||
Source52: gluster-swift-account-auditor.service
|
|
||||||
Source53: gluster-swift-account-auditor@.service
|
|
||||||
Source54: gluster-swift-account-reaper.service
|
|
||||||
Source55: gluster-swift-account-reaper@.service
|
|
||||||
Source56: gluster-swift-container-replicator.service
|
|
||||||
Source57: gluster-swift-container-replicator@.service
|
|
||||||
Source58: gluster-swift-container-auditor.service
|
|
||||||
Source59: gluster-swift-container-auditor@.service
|
|
||||||
Source60: gluster-swift-container-updater.service
|
|
||||||
Source61: gluster-swift-container-updater@.service
|
|
||||||
Source62: gluster-swift-object-replicator.service
|
|
||||||
Source63: gluster-swift-object-replicator@.service
|
|
||||||
Source64: gluster-swift-object-auditor.service
|
|
||||||
Source65: gluster-swift-object-auditor@.service
|
|
||||||
Source66: gluster-swift-object-updater.service
|
|
||||||
Source67: gluster-swift-object-updater@.service
|
|
||||||
Source68: gluster-swift-object-expirer.service
|
|
||||||
Source69: gluster-swift-object-expirer@.service
|
|
||||||
# these first appeared in openstack-swift-1.7.4-1.fc18 and -1.7.4-2.el6
|
|
||||||
Source70: account-server.conf
|
|
||||||
Source71: container-server.conf
|
|
||||||
Source72: object-server.conf
|
|
||||||
Source73: proxy-server.conf
|
|
||||||
Source74: swift.conf
|
|
||||||
Source75: object-expirer.conf
|
|
||||||
|
|
||||||
Patch20: 0001-Use-updated-parallel-install-versions-of-epel-packag.patch
|
|
||||||
Patch21: 0002-Add-fixes-for-building-the-doc-package.patch
|
|
||||||
Patch22: glusterfs-3.3.1.swift.constraints.backport-1.7.4.patch
|
|
||||||
Patch23: glusterfs-3.4.0.swift.egginfo-grizzly.patch
|
|
||||||
Patch24: 0002-Add-fixes-for-building-the-doc-package.patch.180
|
|
||||||
#BuildRoot: %(mktemp -ud %{_tmppath}/swift-%{SWIFTVER}-%{release}-XXXXXX)
|
#BuildRoot: %(mktemp -ud %{_tmppath}/swift-%{SWIFTVER}-%{release}-XXXXXX)
|
||||||
|
|
||||||
%if ( 0%{?_with_systemd:1} )
|
%if ( 0%{?_with_systemd:1} )
|
||||||
@ -563,13 +571,6 @@ Requires: python
|
|||||||
Obsoletes: glusterfs-swift-plugin < 3.3.1-4
|
Obsoletes: glusterfs-swift-plugin < 3.3.1-4
|
||||||
Obsoletes: glusterfs-swift-ufo <= 3.3.1-4
|
Obsoletes: glusterfs-swift-ufo <= 3.3.1-4
|
||||||
|
|
||||||
%if ( 0%{_for_fedora_koji_builds} )
|
|
||||||
Source15: http://download.gluster.org/pub/gluster/glusterfs/qa-releases/%{version}%{?prereltag}/UFO/gluster-swift-ufo-%{UFOVER}%{?prereltag}.tar.gz
|
|
||||||
%else
|
|
||||||
Source15: gluster-swift-ufo-@PACKAGE_VERSION@.tar.gz
|
|
||||||
%endif
|
|
||||||
Patch15: %{name}-3.3.1.ufo.gluster.swift.common.DiskFile-1.7.4.patch
|
|
||||||
|
|
||||||
%description ufo
|
%description ufo
|
||||||
Gluster Unified File and Object Storage unifies NAS and object storage
|
Gluster Unified File and Object Storage unifies NAS and object storage
|
||||||
technology. This provides a system for data storage that enables users to access
|
technology. This provides a system for data storage that enables users to access
|
||||||
@ -1416,6 +1417,12 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 9 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.4.beta1
|
||||||
|
- prerelease 3.4.0beta1 for oVirt/vdsm dependencies in Fedora19
|
||||||
|
|
||||||
|
* Wed May 8 2013 Niels de Vos <devos@fedoraproject.org>
|
||||||
|
- include all Sources and Patches into the src.rpm
|
||||||
|
|
||||||
* Tue May 7 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.1.beta1
|
* Tue May 7 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.1.beta1
|
||||||
- prerelease 3.4.0beta1 for oVirt/vdsm dependencies in Fedora19
|
- prerelease 3.4.0beta1 for oVirt/vdsm dependencies in Fedora19
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user