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

preliminary 3.3.1-10

Browse Source
This commit is contained in:
Kaleb S. KEITHLEY 2013-02-12 14:37:35 -05:00
parent 5faf13508c
commit 7c5ca427b7
1 changed files with 202 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

348
glusterfs.spec
View File

@ -1,4 +1,5 @@
%global _for_fedora_koji_builds 1
# if you wish to compile an rpm without rdma support, compile like this... # if you wish to compile an rpm without rdma support, compile like this...
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
@ -23,23 +24,39 @@
%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
%global SWIFTVER 1.7.4 %global SWIFTVER 1.7.4
%if 0%{_for_fedora_koji_builds}
%global UFOVER 1.1 %global UFOVER 1.1
%else
%global UFOVER @PACKAGE_VERSION@
%endif
%global _with_ufo true %global _with_ufo true
%endif %endif
%if ( 0%{?fedora} && 0%{?fedora} > 16 ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) %if ( 0%{?fedora} && 0%{?fedora} > 16 ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
%global _with_systemd true %global _with_systemd true
%endif %endif
Summary: Cluster File System Summary: Cluster File System
%if 0%{_for_fedora_koji_builds}
Name: glusterfs Name: glusterfs
Version: 3.3.1 Version: 3.3.1
Release: 9%{?dist} Release: 10%{?dist}
%else
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
Release: 1%{?dist}
%endif
License: GPLv3+ and (GPLv2 or LGPLv3+) License: GPLv3+ and (GPLv2 or LGPLv3+)
Group: System Environment/Base Group: System Environment/Base
%if 0%{_for_fedora_koji_builds}
Vendor: Red Hat Vendor: Red Hat
%endif
URL: http://www.gluster.org//docs/index.php/GlusterFS URL: http://www.gluster.org//docs/index.php/GlusterFS
#Source0: http://download.gluster.org/pub/gluster/glusterfs/3.3/%{version}/glusterfs-%{version}.tar.gz %if 0%{_for_fedora_koji_builds}
Source0: http://bits.gluster.com/pub/gluster/glusterfs/src/glusterfs-%{version}.tar.gz Source0: http://bits.gluster.com/pub/gluster/glusterfs/src/glusterfs-%{version}.tar.gz
%else
Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
%endif
Source1: glusterd.sysconfig Source1: glusterd.sysconfig
Source2: glusterfsd.sysconfig Source2: glusterfsd.sysconfig
Source3: umount.glusterfs Source3: umount.glusterfs
@ -51,9 +68,14 @@ Patch1: %{name}-3.3.0.libglusterfs.Makefile.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Source10: glusterd.service
Source11: glusterfsd.service
Source12: glusterd.init
Source13: glusterfsd.init
%if 0%{?_with_systemd:1} %if 0%{?_with_systemd:1}
Source7: glusterd.service %global glusterd_service %{S:%{SOURCE10}}
Source8: glusterfsd.service %global glusterfsd_service %{S:%{SOURCE11}}
BuildRequires: systemd-units BuildRequires: systemd-units
Requires(post): systemd-units Requires(post): systemd-units
Requires(preun): systemd-units Requires(preun): systemd-units
@ -71,8 +93,10 @@ Requires(postun): systemd-units
%define _init_gluster_swift_container %{_unitdir}/gluster-swift-container.service %define _init_gluster_swift_container %{_unitdir}/gluster-swift-container.service
%define _init_gluster_swift_proxy %{_unitdir}/gluster-swift-proxy.service %define _init_gluster_swift_proxy %{_unitdir}/gluster-swift-proxy.service
%else %else
Source7: glusterd.init %if 0%{_for_fedora_koji_builds}
Source8: glusterfsd.init %global glusterd_service %{S:%{SOURCE12}}
%global glusterfsd_service %{S:%{SOURCE13}}
%endif
Requires(post): /sbin/chkconfig Requires(post): /sbin/chkconfig
Requires(preun): /sbin/service Requires(preun): /sbin/service
Requires(preun): /sbin/chkconfig Requires(preun): /sbin/chkconfig
@ -229,61 +253,70 @@ Group: Applications/System
License: ASL 2.0 License: ASL 2.0
BuildArch: noarch BuildArch: noarch
Source10: http://launchpad.net/swift/folsom/%{SWIFTVER}/+download/swift-%{SWIFTVER}.tar.gz %if 0%{_for_fedora_koji_builds}
%if ( 0%{?fedora} && 0%{?fedora} > 17 ) || ( 0%{?rhel} && 0%{?rhel} > 6 ) Source20: http://launchpad.net/swift/folsom/%{SWIFTVER}/+download/swift-%{SWIFTVER}.tar.gz
# these first appeared in openstack-swift-1.7.4-1.fc18 and -1.7.4-2.el6
Source100: account-server.conf
Source101: container-server.conf
Source102: object-server.conf
Source103: proxy-server.conf
Source104: swift.conf
%endif
%if 0%{?_with_systemd:1}
Source11: gluster-swift-account.service
Source12: gluster-swift-account@.service
Source13: gluster-swift-container.service
Source14: gluster-swift-container@.service
Source15: gluster-swift-object.service
Source16: gluster-swift-object@.service
Source17: gluster-swift-proxy.service
Source18: gluster-swift.tmpfs
%if ( 0%{?fedora} && 0%{?fedora} > 18 )
# these first appeared in openstack-swift-1.7.4-2.fc19
Source110: gluster-swift-account-replicator.service
Source111: gluster-swift-account-replicator@.service
Source112: gluster-swift-account-auditor.service
Source113: gluster-swift-account-auditor@.service
Source114: gluster-swift-account-reaper.service
Source115: gluster-swift-account-reaper@.service
Source116: gluster-swift-container-replicator.service
Source117: gluster-swift-container-replicator@.service
Source118: gluster-swift-container-auditor.service
Source119: gluster-swift-container-auditor@.service
Source120: gluster-swift-container-updater.service
Source121: gluster-swift-container-updater@.service
Source122: gluster-swift-object-replicator.service
Source123: gluster-swift-object-replicator@.service
Source124: gluster-swift-object-auditor.service
Source125: gluster-swift-object-auditor@.service
Source126: gluster-swift-object-updater.service
Source127: gluster-swift-object-updater@.service
Source128: gluster-swift-object-expirer.service
Source129: gluster-swift-object-expirer@.service
%endif
%else %else
Source11: gluster-swift-account.init Source20: swift-%{SWIFTVER}.tar.gz
Source12: gluster-swift-container.init
Source13: gluster-swift-object.init
Source14: gluster-swift-proxy.init
Source18: gluster-swift-functions
%endif %endif
%if ( 0%{?rhel} && 0%{?rhel} < 7 )
Patch10: 0001-Use-updated-parallel-install-versions-of-epel-packag.patch Source30: gluster-swift-account.service
Patch11: 0002-Add-fixes-for-building-the-doc-package.patch Source31: gluster-swift-container.service
%endif Source32: gluster-swift-object.service
Patch12: glusterfs-3.3.1.swift.constraints.backport-1.7.4.patch 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
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
#BuildRoot: %(mktemp -ud %{_tmppath}/swift-%{SWIFTVER}-%{release}-XXXXXX) #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: dos2unix BuildRequires: dos2unix
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python-setuptools BuildRequires: python-setuptools
@ -413,8 +446,13 @@ Requires: openssl
Requires: python 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
Source20: http://download.gluster.org/pub/gluster/glusterfs/3.3/3.3.1/UFO/gluster-swift-ufo-%{UFOVER}.tar.gz
Patch20: %{name}-3.3.1.ufo.gluster.swift.common.DiskFile-1.7.4.patch %if 0%{_for_fedora_koji_builds}
Source15: http://download.gluster.org/pub/gluster/glusterfs/3.3/3.3.1/UFO/gluster-swift-ufo-%{UFOVER}.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
@ -427,21 +465,25 @@ storage costs.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%if 0%{?_with_ufo:1} %if 0%{?_with_ufo:1}
# swift-1.4.8 # unpack swift-1.x.y
%setup -q -T -D -n %{name}-%{version} -a 10
# gluster ufo
%setup -q -T -D -n %{name}-%{version} -a 20 %setup -q -T -D -n %{name}-%{version} -a 20
# unpack gluster ufo
%setup -q -T -D -n %{name}-%{version} -a 15
%if 0%{_for_fedora_koji_builds}
#%patch0 -p0 #%patch0 -p0
%patch1 -p0 %patch1 -p0
%endif
cd swift-%{SWIFTVER} cd swift-%{SWIFTVER}
%if ( 0%{?rhel} && 0%{?rhel} < 7 ) %if ( 0%{?rhel} && 0%{?rhel} < 7 )
%patch10 -p1
%patch11 -p1
%endif
%patch12 -p1
dos2unix LICENSE
cd ../ufo
%patch20 -p1 %patch20 -p1
%patch21 -p1
%endif
%patch22 -p1
dos2unix LICENSE
%if 0%{_for_fedora_koji_builds}
cd ../ufo
%patch15 -p1
%endif
%endif %endif
%build %build
@ -485,8 +527,19 @@ cd ..
%{__mkdir_p} %{buildroot}%{_includedir}/glusterfs/server %{__mkdir_p} %{buildroot}%{_includedir}/glusterfs/server
%{__install} -p -m 0644 xlators/protocol/server/src/*.h \ %{__install} -p -m 0644 xlators/protocol/server/src/*.h \
%{buildroot}%{_includedir}/glusterfs/server/ %{buildroot}%{_includedir}/glusterfs/server/
%if 0%{_for_fedora_koji_builds}
%{__install} -D -p -m 0644 %{SOURCE1} \
%{buildroot}%{_sysconfdir}/sysconfig/glusterd
%{__install} -D -p -m 0644 %{SOURCE2} \
%{buildroot}%{_sysconfdir}/sysconfig/glusterfsd
%else
%{__install} -D -p -m 0644 extras/glusterd-sysconfig \
%{buildroot}%{_sysconfdir}/sysconfig/glusterd
%endif
# We'll use our init.d # We'll use our init.d
%if 0%{?_with_systemd:1}
%{__rm} -f %{buildroot}%{_sysconfdir}/init.d/glusterd %{__rm} -f %{buildroot}%{_sysconfdir}/init.d/glusterd
%endif
%{__mkdir_p} %{buildroot}%{_localstatedir}/log/glusterd %{__mkdir_p} %{buildroot}%{_localstatedir}/log/glusterd
%{__mkdir_p} %{buildroot}%{_localstatedir}/log/glusterfs %{__mkdir_p} %{buildroot}%{_localstatedir}/log/glusterfs
@ -506,14 +559,13 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sharedstatedir}/glusterd|g' \ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sharedstatedir}/glusterd|g' \
%{buildroot}%{_sysconfdir}/glusterfs/glusterd.vol %{buildroot}%{_sysconfdir}/glusterfs/glusterd.vol
# Install init script and sysconfig file # Install systemd .service files. `make install` will install the init files
%_init_install %{SOURCE7} glusterd %if ( 0%{?_with_systemd:1} ) || ( 0%{_for_fedora_koji_builds} )
%_init_install %{SOURCE8} glusterfsd %_init_install %{glusterd_service} glusterd
%{__install} -D -p -m 0644 %{SOURCE1} \ %_init_install %{glusterfsd_service} glusterfsd
%{buildroot}%{_sysconfdir}/sysconfig/glusterd %endif
%{__install} -D -p -m 0644 %{SOURCE2} \
%{buildroot}%{_sysconfdir}/sysconfig/glusterfsd
%if 0%{_for_fedora_koji_builds}
# Install wrapper umount script # Install wrapper umount script
%{__install} -D -p -m 0755 %{SOURCE3} \ %{__install} -D -p -m 0755 %{SOURCE3} \
%{buildroot}/sbin/umount.glusterfs %{buildroot}/sbin/umount.glusterfs
@ -527,6 +579,10 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
# Legacy server logrotate entry # Legacy server logrotate entry
%{__install} -D -p -m 0644 %{SOURCE6} \ %{__install} -D -p -m 0644 %{SOURCE6} \
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd %{buildroot}%{_sysconfdir}/logrotate.d/glusterfsd
%else
%{__install} -D -p -m 0644 extras/glusterfs-logrotate \
%{buildroot}%{_sysconfdir}/logrotate.d/glusterfs
%endif
%if 0%{!?_without_georeplication:1} %if 0%{!?_without_georeplication:1}
# geo-rep ghosts # geo-rep ghosts
@ -571,45 +627,47 @@ touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid
%if 0%{?_with_ufo:1} %if 0%{?_with_ufo:1}
cd swift-%{SWIFTVER} cd swift-%{SWIFTVER}
%{__python} setup.py install -O1 --skip-build --root %{buildroot} %{__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} %if 0%{?_with_systemd:1}
# systemd .service files # extra systemd .service files
%_init_install %{SOURCE11} gluster-swift-account %_init_install %{SOURCE34} gluster-swift-account@
%_init_install %{SOURCE12} gluster-swift-account@ %_init_install %{SOURCE35} gluster-swift-container@
%_init_install %{SOURCE13} gluster-swift-container %_init_install %{SOURCE36} gluster-swift-object@
%_init_install %{SOURCE14} gluster-swift-container@
%_init_install %{SOURCE15} gluster-swift-object
%_init_install %{SOURCE16} gluster-swift-object@
%_init_install %{SOURCE17} gluster-swift-proxy
%if ( 0%{?fedora} && 0%{?fedora} > 18 ) %if ( 0%{?fedora} && 0%{?fedora} > 18 )
%_init_install %{SOURCE110} gluster-swift-account-replicator # more extra systemd .service files in f19
%_init_install %{SOURCE111} gluster-swift-account-replicator@ %_init_install %{SOURCE50} gluster-swift-account-replicator
%_init_install %{SOURCE112} gluster-swift-account-auditor %_init_install %{SOURCE51} gluster-swift-account-replicator@
%_init_install %{SOURCE113} gluster-swift-account-auditor@ %_init_install %{SOURCE52} gluster-swift-account-auditor
%_init_install %{SOURCE114} gluster-swift-account-reaper %_init_install %{SOURCE53} gluster-swift-account-auditor@
%_init_install %{SOURCE115} gluster-swift-account-reaper@ %_init_install %{SOURCE54} gluster-swift-account-reaper
%_init_install %{SOURCE116} gluster-swift-container-replicator %_init_install %{SOURCE55} gluster-swift-account-reaper@
%_init_install %{SOURCE117} gluster-swift-container-replicator@ %_init_install %{SOURCE56} gluster-swift-container-replicator
%_init_install %{SOURCE118} gluster-swift-container-auditor %_init_install %{SOURCE57} gluster-swift-container-replicator@
%_init_install %{SOURCE119} gluster-swift-container-auditor@ %_init_install %{SOURCE58} gluster-swift-container-auditor
%_init_install %{SOURCE120} gluster-swift-container-updater %_init_install %{SOURCE59} gluster-swift-container-auditor@
%_init_install %{SOURCE121} gluster-swift-container-updater@ %_init_install %{SOURCE60} gluster-swift-container-updater
%_init_install %{SOURCE122} gluster-swift-object-replicator %_init_install %{SOURCE61} gluster-swift-container-updater@
%_init_install %{SOURCE123} gluster-swift-object-replicator@ %_init_install %{SOURCE62} gluster-swift-object-replicator
%_init_install %{SOURCE124} gluster-swift-object-auditor %_init_install %{SOURCE63} gluster-swift-object-replicator@
%_init_install %{SOURCE125} gluster-swift-object-auditor@ %_init_install %{SOURCE64} gluster-swift-object-auditor
%_init_install %{SOURCE126} gluster-swift-object-updater %_init_install %{SOURCE65} gluster-swift-object-auditor@
%_init_install %{SOURCE127} gluster-swift-object-updater@ %_init_install %{SOURCE66} gluster-swift-object-updater
%_init_install %{SOURCE128} gluster-swift-object-expirer %_init_install %{SOURCE67} gluster-swift-object-updater@
%_init_install %{SOURCE129} gluster-swift-object-expirer@ %_init_install %{SOURCE68} gluster-swift-object-expirer
%_init_install %{SOURCE69} gluster-swift-object-expirer@
%endif %endif
%else %else
# Init helper functions # Init helper functions
%{__install} -p -D -m 644 %{SOURCE18} %{buildroot}%{_datarootdir}/gluster-swift/functions %{__install} -p -D -m 644 %{SOURCE44} %{buildroot}%{_datarootdir}/gluster-swift/functions
# Init scripts # Init scripts
%_init_install %{SOURCE11} gluster-swift-account %_init_install %{glusterswiftaccount_service} gluster-swift-account
%_init_install %{SOURCE12} gluster-swift-container %_init_install %{glusterswiftcontainer_service} gluster-swift-container
%_init_install %{SOURCE13} gluster-swift-object %_init_install %{glusterswiftobject_service} gluster-swift-object
%_init_install %{SOURCE14} gluster-swift-proxy %_init_install %{glusterswiftproxy_service} gluster-swift-proxy
%endif %endif
# Misc other # Misc other
%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/swift %{__install} -d -m 755 %{buildroot}%{_sysconfdir}/swift
@ -618,14 +676,14 @@ cd swift-%{SWIFTVER}
%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/swift/object-server %{__install} -d -m 755 %{buildroot}%{_sysconfdir}/swift/object-server
%{__install} -d -m 755 %{buildroot}%{_sysconfdir}/swift/proxy-server %{__install} -d -m 755 %{buildroot}%{_sysconfdir}/swift/proxy-server
# Config files # Config files
%if ( 0%{?fedora} && 0%{?fedora} > 17 ) #%if ( 0%{?fedora} && 0%{?fedora} > 17 )
# these first appeared in openstack-swift-1.7.4-1.fc18 # these first appeared in openstack-swift-1.7.4-1.fc18
install -p -D -m 660 %{SOURCE100} %{buildroot}%{_sysconfdir}/swift/account-server.conf #install -p -D -m 660 %{SOURCE70} %{buildroot}%{_sysconfdir}/swift/account-server.conf
install -p -D -m 660 %{SOURCE101} %{buildroot}%{_sysconfdir}/swift/container-server.conf #install -p -D -m 660 %{SOURCE71} %{buildroot}%{_sysconfdir}/swift/container-server.conf
install -p -D -m 660 %{SOURCE102} %{buildroot}%{_sysconfdir}/swift/object-server.conf #install -p -D -m 660 %{SOURCE72} %{buildroot}%{_sysconfdir}/swift/object-server.conf
install -p -D -m 660 %{SOURCE103} %{buildroot}%{_sysconfdir}/swift/proxy-server.conf #install -p -D -m 660 %{SOURCE73} %{buildroot}%{_sysconfdir}/swift/proxy-server.conf
install -p -D -m 660 %{SOURCE104} %{buildroot}%{_sysconfdir}/swift/swift.conf #install -p -D -m 660 %{SOURCE74} %{buildroot}%{_sysconfdir}/swift/swift.conf
%endif #%endif
# Install pid directory # Install pid directory
%{__install} -d -m 755 %{buildroot}%{_localstatedir}/run/swift %{__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/account-server
@ -635,7 +693,7 @@ install -p -D -m 660 %{SOURCE104} %{buildroot}%{_sysconfdir}/swift/swift.conf
%if 0%{?_with_systemd:1} %if 0%{?_with_systemd:1}
# Swift run directories # Swift run directories
%{__mkdir_p} %{buildroot}%{_sysconfdir}/tmpfiles.d %{__mkdir_p} %{buildroot}%{_sysconfdir}/tmpfiles.d
install -p -m 0644 %{SOURCE18} %{buildroot}%{_sysconfdir}/tmpfiles.d/gluster-swift.conf install -p -m 0644 %{SOURCE37} %{buildroot}%{_sysconfdir}/tmpfiles.d/gluster-swift.conf
%endif %endif
# man pages # man pages
install -d -m 755 %{buildroot}%{_mandir}/man5 install -d -m 755 %{buildroot}%{_mandir}/man5
@ -669,14 +727,13 @@ cp ufo/bin/gluster-swift-gen-builders %{buildroot}%{_bindir}/
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README THANKS %doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README THANKS
%config(noreplace) %{_sysconfdir}/logrotate.d/glusterd %config(noreplace) %{_sysconfdir}/logrotate.d/*
%config(noreplace) %{_sysconfdir}/sysconfig/glusterd %config(noreplace) %{_sysconfdir}/sysconfig/*
%{_libdir}/glusterfs %{_libdir}/glusterfs
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_sbindir}/glusterfs* %{_sbindir}/glusterfs*
%{_libexecdir}/glusterfs %{_libexecdir}/glusterfs
# %{_mandir}/man8/*gluster*.8* %{_mandir}/man8/*gluster*.8*
%{_mandir}/man8/*gluster.8*
%dir %{_localstatedir}/log/glusterfs %dir %{_localstatedir}/log/glusterfs
%dir %{_sharedstatedir}/glusterd %dir %{_sharedstatedir}/glusterd
%if 0%{!?_without_rdma:1} %if 0%{!?_without_rdma:1}
@ -713,27 +770,35 @@ fi
%files fuse %files fuse
%defattr(-,root,root,-) %defattr(-,root,root,-)
%if 0%{_for_fedora_koji_builds}
%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs-fuse %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs-fuse
%endif
%{_libdir}/glusterfs/%{version}/xlator/mount/fuse* %{_libdir}/glusterfs/%{version}/xlator/mount/fuse*
# %{_mandir}/man8/mount.glusterfs.8*
/sbin/mount.glusterfs /sbin/mount.glusterfs
%if 0%{_for_fedora_koji_builds}
/sbin/umount.glusterfs /sbin/umount.glusterfs
%endif
%if 0%{?_with_fusermount:1} %if 0%{?_with_fusermount:1}
%{_bindir}/fusermount-glusterfs %{_bindir}/fusermount-glusterfs
%endif %endif
%files server %files server
%defattr(-,root,root,-) %defattr(-,root,root,-)
%if 0%{_for_fedora_koji_builds}
%config(noreplace) %{_sysconfdir}/logrotate.d/glusterd %config(noreplace) %{_sysconfdir}/logrotate.d/glusterd
%endif
%config(noreplace) %{_sysconfdir}/sysconfig/glusterd %config(noreplace) %{_sysconfdir}/sysconfig/glusterd
%config(noreplace) %{_sysconfdir}/glusterfs %config(noreplace) %{_sysconfdir}/glusterfs
# Legacy configs # Legacy configs
%if 0%{_for_fedora_koji_builds}
%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfsd %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfsd
%config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
%endif
# init files # init files
%_init_glusterd %_init_glusterd
%if ( 0%{?_with_systemd:1} ) || ( 0%{_for_fedora_koji_builds} )
%_init_glusterfsd %_init_glusterfsd
%endif
# binaries # binaries
%{_sbindir}/gluster %{_sbindir}/gluster
%{_sbindir}/glusterd %{_sbindir}/glusterd
@ -811,9 +876,9 @@ fi
%dir %{_datarootdir}/gluster-swift/functions %dir %{_datarootdir}/gluster-swift/functions
%endif %endif
%dir %{_sysconfdir}/swift %dir %{_sysconfdir}/swift
%if ( 0%{?fedora} && 0%{?fedora} > 17 ) #%if ( 0%{?fedora} && 0%{?fedora} > 17 )
%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/swift.conf #%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/swift.conf
%endif #%endif
%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift %dir %attr(0755, swift, swift) %{_localstatedir}/run/swift
%dir %{python_sitelib}/swift %dir %{python_sitelib}/swift
%{_bindir}/swift-account-audit %{_bindir}/swift-account-audit
@ -847,9 +912,6 @@ fi
%{_unitdir}/gluster-swift-account*.service %{_unitdir}/gluster-swift-account*.service
%endif %endif
%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/account-server %dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/account-server
%if ( 0%{?fedora} && 0%{?fedora} > 17 )
%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/account-server.conf
%endif
%dir %{_sysconfdir}/swift/account-server %dir %{_sysconfdir}/swift/account-server
%{_bindir}/swift-account-auditor %{_bindir}/swift-account-auditor
%{_bindir}/swift-account-reaper %{_bindir}/swift-account-reaper
@ -871,9 +933,6 @@ fi
%{_unitdir}/gluster-swift-container*.service %{_unitdir}/gluster-swift-container*.service
%endif %endif
%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/container-server %dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/container-server
%if ( 0%{?fedora} && 0%{?fedora} > 17 )
%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/container-server.conf
%endif
%dir %{_sysconfdir}/swift/container-server %dir %{_sysconfdir}/swift/container-server
%{_bindir}/swift-container-auditor %{_bindir}/swift-container-auditor
%{_bindir}/swift-container-server %{_bindir}/swift-container-server
@ -899,9 +958,6 @@ fi
%{_unitdir}/gluster-swift-object*.service %{_unitdir}/gluster-swift-object*.service
%endif %endif
%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/object-server %dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/object-server
%if ( 0%{?fedora} && 0%{?fedora} > 17 )
%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/object-server.conf
%endif
%dir %{_sysconfdir}/swift/object-server %dir %{_sysconfdir}/swift/object-server
%{_bindir}/swift-object-auditor %{_bindir}/swift-object-auditor
%{_bindir}/swift-object-info %{_bindir}/swift-object-info
@ -917,9 +973,6 @@ fi
%{_mandir}/man1/swift-proxy-server.1* %{_mandir}/man1/swift-proxy-server.1*
%_init_gluster_swift_proxy %_init_gluster_swift_proxy
%dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/proxy-server %dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/proxy-server
%if ( 0%{?fedora} && 0%{?fedora} > 17 )
%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/proxy-server.conf
%endif
%dir %{_sysconfdir}/swift/proxy-server %dir %{_sysconfdir}/swift/proxy-server
%{_bindir}/swift-proxy-server %{_bindir}/swift-proxy-server
%{python_sitelib}/swift/proxy %{python_sitelib}/swift/proxy
@ -931,7 +984,7 @@ fi
%files ufo %files ufo
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{python_sitelib}/gluster %{python_sitelib}/gluster
%{python_sitelib}/gluster_swift_ufo-%{UFOVER}-*.egg-info %{python_sitelib}/gluster_swift_ufo-*-*.egg-info
%{_bindir}/gluster-swift-gen-builders %{_bindir}/gluster-swift-gen-builders
%{_sysconfdir}/swift/*-gluster %{_sysconfdir}/swift/*-gluster
%{_sysconfdir}/swift/*/1.conf-gluster %{_sysconfdir}/swift/*/1.conf-gluster
@ -943,10 +996,10 @@ fi
%_init_enable glusterd %_init_enable glusterd
%_init_enable glusterfsd %_init_enable glusterfsd
# Genuine Fedora (and EPEL) builds never put gluster files in /etc; if # Genuine Fedora (and EPEL) builds never put gluster files in /etc; if
# there are any files in /etc from a prior gluster.org install, move them # there are any files in /etc from a prior gluster.org install, move them
# to /var/lib. (N.B. Starting with 3.3.0 all gluster files are in /var/lib # to /var/lib. (N.B. Starting with 3.3.0 all gluster files are in /var/lib
# in gluster.org RPMs.) Be careful to copy them on the off chance that # in gluster.org RPMs.) Be careful to copy them on the off chance that
# /etc and /var/lib are on separate file systems # /etc and /var/lib are on separate file systems
if [ -d /etc/glusterd -a ! -h /var/lib/glusterd ]; then if [ -d /etc/glusterd -a ! -h /var/lib/glusterd ]; then
%{__mkdir_p} /var/lib/glusterd %{__mkdir_p} /var/lib/glusterd
@ -969,7 +1022,7 @@ fi
# but first make certain that there are no old libs around to bite us # but first make certain that there are no old libs around to bite us
# BZ 834847 # BZ 834847
if [ -e /etc/ld.so.conf.d/glusterfs.conf ]; then if [ -e /etc/ld.so.conf.d/glusterfs.conf ]; then
rm -f /etc/ld.so.conf.d/glusterfs.conf rm -f /etc/ld.so.conf.d/glusterfs.conf
/sbin/ldconfig /sbin/ldconfig
fi fi
pidof -c -o %PPID -x glusterd &> /dev/null pidof -c -o %PPID -x glusterd &> /dev/null
@ -1112,6 +1165,9 @@ fi
%changelog %changelog
* Tue Feb 5 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-10
- sync with glusterfs.spec(.in) from gluster.org git source
* Wed Jan 30 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-9 * Wed Jan 30 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-9
- essex/folsom typo, glusterfs-ufo %files conflicts with glusterfs-swift-* - essex/folsom typo, glusterfs-ufo %files conflicts with glusterfs-swift-*
@ -1130,9 +1186,9 @@ fi
- Update to OpenStack Swift 1.7.4 (Folsom) - Update to OpenStack Swift 1.7.4 (Folsom)
* Fri Dec 7 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-4 * Fri Dec 7 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-4
- Swift+UFO, now with less swift forkage. Specifically the only patches - Swift+UFO, now with less swift forkage. Specifically the only patches
to swift are those already used for the Fedora openstack-swift packages to swift are those already used for the Fedora openstack-swift packages
_plus_ our backport of the upstream constraints config changes that have _plus_ our backport of the upstream constraints config changes that have
been accepted into grizzly. been accepted into grizzly.
* Fri Nov 16 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-3 * Fri Nov 16 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-3
@ -1142,7 +1198,7 @@ fi
* Wed Oct 31 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-2 * Wed Oct 31 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-2
- Synchronize with openstack-swift-1.4.8 packaging changes, including - Synchronize with openstack-swift-1.4.8 packaging changes, including
systemd .service files and align with the matching sets of patches systemd .service files and align with the matching sets of patches
* Thu Oct 11 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-1 * Thu Oct 11 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-1
- GlusterFS-3.3.1 - GlusterFS-3.3.1