diff --git a/glusterfs-3.3.1.rpc.rpcxprt.rdma.name.c.patch b/glusterfs-3.3.1.rpc.rpcxprt.rdma.name.c.patch
new file mode 100644
index 0000000..67367ae
--- /dev/null
+++ b/glusterfs-3.3.1.rpc.rpcxprt.rdma.name.c.patch
@@ -0,0 +1,11 @@
+--- a/rpc/rpc-transport/rdma/src/name.c	2012-10-11 13:38:22.000000000 -0400
++++ b/rpc/rpc-transport/rdma/src/name.c	2013-04-12 13:50:07.000000000 -0400
+@@ -352,6 +352,8 @@
+         if (listen_port_data) {
+                 listen_port = data_to_uint16 (listen_port_data);
+         } else {
++                listen_port = GF_DEFAULT_RDMA_LISTEN_PORT;
++
+                 if (addr->sa_family == AF_INET6) {
+                         struct sockaddr_in6 *in = (struct sockaddr_in6 *) addr;
+                         in->sin6_addr = in6addr_any;
diff --git a/glusterfs.spec b/glusterfs.spec
index c420398..a627918 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -1,8 +1,8 @@
 
 %global _for_fedora_koji_builds 1
 
-# use the prerel for pre-releases
-%global prereltag alpha2
+# uncomment and add '%' to use the prereltag for pre-releases
+# global prereltag alpha
 
 # if you wish to compile an rpm without rdma support, compile like this...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
@@ -17,26 +17,18 @@
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without epoll
 %{?_without_epoll:%global _without_epoll --disable-epoll}
 
-# if you wish to compile an rpm without fusermount...
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without fusermount
-%{?_without_fusermount:%global _without_fusermount --disable-fusermount}
+# if you wish to compile an rpm with fusermount...
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with fusermount
+%{?_with_fusermount:%global _with_fusermount --enable-fusermount}
 
 # if you wish to compile an rpm without geo-replication support, compile like this...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without georeplication
 %{?_without_georeplication:%global _without_georeplication --disable-geo-replication}
 
-# if you wish to compile an rpm without the OCF resource agents...
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without ocf
-%{?_without_ocf:%global _without_ocf --without-ocf}
-
-# 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%{?rhel} && 0%{?rhel} >= 6 )
 %global           SWIFTVER 1.7.4
-%if 0%{_for_fedora_koji_builds}
-%global           UFOVER 1.2
+%if ( 0%{_for_fedora_koji_builds} )
+%global           UFOVER 1.1
 %else
 %global           UFOVER @PACKAGE_VERSION@
 %endif
@@ -48,10 +40,10 @@
 %endif
 
 Summary:          Cluster File System
-%if 0%{_for_fedora_koji_builds}
+%if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
-Version:          3.4.0
-Release:          0.1%{?prereltag:.%{prereltag}}%{?dist}
+Version:          3.3.1
+Release:          12%{?prereltag:.%{prereltag}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
@@ -59,12 +51,12 @@ Release:          1%{?dist}
 %endif
 License:          GPLv3+ and (GPLv2 or LGPLv3+)
 Group:            System Environment/Base
-%if 0%{_for_fedora_koji_builds}
+%if ( 0%{_for_fedora_koji_builds} )
 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
+%if ( 0%{_for_fedora_koji_builds} )
+Source0:          http://download.gluster.org/pub/gluster/glusterfs/3.3/%{version}/glusterfs-%{version}%{?prereltag}.tar.gz
 %else
 Source0:          @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
 %endif
@@ -76,6 +68,7 @@ Source5:          glusterd.logrotate
 Source6:          glusterfsd.logrotate
 Patch0:           %{name}-3.2.5.configure.ac.patch
 Patch1:           %{name}-3.3.0.libglusterfs.Makefile.patch
+Patch2:           %{name}-3.3.1.rpc.rpcxprt.rdma.name.c.patch
 
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -84,7 +77,7 @@ Source11:         glusterfsd.service
 Source12:         glusterd.init
 Source13:         glusterfsd.init
 
-%if 0%{?_with_systemd:1}
+%if ( 0%{?_with_systemd:1} )
 %global glusterd_service %{S:%{SOURCE10}}
 %global glusterfsd_service %{S:%{SOURCE11}}
 BuildRequires:    systemd-units
@@ -99,12 +92,12 @@ 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_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
+%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}
+%if ( 0%{_for_fedora_koji_builds} )
 %global glusterd_service %{S:%{SOURCE12}}
 %global glusterfsd_service %{S:%{SOURCE13}}
 %endif
@@ -120,10 +113,10 @@ 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
+%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
 
 BuildRequires:    bison flex
@@ -132,7 +125,7 @@ BuildRequires:    ncurses-devel readline-devel
 BuildRequires:    libxml2-devel openssl-devel
 BuildRequires:    libaio-devel
 #BuildRequires:    systemtap-sdt-devel lvm2-devel # glusterfs-3.4.x
-%if 0%{?suse_version}
+%if ( 0%{?suse_version} )
 BuildRequires:    python-devel
 %else
 BuildRequires:    python-ctypes
@@ -160,7 +153,7 @@ This package includes the glusterfs binary, the glusterfsd daemon and the
 gluster command line, libglusterfs and glusterfs translator modules common to
 both GlusterFS server and client framework.
 
-%if 0%{!?_without_rdma:1}
+%if ( 0%{!?_without_rdma:1} )
 %package rdma
 Summary:          GlusterFS rdma support for ib-verbs
 Group:            Applications/File
@@ -180,7 +173,7 @@ is in user space and easily manageable.
 This package provides support to ib-verbs library.
 %endif
 
-%if 0%{!?_without_georeplication:1}
+%if ( 0%{!?_without_georeplication:1} )
 %package geo-replication
 Summary:          GlusterFS Geo-replication
 Group:            Applications/File
@@ -205,9 +198,6 @@ Group:            Applications/File
 BuildRequires:    fuse-devel
 
 Requires:         %{name} = %{version}-%{release}
-%if ! 0%{?_with_fusermount}
-Requires:         /usr/bin/fusermount
-%endif
 
 Obsoletes:        %{name}-client < %{version}-%{release}
 Provides:         %{name}-client = %{version}-%{release}
@@ -246,35 +236,6 @@ is in user space and easily manageable.
 
 This package provides the glusterfs server daemon.
 
-%if 0%{!?_without_ocf:1}
-%package resource-agents
-Summary:          OCF Resource Agents for GlusterFS
-License:          GPLv3+
-# this Group handling comes from the Fedora resource-agents package
-%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
-Group:            System Environment/Base
-%else
-Group:            Productivity/Clustering/HA
-%endif
-# for glusterd
-Requires:         glusterfs-server
-# depending on the distribution, we need pacemaker or resource-agents
-Requires:         %{_prefix}/lib/ocf/resource.d
-
-%description resource-agents
-GlusterFS is a clustered file-system capable of scaling to several
-petabytes. It aggregates various storage bricks over Infiniband RDMA
-or TCP/IP interconnect into one large parallel network file
-system. GlusterFS is one of the most sophisticated file systems in
-terms of features and extensibility.  It borrows a powerful concept
-called Translators from GNU Hurd kernel. Much of the code in GlusterFS
-is in user space and easily manageable.
-
-This package provides the resource agents which plug glusterd into
-Open Cluster Framework (OCF) compliant cluster resource managers,
-like Pacemaker.
-%endif
-
 %package devel
 Summary:          Development Libraries
 License:          GPLv2 or LGPLv3+
@@ -292,7 +253,7 @@ is in user space and easily manageable.
 
 This package provides the development libraries.
 
-%if 0%{?_with_ufo:1}
+%if ( 0%{?_with_ufo:1} )
 %package swift
 
 Summary:          GlusterFS OpenStack Object Storage
@@ -300,7 +261,7 @@ Group:            Applications/System
 License:          ASL 2.0
 BuildArch:        noarch
 
-%if 0%{_for_fedora_koji_builds}
+%if ( 0%{_for_fedora_koji_builds} )
 Source20:         http://launchpad.net/swift/folsom/%{SWIFTVER}/+download/swift-%{SWIFTVER}.tar.gz
 %else
 Source20:         swift-%{SWIFTVER}.tar.gz
@@ -352,7 +313,7 @@ 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)
 
-%if 0%{?_with_systemd:1}
+%if ( 0%{?_with_systemd:1} )
 %global glusterswiftaccount_service %{S:%{SOURCE30}}
 %global glusterswiftcontainer_service %{S:%{SOURCE31}}
 %global glusterswiftobject_service %{S:%{SOURCE32}}
@@ -494,8 +455,8 @@ Requires:         python
 Obsoletes:        glusterfs-swift-plugin < 3.3.1-4
 Obsoletes:        glusterfs-swift-ufo <= 3.3.1-4
 
-%if 0%{_for_fedora_koji_builds}
-Source15:         http://download.gluster.org/pub/gluster/glusterfs/qa-releases/3.4.0alpha2/UFO/gluster-swift-ufo-%{UFOVER}%{?prereltag}.tar.gz
+%if ( 0%{_for_fedora_koji_builds} )
+Source15:         http://download.gluster.org/pub/gluster/glusterfs/3.3/%{version}/UFO/gluster-swift-ufo-%{UFOVER}%{?prereltag}.tar.gz
 %else
 Source15:         gluster-swift-ufo-@PACKAGE_VERSION@.tar.gz
 %endif
@@ -511,14 +472,17 @@ storage costs.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prereltag}
-%if 0%{?_with_ufo:1}
+%if ( 0%{?_with_ufo:1} )
 # unpack swift-1.x.y
 %setup -q -T -D -n %{name}-%{version}%{?prereltag} -a 20
 # unpack gluster ufo
 %setup -q -T -D -n %{name}-%{version}%{?prereltag} -a 15
-%if 0%{_for_fedora_koji_builds}
+%if ( 0%{_for_fedora_koji_builds} )
 #%patch0 -p0
-%patch1 -p0 -F4
+%patch1 -p0
+%if ( "%{version}" == "3.3.1" )  
+%patch2 -p1
+%endif
 %endif
 cd swift-%{SWIFTVER}
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
@@ -527,17 +491,15 @@ cd swift-%{SWIFTVER}
 %endif
 %patch22 -p1
 dos2unix LICENSE
-%if 0%{_for_fedora_koji_builds}
-%if "%{UFOVER}" == "1.1"
+%if ( 0%{_for_fedora_koji_builds} )
 cd ../ufo
 %patch15 -p1
 %endif
 %endif
-%endif
 
 %build
 ./autogen.sh
-%configure %{?_without_rdma} %{?_without_epoll} %{?_without_fusermount} %{?_without_georeplication}
+%configure %{?_without_rdma} %{?_without_epoll} %{?_with_fusermount} %{?_without_georeplication}
 
 # Remove rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -545,7 +507,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 %{__make} %{?_smp_mflags}
 
-%if 0%{?_with_ufo:1}
+%if ( 0%{?_with_ufo:1} )
 cd swift-%{SWIFTVER}
 %{__python} setup.py build
 %{__mkdir_p} doc/build
@@ -576,7 +538,7 @@ cd ..
 %{__mkdir_p} %{buildroot}%{_includedir}/glusterfs/server
 %{__install} -p -m 0644 xlators/protocol/server/src/*.h \
     %{buildroot}%{_includedir}/glusterfs/server/
-%if 0%{_for_fedora_koji_builds}
+%if ( 0%{_for_fedora_koji_builds} )
 %{__install} -D -p -m 0644 %{SOURCE1} \
     %{buildroot}%{_sysconfdir}/sysconfig/glusterd
 %{__install} -D -p -m 0644 %{SOURCE2} \
@@ -586,7 +548,7 @@ cd ..
     %{buildroot}%{_sysconfdir}/sysconfig/glusterd
 %endif
 # We'll use our init.d
-%if 0%{?_with_systemd:1}
+%if ( 0%{?_with_systemd:1} )
 %{__rm} -f %{buildroot}%{_sysconfdir}/init.d/glusterd
 %endif
 
@@ -602,11 +564,6 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
 # Remove installed docs, we include them ourselves as %%doc
 %{__rm} -rf %{buildroot}%{_datadir}/doc/glusterfs/
 
-# Remove benchmarking and other unpackaged files
-%{__rm} -rf %{buildroot}/benchmarking
-%{__rm} -f %{buildroot}/glusterfs-mode.el
-%{__rm} -f %{buildroot}/glusterfs.vim
-
 # Create working directory
 %{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd
 
@@ -620,7 +577,7 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
 %_init_install %{glusterfsd_service} glusterfsd
 %endif
 
-%if 0%{_for_fedora_koji_builds}
+%if ( 0%{_for_fedora_koji_builds} )
 # Install wrapper umount script
 %{__install} -D -p -m 0755 %{SOURCE3} \
     %{buildroot}/sbin/umount.glusterfs
@@ -639,7 +596,7 @@ sed -i 's|option working-directory /etc/glusterd|option working-directory %{_sha
     %{buildroot}%{_sysconfdir}/logrotate.d/glusterfs
 %endif
 
-%if 0%{!?_without_georeplication:1}
+%if ( 0%{!?_without_georeplication:1} )
 # geo-rep ghosts
 %{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/geo-replication
 touch %{buildroot}%{_sharedstatedir}/glusterd/geo-replication/gsyncd.conf
@@ -679,7 +636,7 @@ 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%{?_with_ufo:1} )
 cd swift-%{SWIFTVER}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 # common swift .service or .init files
@@ -687,7 +644,7 @@ cd swift-%{SWIFTVER}
 %_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} )
 # extra systemd .service files
 %_init_install %{SOURCE34} gluster-swift-account@
 %_init_install %{SOURCE35} gluster-swift-container@
@@ -745,7 +702,7 @@ cd swift-%{SWIFTVER}
 %{__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}
+%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
@@ -792,7 +749,7 @@ cp ufo/bin/gluster-swift-gen-builders %{buildroot}%{_bindir}/
 %dir %{_localstatedir}/log/glusterfs
 %dir %{_localstatedir}/run/gluster
 %dir %{_sharedstatedir}/glusterd
-%if 0%{!?_without_rdma:1}
+%if ( 0%{!?_without_rdma:1} )
 %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma*
 %endif
 %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse*
@@ -803,13 +760,13 @@ cp ufo/bin/gluster-swift-gen-builders %{buildroot}%{_bindir}/
 %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs*
 
 
-%if 0%{!?_without_rdma:1}
+%if ( 0%{!?_without_rdma:1} )
 %files rdma
 %defattr(-,root,root,-)
 %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma*
 %endif
 
-%if 0%{!?_without_georeplication:1}
+%if ( 0%{!?_without_georeplication:1} )
 %post geo-replication
 #restart glusterd.
 if [ $1 -ge 1 ]; then
@@ -826,28 +783,27 @@ fi
 
 %files fuse
 %defattr(-,root,root,-)
-%if 0%{_for_fedora_koji_builds}
+%if ( 0%{_for_fedora_koji_builds} )
 %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs-fuse
 %endif
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse*
 /sbin/mount.glusterfs
-%if 0%{_for_fedora_koji_builds}
+%if ( 0%{_for_fedora_koji_builds} )
 /sbin/umount.glusterfs
 %endif
-%if 0%{?_without_fusermount:1}
+%if ( 0%{?_with_fusermount:1} )
 %{_bindir}/fusermount-glusterfs
 %endif
 
 %files server
 %defattr(-,root,root,-)
-%doc extras/clear_xattrs.sh
-%if 0%{_for_fedora_koji_builds}
+%if ( 0%{_for_fedora_koji_builds} )
 %config(noreplace) %{_sysconfdir}/logrotate.d/glusterd
 %endif
 %config(noreplace) %{_sysconfdir}/sysconfig/glusterd
 %config(noreplace) %{_sysconfdir}/glusterfs
 # Legacy configs
-%if 0%{_for_fedora_koji_builds}
+%if ( 0%{_for_fedora_koji_builds} )
 %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfsd
 %config(noreplace) %{_sysconfdir}/sysconfig/glusterfsd
 %endif
@@ -901,33 +857,33 @@ fi
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run
 %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
 
-%if 0%{!?_without_ocf:1}
-%files resource-agents
-%defattr(-,root,root)
-# /usr/lib is the standard for OCF, also on x86_64
-%{_prefix}/lib/ocf/resource.d/glusterfs
-%endif
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/glusterfs
-%{_libdir}/pkgconfig/glusterfs-api.pc
 %exclude %{_includedir}/glusterfs/y.tab.h
 %{_libdir}/*.so
 
-%if 0%{?_with_ufo:1}
+%if ( 0%{?_with_ufo:1} )
 %files swift
 %defattr(-,root,root,-)
 %doc swift-%{SWIFTVER}/AUTHORS
 %doc swift-%{SWIFTVER}/LICENSE
-%doc swift-%{SWIFTVER}/README*
+%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}
+%{_mandir}/man1/swift-dispersion-populate.1*
+%{_mandir}/man1/swift-dispersion-report.1*
+%{_mandir}/man1/swift.1*
+%{_mandir}/man1/swift-get-nodes.1*
+%{_mandir}/man1/swift-init.1*
+%{_mandir}/man1/swift-orphans.1*
+%{_mandir}/man1/swift-recon.1*
+%{_mandir}/man1/swift-ring-builder.1*
+%if ( 0%{?_with_systemd:1} )
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/gluster-swift.conf
 %else
 %dir %{_datarootdir}/gluster-swift/functions
@@ -965,7 +921,7 @@ fi
 %{_mandir}/man1/swift-account-replicator.1*
 %{_mandir}/man1/swift-account-server.1*
 %_init_gluster_swift_account
-%if 0%{?_with_systemd:1}
+%if ( 0%{?_with_systemd:1} )
 %{_unitdir}/gluster-swift-account*.service
 %endif
 %dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/account-server
@@ -986,7 +942,7 @@ fi
 %{_mandir}/man1/swift-container-sync.1*
 %{_mandir}/man1/swift-container-updater.1*
 %_init_gluster_swift_container
-%if 0%{?_with_systemd:1}
+%if ( 0%{?_with_systemd:1} )
 %{_unitdir}/gluster-swift-container*.service
 %endif
 %dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/container-server
@@ -1011,7 +967,7 @@ fi
 %{_mandir}/man1/swift-object-server.1*
 %{_mandir}/man1/swift-object-updater.1*
 %_init_gluster_swift_object
-%if 0%{?_with_systemd:1}
+%if ( 0%{?_with_systemd:1} )
 %{_unitdir}/gluster-swift-object*.service
 %endif
 %dir %attr(0755, swift, swift) %{_localstatedir}/run/swift/object-server
@@ -1112,7 +1068,7 @@ if [ $1 -ge 1 ]; then
 fi
 
 
-%if 0%{?_with_ufo:1}
+%if ( 0%{?_with_ufo:1} )
 %pre swift
 getent group swift >/dev/null || groupadd -r swift -g 160
 getent passwd swift >/dev/null || \
@@ -1140,7 +1096,7 @@ fi
 
 
 %postun swift-account
-if [ $1 -ge 1 ] ; then
+if [ "$1" -ge "1" ] ; then
     %_init_restart gluster-swift-account
 fi
 
@@ -1165,7 +1121,7 @@ fi
 
 
 %postun swift-container
-if [ $1 -ge 1 ] ; then
+if [ "$1" -ge "1" ] ; then
     %_init_restart gluster-swift-container
 fi
 
@@ -1190,7 +1146,7 @@ fi
 
 
 %postun swift-object
-if [ $1 -ge 1 ] ; then
+if [ "$1" -ge "1" ] ; then
     %_init_restart gluster-swift-object
 fi
 
@@ -1215,15 +1171,17 @@ fi
 
 
 %postun swift-proxy
-if [ $1 -ge 1 ] ; then
+if [ "$1" -ge "1" ] ; then
     %_init_restart gluster-swift-proxy
 fi
 %endif
 
 
 %changelog
-* Wed Apr 10 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.1alpha2
-- prerelease 3.4.0alpha2 for oVirt/vdsm dependencies in Fedora19
+* Mon Apr 15 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-12
+- add glusterfs-3.3.1.rpc.rpcxprt.rdma.name.c.patch, BZ 920332
+- add %{prereltag} for upcoming 3.3.2 and 3.4.0 alpha and beta builds
+- add librdmacm-devel for rdma builds
 
 * Wed Mar 6 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-11
 - /var/run/gluster - sync with gluster.org git
diff --git a/sources b/sources
index b2a1966..090e799 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-321e86ec220c3ce10b26d9763743330a  glusterfs-3.4.0alpha2.tar.gz
+4c9f291de887b1193d5d1acac4003360  glusterfs-3.3.1.tar.gz
 1cfb85335eafc4317414736477d47dfc  swift-1.7.4.tar.gz
-17e8ab57fc37e1593d903c54a76d8ebe  gluster-swift-ufo-1.2alpha2.tar.gz
+c1041b0551be722363f18f3a5664d0cf  gluster-swift-ufo-1.1.tar.gz