diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2013-10-09 08:29:18 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-10-11 12:26:52 -0700 |
| commit | 6d28941b0b32ae0053604021925dfdc8d40a1047 (patch) | |
| tree | 874649b40cc32b96693682fd6d38de5f76949167 | |
| parent | d573f170cf3305c066f8b191f872d2d2f22f2025 (diff) | |
build: sync glusterfs.spec.in with Fedora glusterfs.spec
(this is the master branch)
sync with Fedora glusterfs.spec 3.4.1-2+
Change-Id: I8a303efb0ac8cd3e04531e2f02427e3590387493
BUG: 950083
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/6059
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
| -rw-r--r-- | glusterfs.spec.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 46240247c2d..6c38fe0f573 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -72,8 +72,8 @@ 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: 3%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else Name: @PACKAGE_NAME@ @@ -321,6 +321,7 @@ This package provides the glusterfs server daemon. Summary: Clustered file-system api library Group: System Environment/Daemons Requires: %{name} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} # we provide the Python package/namespace 'gluster' Provides: python-gluster = %{version}-%{release} @@ -520,11 +521,9 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha %{buildroot}%{_sysconfdir}/glusterfs/glusterd.vol # Install glusterfsd .service or init.d file -%if ( 0%{?_with_systemd:1} ) %if ( 0%{_for_fedora_koji_builds} ) %_init_install %{glusterfsd_service} glusterfsd %endif -%endif %if ( 0%{_for_fedora_koji_builds} ) # Client logrotate entry @@ -730,7 +729,7 @@ fi %endif # init files %_init_glusterd -%if ( 0%{_for_fedora_koji_builds} && 0%{?_with_systemd:1} ) +%if ( 0%{_for_fedora_koji_builds} ) %_init_glusterfsd %endif # binaries @@ -878,10 +877,13 @@ if [ $1 -ge 1 ]; then fi %changelog +* Wed Oct 9 2013 Kaleb S. KEITHLEY <kkeithle@redhat.com> +- Sync with Fedora glusterfs.spec 3.4.1-2+ + * Wed Oct 9 2013 Niels de Vos <ndevos@redhat.com> - glusterfs-api-devel requires glusterfs-devel (#1016938, #1017094) -* Thu Sep 30 2013 Niels de Vos <ndevos@redhat.com> +* Mon Sep 30 2013 Niels de Vos <ndevos@redhat.com> - Package gfapi.py into the Python site-packages path (#1005146) * Tue Sep 17 2013 Harshavardhana <fharshav@redhat.com> |