diff --git a/glusterfs.spec b/glusterfs.spec index 87669cb..7cecba5 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -73,7 +73,7 @@ Summary: Cluster File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.5.0 -Release: 0.2%{?prereltag:.%{prereltag}}%{?dist} +Release: 0.3%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else Name: @PACKAGE_NAME@ @@ -505,12 +505,6 @@ rm -rf %{buildroot}%{_pkgdocdir}/* rm -rf %{buildroot}%{_defaultdocdir}/%{name} mkdir -p %{buildroot}%{_pkgdocdir} %endif -%if ( 0%{?rhel} && 0%{?rhel} < 7 ) -mkdir -p %{buildroot}%{_pkgdocdir}.tmp/ -cp -p extras/clear_xattrs.sh %{buildroot}%{_pkgdocdir}.tmp/ -%else -cp -p extras/clear_xattrs.sh %{buildroot}%{_pkgdocdir}/ -%endif head -50 ChangeLog > ChangeLog.head && mv ChangeLog.head ChangeLog cat << EOM >> ChangeLog @@ -717,6 +711,7 @@ fi %endif %files server +%doc extras/clear_xattrs.sh %if ( 0%{_for_fedora_koji_builds} ) %config(noreplace) %{_sysconfdir}/logrotate.d/glusterd %endif @@ -740,12 +735,6 @@ fi %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs* # hack to work around old rpm/rpmbuild %%doc misfeature -%if ( 0%{?rhel} && 0%{?rhel} < 7 ) -%ghost %attr(0644,-,-) %{_pkgdocdir}/clear_xattrs.sh -%{_pkgdocdir}.tmp/clear_xattrs.sh -%else -%{_pkgdocdir}/clear_xattrs.sh -%endif %ghost %attr(0644,-,-) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options # This is really ugly, but I have no idea how to mark these directories in @@ -887,14 +876,17 @@ if [ $1 -ge 1 ]; then fi %changelog -* Thu Jan 16 2014 Ville Skyttä - 3.5.0-0.2beta1 +* Thu Jan 16 2014 Kaleb S. KEITHLEY - 3.5.0-0.3.beta1 +- GlusterFS 3.5.0 beta1 , glusterfs-3.5.0-0.1beta1 + +* Thu Jan 16 2014 Ville Skyttä - 3.5.0-0.2.beta1 - Drop unnecessary ldconfig calls, do remaining ones without shell. - Drop INSTALL from docs. -* Wed Jan 15 2014 Kaleb S. KEITHLEY - 3.5.0-0.1beta1 +* Wed Jan 15 2014 Kaleb S. KEITHLEY - 3.5.0-0.1.beta1 - GlusterFS 3.5.0 beta1 , glusterfs-3.5.0-0.1beta1 -* Fri Dec 6 2013 Kaleb S. KEITHLEY - 3.5.0-0.1qa3 +* Fri Dec 6 2013 Kaleb S. KEITHLEY - 3.5.0-0.1.qa3 - GlusterFS 3.5.0 QA3 , glusterfs-3.5.0-0.1qa3 * Wed Nov 6 2013 Kaleb S. KEITHLEY