From d80b431d7026573e8e8a383114a40e60063dc7ec Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 27 Sep 2013 08:55:19 -0400 Subject: [PATCH] GlusterFS-3.4.1-1 GA release --- .gitignore | 1 - glusterfs.spec | 756 +------------------------------------------------ sources | 4 +- 3 files changed, 16 insertions(+), 745 deletions(-) diff --git a/.gitignore b/.gitignore index 20f167c..6e2ab76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ gluster*.tar.gz -swift-*.tar.gz *.src.rpm diff --git a/glusterfs.spec b/glusterfs.spec index 14ea0bf..757dd90 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -4,7 +4,7 @@ %global _for_fedora_koji_builds 1 # uncomment and add '%' to use the prereltag for pre-releases -# global prereltag beta4 +# %%global prereltag rc1 # if you wish to compile an rpm without rdma support, compile like this... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma @@ -42,31 +42,15 @@ %define _without_bd --disable-bd-xlator %endif -# if you wish to build rpms without UFO, compile like this -# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@tar.gz --without ufo -%{?_without_ufo:%global _without_ufo true} - %if ( 0%{?fedora} && 0%{?fedora} > 16 ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) %global _with_systemd true %endif -%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) -%global SWIFTVER 1.8.0 -%if ( 0%{_for_fedora_koji_builds} ) -%global UFOVER 1.2 -%else -%global UFOVER @PACKAGE_VERSION@ -%endif -%if ( 0%{!?_without_ufo:1} ) -%global _with_ufo true -%endif -%endif - Summary: Cluster File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.4.0 -Release: 8%{?prereltag:.%{prereltag}}%{?dist} +Version: 3.4.1 +Release: 1%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else Name: @PACKAGE_NAME@ @@ -96,70 +80,6 @@ Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) ) -# we don't build swift/ufo on rhel5 -# not including the sources is ugly, but we state our intentions clearly - -%if ( 0%{_for_fedora_koji_builds} ) -Source15: http://download.gluster.org/pub/gluster/glusterfs/3.4/%{version}%{?prereltag}/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 - -%endif - -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%{_for_fedora_koji_builds} ) %global glusterfsd_service %{S:%{SOURCE11}} @@ -176,10 +96,6 @@ Requires(postun): systemd-units # can't seem to make a generic macro that works %define _init_glusterd %{_unitdir}/glusterd.service %define _init_glusterfsd %{_unitdir}/glusterfsd.service -%define _init_gluster_swift_account %{_unitdir}/gluster-swift-account.service -%define _init_gluster_swift_object %{_unitdir}/gluster-swift-object.service -%define _init_gluster_swift_container %{_unitdir}/gluster-swift-container.service -%define _init_gluster_swift_proxy %{_unitdir}/gluster-swift-proxy.service %else %if ( 0%{_for_fedora_koji_builds} ) %global glusterfsd_service %{S:%{SOURCE13}} @@ -196,10 +112,6 @@ Requires(postun): /sbin/service # can't seem to make a generic macro that works %define _init_glusterd %{_sysconfdir}/init.d/glusterd %define _init_glusterfsd %{_sysconfdir}/init.d/glusterfsd -%define _init_gluster_swift_account %{_sysconfdir}/init.d/gluster-swift-account -%define _init_gluster_swift_object %{_sysconfdir}/init.d/gluster-swift-object -%define _init_gluster_swift_container %{_sysconfdir}/init.d/gluster-swift-container -%define _init_gluster_swift_proxy %{_sysconfdir}/init.d/gluster-swift-proxy %endif Requires: %{name}-libs = %{version}-%{release} @@ -449,182 +361,6 @@ is in user space and easily manageable. This package provides the api include files. -%if ( 0%{?_with_ufo:1} ) -%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 ) -%package swift - -Summary: GlusterFS OpenStack Object Storage -Group: Applications/System -License: ASL 2.0 -BuildArch: noarch - -#BuildRoot: %(mktemp -ud %{_tmppath}/swift-%{SWIFTVER}-%{release}-XXXXXX) - -%if ( 0%{?_with_systemd:1} ) -%global glusterswiftaccount_service %{S:%{SOURCE30}} -%global glusterswiftcontainer_service %{S:%{SOURCE31}} -%global glusterswiftobject_service %{S:%{SOURCE32}} -%global glusterswiftproxy_service %{S:%{SOURCE33}} -%else -%global glusterswiftaccount_service %{S:%{SOURCE40}} -%global glusterswiftcontainer_service %{S:%{SOURCE41}} -%global glusterswiftobject_service %{S:%{SOURCE42}} -%global glusterswiftproxy_service %{S:%{SOURCE43}} -%endif - -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: python-netifaces -%if ( 0%{?rhel} && 0%{?rhel} < 7 ) -BuildRequires: python-webob1.0 -BuildRequires: python-paste-deploy1.5 -Requires: python-webob1.0 -Requires: python-paste-deploy1.5 -%else -BuildRequires: python-webob -BuildRequires: python-paste-deploy -Requires: python-webob -Requires: python-paste-deploy -%endif -Requires: %{name} = %{version}-%{release} -Requires: python-configobj -Requires: python-eventlet >= 0.9.8 -Requires: python-greenlet >= 0.3.1 -Requires: python-simplejson -Requires: pyxattr -Requires: python-setuptools -Requires: python-netifaces -%if "%{SWIFTVER}" != "1.7.4" -Requires: python-swiftclient -%endif - -Conflicts: openstack-swift - - -%description swift - -OpenStack Object Storage (swift) aggregates commodity servers to work together -in clusters for reliable, redundant, and large-scale storage of static objects. -Objects are written to multiple hardware devices in the data center, with the -OpenStack software responsible for ensuring data replication and integrity -across the cluster. Storage clusters can scale horizontally by adding new nodes, -which are automatically configured. Should a node fail, OpenStack works to -replicate its content from other active nodes. Because OpenStack uses software -logic to ensure data replication and distribution across different devices, -inexpensive commodity hard drives and servers can be used in lieu of more -expensive equipment. - - -%package swift-account -Summary: A swift account server -Group: Applications/System -License: ASL 2.0 -BuildArch: noarch -Requires: %{name}-swift = %{version}-%{release} - -%description swift-account -OpenStack Object Storage (swift) aggregates commodity servers to work together -in clusters for reliable, redundant, and large-scale storage of static objects. - -This package contains the %{name}-swift account server. - - -%package swift-container -Summary: A swift container server -Group: Applications/System -License: ASL 2.0 -BuildArch: noarch -Requires: %{name}-swift = %{version}-%{release} - -%description swift-container -OpenStack Object Storage (swift) aggregates commodity servers to work together -in clusters for reliable, redundant, and large-scale storage of static objects. - -This package contains the %{name}-swift container server. - -%package swift-object -Summary: A swift object server -Group: Applications/System -License: ASL 2.0 -BuildArch: noarch -Requires: %{name}-swift = %{version}-%{release} -Requires: rsync >= 3.0 - -%description swift-object -OpenStack Object Storage (swift) aggregates commodity servers to work together -in clusters for reliable, redundant, and large-scale storage of static objects. - -This package contains the %{name}-swift object server. - -%package swift-proxy -Summary: A swift proxy server -Group: Applications/System -License: ASL 2.0 -BuildArch: noarch -Requires: %{name}-swift = %{version}-%{release} - -%description swift-proxy -OpenStack Object Storage (swift) aggregates commodity servers to work together -in clusters for reliable, redundant, and large-scale storage of static objects. - -This package contains the %{name}-swift proxy server. - - -%package swift-doc -Summary: Documentation for %{name} -Group: Documentation -BuildArch: noarch -# Required for generating docs -BuildRequires: python-eventlet -BuildRequires: python-simplejson -%if ( 0%{?rhel} && 0%{?rhel} < 7 ) -BuildRequires: python-webob1.0 -BuildRequires: python-sphinx10 -%else -BuildRequires: python-webob -BuildRequires: python-sphinx -%endif -BuildRequires: pyxattr - -%description swift-doc -OpenStack Object Storage (swift) aggregates commodity servers to work together -in clusters for reliable, redundant, and large-scale storage of static objects. - -This package contains documentation files for %{name}-swift. - -%endif - -%package ufo -Summary: GlusterFS Unified File and Object Storage. -Group: Applications/System -License: ASL 2.0 -BuildArch: noarch -BuildRequires: python-setuptools -%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 ) -Requires: %{name}-swift = %{version}-%{release} -%else -Requires: openstack-swift = %{SWIFTVER} -Requires: openstack-swift-account = %{SWIFTVER} -Requires: openstack-swift-container = %{SWIFTVER} -Requires: openstack-swift-object = %{SWIFTVER} -Requires: openstack-swift-proxy = %{SWIFTVER} -Obsoletes: %{name}-swift -%endif -Requires: memcached -Requires: openssl -Requires: python-setuptools -Requires: python -Obsoletes: glusterfs-swift-plugin < 3.3.1-4 -Obsoletes: glusterfs-swift-ufo <= 3.3.1-4 - -%description ufo -Gluster Unified File and Object Storage unifies NAS and object storage -technology. This provides a system for data storage that enables users to access -the same data as an object and as a file, simplifying management and controlling -storage costs. - -%endif - %prep %setup -q -n %{name}-%{version}%{?prereltag} %if ( 0%{_for_fedora_koji_builds} ) @@ -634,36 +370,6 @@ storage costs. %patch2 -p1 %endif %endif -%if ( 0%{?_with_ufo:1} ) -%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 ) -# unpack swift-1.x.y -%setup -q -T -D -n %{name}-%{version}%{?prereltag} -a 20 -%endif -# unpack gluster ufo -%setup -q -T -D -n %{name}-%{version}%{?prereltag} -a 15 -%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 ) -cd swift-%{SWIFTVER} -%if ( 0%{?rhel} && 0%{?rhel} < 7 ) -%patch20 -p1 -%if "%{SWIFTVER}" == "1.7.4" -%patch21 -p1 -%else -%patch24 -p1 -%endif -%endif -%if "%{SWIFTVER}" == "1.7.4" -%patch22 -p1 -%else -%patch23 -p1 -%endif -%endif -%if ( 0%{_for_fedora_koji_builds} ) -%if ( "%{UFOVER}" == "1.1" ) -cd ../ufo -%patch15 -p1 -%endif -%endif -%endif %build ./autogen.sh @@ -678,21 +384,6 @@ cd ../ufo %{__make} %{?_smp_mflags} -%if ( 0%{?_with_ufo:1} ) -%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 ) -cd swift-%{SWIFTVER} -%{__python} setup.py build -%{__mkdir_p} doc/build -%if ( 0%{?fedora} ) -%{__python} setup.py build_sphinx -%endif -cd .. -%endif -cd ufo -%{__python} setup.py build -cd .. -%endif - %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} @@ -720,6 +411,8 @@ cd .. %{__install} -D -p -m 0644 extras/glusterd-sysconfig \ %{buildroot}%{_sysconfdir}/sysconfig/glusterd %endif +%{__mkdir_p} %{buildroot}%{python_sitelib}/gluster +touch %{buildroot}%{python_sitelib}/gluster/__init__.py %if ( 0%{_for_fedora_koji_builds} ) %if ( 0%{?rhel} && 0%{?rhel} <= 5 ) @@ -821,103 +514,6 @@ touch %{buildroot}%{_sharedstatedir}/glusterd/options touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid -%if ( 0%{?_with_ufo:1} ) -%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 ) -cd swift-%{SWIFTVER} -%{__python} setup.py install -O1 --skip-build --root %{buildroot} -# common swift .service or .init files -%_init_install %{glusterswiftaccount_service} gluster-swift-account -%_init_install %{glusterswiftcontainer_service} gluster-swift-container -%_init_install %{glusterswiftobject_service} gluster-swift-object -%_init_install %{glusterswiftproxy_service} gluster-swift-proxy -%if ( 0%{?_with_systemd:1} ) -# extra systemd .service files -%_init_install %{SOURCE34} gluster-swift-account@ -%_init_install %{SOURCE35} gluster-swift-container@ -%_init_install %{SOURCE36} gluster-swift-object@ -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) -# more extra systemd .service files in f19 -%_init_install %{SOURCE50} gluster-swift-account-replicator -%_init_install %{SOURCE51} gluster-swift-account-replicator@ -%_init_install %{SOURCE52} gluster-swift-account-auditor -%_init_install %{SOURCE53} gluster-swift-account-auditor@ -%_init_install %{SOURCE54} gluster-swift-account-reaper -%_init_install %{SOURCE55} gluster-swift-account-reaper@ -%_init_install %{SOURCE56} gluster-swift-container-replicator -%_init_install %{SOURCE57} gluster-swift-container-replicator@ -%_init_install %{SOURCE58} gluster-swift-container-auditor -%_init_install %{SOURCE59} gluster-swift-container-auditor@ -%_init_install %{SOURCE60} gluster-swift-container-updater -%_init_install %{SOURCE61} gluster-swift-container-updater@ -%_init_install %{SOURCE62} gluster-swift-object-replicator -%_init_install %{SOURCE63} gluster-swift-object-replicator@ -%_init_install %{SOURCE64} gluster-swift-object-auditor -%_init_install %{SOURCE65} gluster-swift-object-auditor@ -%_init_install %{SOURCE66} gluster-swift-object-updater -%_init_install %{SOURCE67} gluster-swift-object-updater@ -%_init_install %{SOURCE68} gluster-swift-object-expirer -%_init_install %{SOURCE69} gluster-swift-object-expirer@ -%endif -%else -# Init helper functions -%{__install} -p -D -m 644 %{SOURCE44} %{buildroot}%{_datarootdir}/gluster-swift/functions -# Init scripts -%_init_install %{glusterswiftaccount_service} gluster-swift-account -%_init_install %{glusterswiftcontainer_service} gluster-swift-container -%_init_install %{glusterswiftobject_service} gluster-swift-object -%_init_install %{glusterswiftproxy_service} gluster-swift-proxy -%endif -# Misc other -%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/swift -%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/swift/account-server -%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/swift/container-server -%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/swift/object-server -%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/swift/proxy-server -# Config files -#%if ( 0%{?fedora} && 0%{?fedora} > 17 ) -# these first appeared in openstack-swift-1.7.4-1.fc18 -#install -p -D -m 660 %{SOURCE70} %{buildroot}%{_sysconfdir}/swift/account-server.conf -#install -p -D -m 660 %{SOURCE71} %{buildroot}%{_sysconfdir}/swift/container-server.conf -#install -p -D -m 660 %{SOURCE72} %{buildroot}%{_sysconfdir}/swift/object-server.conf -#install -p -D -m 660 %{SOURCE73} %{buildroot}%{_sysconfdir}/swift/proxy-server.conf -#install -p -D -m 660 %{SOURCE74} %{buildroot}%{_sysconfdir}/swift/swift.conf -#install -p -D -m 660 %{SOURCE75} %{buildroot}%{_sysconfdir}/swift/object-expirer.conf -#%endif -# Install pid directory -%{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/swift -%{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/swift/account-server -%{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/swift/container-server -%{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/swift/object-server -%{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/swift/proxy-server -%if ( 0%{?_with_systemd:1} ) -# Swift run directories -%{__mkdir_p} %{buildroot}%{_sysconfdir}/tmpfiles.d -install -p -m 0644 %{SOURCE37} %{buildroot}%{_sysconfdir}/tmpfiles.d/gluster-swift.conf -%endif -# Install recon directory -install -d -m 755 %{buildroot}%{_localstatedir}/cache/swift -# man pages -install -d -m 755 %{buildroot}%{_mandir}/man5 -for m in doc/manpages/*.5; do - install -p -m 0644 $m %{buildroot}%{_mandir}/man5 -done -install -d -m 755 %{buildroot}%{_mandir}/man1 -for m in doc/manpages/*.1; do - install -p -m 0644 $m %{buildroot}%{_mandir}/man1 -done -cd .. -%endif -cd ufo -%{__python} setup.py install -O1 --skip-build --root %{buildroot} -cd .. -%{__mkdir_p} %{buildroot}%{_sysconfdir}/swift -cp -r ufo/etc/* %{buildroot}%{_sysconfdir}/swift/ -%{__mkdir_p} %{buildroot}%{_bindir} -cp ufo/bin/gluster-swift-gen-builders %{buildroot}%{_bindir}/ -%endif -# Remove tests -%{__rm} -rf %{buildroot}/%{python_sitelib}/test - %clean %{__rm} -rf %{buildroot} @@ -1078,6 +674,7 @@ fi %exclude %{_libdir}/*.so %{_libdir}/libgfapi.* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api* +%{python_sitelib}/gluster/__init__.p* %if ( 0%{!?_without_ocf:1} ) %files resource-agents @@ -1099,158 +696,6 @@ fi %{_libdir}/libgfapi.so %{_includedir}/glusterfs/api/* -%if ( 0%{?_with_ufo:1} ) -%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 ) -%files swift -%defattr(-,root,root,-) -%doc swift-%{SWIFTVER}/AUTHORS -%doc swift-%{SWIFTVER}/LICENSE -%doc swift-%{SWIFTVER}/README* -%doc swift-%{SWIFTVER}/etc/dispersion.conf-sample -%doc swift-%{SWIFTVER}/etc/drive-audit.conf-sample -%doc swift-%{SWIFTVER}/etc/object-expirer.conf-sample -%doc swift-%{SWIFTVER}/etc/swift.conf-sample -%{_mandir}/man5/dispersion.conf.5* -%{_mandir}/man1/swift*.1* -%if ( 0%{?_with_systemd:1} ) -%config(noreplace) %{_sysconfdir}/tmpfiles.d/gluster-swift.conf -%else -%dir %{_datarootdir}/gluster-swift/functions -%endif -%dir %{_sysconfdir}/swift -%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift -%dir %{python_sitelib}/swift -%{_bindir}/swift-account-audit -%{_bindir}/swift-bench -%{_bindir}/swift-bench-client -%{_bindir}/swift-drive-audit -%{_bindir}/swift-get-nodes -%{_bindir}/swift-init -%{_bindir}/swift-ring-builder -%{_bindir}/swift-dispersion-populate -%{_bindir}/swift-dispersion-report -%{_bindir}/swift-recon* -%{_bindir}/swift-object-expirer -%{_bindir}/swift-oldies -%{_bindir}/swift-orphans -%{_bindir}/swift-form-signature -%{_bindir}/swift-temp-url -%{python_sitelib}/swift/*.py* -%{python_sitelib}/swift/common -%{python_sitelib}/swift-%{SWIFTVER}-*.egg-info - -%files swift-account -%defattr(-,root,root,-) -%doc swift-%{SWIFTVER}/etc/account-server.conf-sample -%{_mandir}/man5/account-server.conf.5* -%{_mandir}/man1/swift-account-auditor.1* -%{_mandir}/man1/swift-account-reaper.1* -%{_mandir}/man1/swift-account-replicator.1* -%{_mandir}/man1/swift-account-server.1* -%_init_gluster_swift_account -%if ( 0%{?_with_systemd:1} ) -%{_unitdir}/gluster-swift-account@.service -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) -%{_unitdir}/gluster-swift-account-*.service -%endif -%endif -%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/account-server -%dir %{_sysconfdir}/swift/account-server -%{_bindir}/swift-account-auditor -%{_bindir}/swift-account-reaper -%{_bindir}/swift-account-replicator -%{_bindir}/swift-account-server -%{python_sitelib}/swift/account - -%files swift-container -%defattr(-,root,root,-) -%doc swift-%{SWIFTVER}/etc/container-server.conf-sample -%{_mandir}/man5/container-server.conf.5* -%{_mandir}/man1/swift-container-auditor.1* -%{_mandir}/man1/swift-container-replicator.1* -%{_mandir}/man1/swift-container-server.1* -%{_mandir}/man1/swift-container-sync.1* -%{_mandir}/man1/swift-container-updater.1* -%_init_gluster_swift_container -%if ( 0%{?_with_systemd:1} ) -%{_unitdir}/gluster-swift-container@.service -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) -%{_unitdir}/gluster-swift-container-*.service -%endif -%endif -%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/container-server -%dir %attr(0755, swift, swift) %{_localstatedir}/cache/swift -%dir %{_sysconfdir}/swift/container-server -%{_bindir}/swift-container-auditor -%{_bindir}/swift-container-server -%{_bindir}/swift-container-replicator -%{_bindir}/swift-container-updater -%{_bindir}/swift-container-sync -%{python_sitelib}/swift/container - -%files swift-object -%defattr(-,root,root,-) -%doc swift-%{SWIFTVER}/etc/object-server.conf-sample -%doc swift-%{SWIFTVER}/etc/rsyncd.conf-sample -%{_mandir}/man5/object-server.conf.5* -%{_mandir}/man1/swift-object-auditor.1* -%{_mandir}/man1/swift-object-info.1* -%{_mandir}/man1/swift-object-replicator.1* -%{_mandir}/man1/swift-object-server.1* -%{_mandir}/man1/swift-object-updater.1* -%_init_gluster_swift_object -%if ( 0%{?_with_systemd:1} ) -%{_unitdir}/gluster-swift-object@.service -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) -%{_unitdir}/gluster-swift-object-*.service -%exclude %{_unitdir}/gluster-swift-object-expirer*.service -%endif -%endif -%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/object-server -%dir %attr(0755, swift, swift) %{_localstatedir}/cache/swift -%dir %{_sysconfdir}/swift/object-server -%{_bindir}/swift-object-auditor -%{_bindir}/swift-object-info -%{_bindir}/swift-object-replicator -%{_bindir}/swift-object-server -%{_bindir}/swift-object-updater -%{python_sitelib}/swift/obj - -%files swift-proxy -%defattr(-,root,root,-) -%doc swift-%{SWIFTVER}/etc/proxy-server.conf-sample -%doc swift-%{SWIFTVER}/etc/object-expirer.conf-sample -%{_mandir}/man5/object-expirer.conf.5* -%{_mandir}/man5/proxy-server.conf.5* -%{_mandir}/man1/swift-object-expirer.1* -%{_mandir}/man1/swift-proxy-server.1* -%_init_gluster_swift_proxy -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) -%{_unitdir}/gluster-swift-object-expirer*.service -%endif -%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/proxy-server -%dir %attr(0755, swift, swift) %{_localstatedir}/cache/swift -%dir %{_sysconfdir}/swift/proxy-server -%{_bindir}/swift-object-expirer -%{_bindir}/swift-proxy-server -%{python_sitelib}/swift/proxy - -%files swift-doc -%defattr(-,root,root,-) -%doc swift-%{SWIFTVER}/LICENSE - -%endif - -%files ufo -%defattr(-,root,root,-) -%{python_sitelib}/gluster -%{python_sitelib}/gluster_swift_ufo-*-*.egg-info -%{_bindir}/gluster-swift-gen-builders -%{_sysconfdir}/swift/*-gluster -%{_sysconfdir}/swift/*/1.conf-gluster -%endif - - %post server # Legacy server %_init_enable glusterd @@ -1315,187 +760,16 @@ if [ $1 -ge 1 ]; then fi -%if ( 0%{?_with_ufo:1} ) -%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 ) -%pre swift -getent group swift >/dev/null || groupadd -r swift -g 160 -getent passwd swift >/dev/null || \ -useradd -r -g swift -u 160 -d %{_sharedstatedir}/swift -s /sbin/nologin \ --c "OpenStack Swift Daemons" swift -exit 0 - -%pre swift-account - -if [ -f /etc/swift/account-server/1.conf ]; then - echo "warning: /etc/swift/account-server/1.conf saved as /etc/swift/account-server/1.conf.rpmsave" - cp /etc/swift/account-server/1.conf /etc/swift/account-server/1.conf.rpmsave -fi - - -%post swift-account -%_init_enable gluster-swift-account -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) -%_init_enable gluster-swift-account-replicator -%_init_enable gluster-swift-account-auditor -%_init_enable gluster-swift-account-reaper -%endif - - -%preun swift-account -if [ $1 = 0 ] ; then - %_init_stop gluster-swift-account - %_init_disable gluster-swift-account -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) - %_init_stop gluster-swift-account-replicator - %_init_disable gluster-swift-account-replicator - %_init_stop gluster-swift-account-auditor - %_init_disable gluster-swift-account-auditor - %_init_stop gluster-swift-account-reaper - %_init_disable gluster-swift-account-reaper -%endif -fi - - -%postun swift-account -if [ $1 -ge 1 ] ; then - %_init_restart gluster-swift-account -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) - %_init_restart gluster-swift-account-replicator - %_init_restart gluster-swift-account-auditor - %_init_restart gluster-swift-account-reaper -%endif -fi - - -%pre swift-container - -if [ -f /etc/swift/container-server/1.conf ]; then - echo "warning: /etc/swift/container-server/1.conf saved as /etc/swift/container-server/1.conf.rpmsave" - cp /etc/swift/container-server/1.conf /etc/swift/container-server/1.conf.rpmsave -fi - - -%post swift-container -%_init_enable gluster-swift-container -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) -%_init_enable gluster-swift-container-replicator -%_init_enable gluster-swift-container-auditor -%_init_enable gluster-swift-container-updater -%endif - - -%preun swift-container -if [ $1 = 0 ] ; then - %_init_stop gluster-swift-container - %_init_disable gluster-swift-container -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) - %_init_stop gluster-swift-container-replicator - %_init_disable gluster-swift-container-replicator - %_init_stop gluster-swift-container-auditor - %_init_disable gluster-swift-container-auditor - %_init_stop gluster-swift-container-updater - %_init_disable gluster-swift-container-updater -%endif -fi - - -%postun swift-container -if [ $1 -ge 1 ] ; then - %_init_restart gluster-swift-container -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) - %_init_restart gluster-swift-container-replicator - %_init_restart gluster-swift-container-auditor - %_init_restart gluster-swift-container-updator -%endif -fi - - -%pre swift-object - -if [ -f /etc/swift/object-server/1.conf ]; then - echo "warning: /etc/swift/object-server/1.conf saved as /etc/swift/object-server/1.conf.rpmsave" - cp /etc/swift/object-server/1.conf /etc/swift/object-server/1.conf.rpmsave -fi - - -%post swift-object -%_init_enable gluster-swift-object -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) -%_init_enable gluster-swift-object-replicator -%_init_enable gluster-swift-object-auditor -%_init_enable gluster-swift-object-updater -%endif - - -%preun swift-object -if [ $1 = 0 ] ; then - %_init_stop gluster-swift-object - %_init_disable gluster-swift-object -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) - %_init_stop gluster-swift-object-replicator - %_init_disable gluster-swift-object-replicator - %_init_stop gluster-swift-object-auditor - %_init_disable gluster-swift-object-auditor - %_init_stop gluster-swift-object-updater - %_init_disable gluster-swift-object-updater -%endif -fi - - -%postun swift-object -if [ $1 -ge 1 ] ; then - %_init_restart gluster-swift-object -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) - %_init_restart gluster-swift-object-replicator - %_init_restart gluster-swift-object-auditor - %_init_restart gluster-swift-object-updater -%endif -fi - - -%pre swift-proxy - -if [ -f /etc/swift/proxy-server.conf ]; then - echo "warning: /etc/swift/proxy-server.conf saved as /etc/swift/proxy-server.conf.rpmsave" - cp /etc/swift/proxy-server.conf /etc/swift/proxy-server.conf.rpmsave -fi -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) -if [ -f /etc/swift/object-expirer.conf ]; then - echo "warning: /etc/swift/object-expirer.conf saved as /etc/swift/object-expirer.conf.rpmsave" - cp /etc/swift/object-expirer.conf /etc/swift/object-expirer.conf.rpmsave -fi -%endif - - -%post swift-proxy -%_init_enable gluster-swift-proxy -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) -%_init_enable gluster-swift-object-expirer -%endif - - -%preun swift-proxy -if [ $1 = 0 ] ; then - %_init_stop gluster-swift-proxy - %_init_disable gluster-swift-proxy -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) - %_init_stop gluster-swift-object-expirer - %_init_disable gluster-swift-object-expirer -%endif -fi - - -%postun swift-proxy -if [ $1 -ge 1 ] ; then - %_init_restart gluster-swift-proxy -%if ( 0%{?fedora} && 0%{?fedora} > 18 ) - %_init_restart gluster-swift-object-expirer -%endif -fi -%endif -%endif - %changelog +* Fri Sep 27 2013 Kaleb S. KEITHLEY - 3.4.1-1 +- GlusterFS 3.4.1 GA, glusterfs-3.4.1-1 + +* Thu Sep 26 2013 Kaleb S. KEITHLEY - 3.4.1-0.2rc1 +- scratch build for community + +* Wed Sep 11 2013 Kaleb S. KEITHLEY - 3.4.1-0.1qa1 +- scratch build for community + * Fri Sep 6 2013 Niels de Vos - fix "warning: File listed twice: .../glusterd.info" while building diff --git a/sources b/sources index aee1922..e68d688 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -86d9aff765b6ac49f8b19e6ffad6adf9 glusterfs-3.4.0.tar.gz -0d2479c3cbb124fa3a6b001d0d4d5a8b swift-1.8.0.tar.gz -614628f29cd47fba95d1530363d7900b gluster-swift-ufo-1.2.tar.gz +dce3d066b7351b360454ea9ca4cabe4c glusterfs-3.4.1.tar.gz