Merge remote-tracking branch 'origin/master' into f18

GlusterFS 3.4.0 GA, glusterfs-3.4.0-1

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 beta4
 
 # if you wish to compile an rpm without rdma support, compile like this...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
@@ -55,7 +55,7 @@ Summary:          Cluster File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          3.4.0
-Release:          0.9%{?prereltag:.%{prereltag}}%{?dist}
+Release:          1%{?prereltag:.%{prereltag}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
@@ -68,7 +68,7 @@ Vendor:           Red Hat
 %endif
 URL:              http://www.gluster.org//docs/index.php/GlusterFS
 %if ( 0%{_for_fedora_koji_builds} )
-Source0:          http://download.gluster.org/pub/gluster/glusterfs/qa-releases/%{PACKAGE_VERSION}%{?prereltag}/glusterfs-%{version}%{?prereltag}.tar.gz
+Source0:          http://download.gluster.org/pub/gluster/glusterfs/3.4/%{version}%{?prereltag}/glusterfs-%{version}%{?prereltag}.tar.gz
 %else
 Source0:          @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
 %endif
@@ -94,7 +94,7 @@ Source13:         glusterfsd.init
 # 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/qa-releases/%{version}%{?prereltag}/UFO/gluster-swift-ufo-%{UFOVER}%{?prereltag}.tar.gz
+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
@@ -1058,9 +1058,6 @@ fi
 %dir %{_datarootdir}/gluster-swift/functions
 %endif
 %dir %{_sysconfdir}/swift
-#%if ( 0%{?fedora} && 0%{?fedora} > 17 )
-#%config(noreplace) %attr(660, root, swift) %{_sysconfdir}/swift/swift.conf
-#%endif
 %dir %attr(0755, swift, swift) %{_localstatedir}/run/swift
 %dir %{python_sitelib}/swift
 %{_bindir}/swift-account-audit
@@ -1439,6 +1436,8 @@ fi
 %endif
 
 %changelog
+* Fri Jul 12 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-1
+
 * Mon Jul 8 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.9.beta4
 - add Obsolete: glusterfs-swift where we use openstack-swift
 - prerelease 3.4.0beta4 for oVirt/vdsm dependencies in Fedora19

sources

@@ -1,3 +1,3 @@
-1ea69ab2c2f4c4f2c1dabb316aac2375  glusterfs-3.4.0beta4.tar.gz
+86d9aff765b6ac49f8b19e6ffad6adf9  glusterfs-3.4.0.tar.gz
 0d2479c3cbb124fa3a6b001d0d4d5a8b  swift-1.8.0.tar.gz
-99c0cd2326bc2ada11bbaf1accffdc60  gluster-swift-ufo-1.2beta4.tar.gz
+614628f29cd47fba95d1530363d7900b  gluster-swift-ufo-1.2.tar.gz