GlusterFS-3.4.0-0.1beta1

glusterfs.spec

@@ -1,8 +1,8 @@
 
 %global _for_fedora_koji_builds 1
 
-# use the prerel for pre-releases
+# uncomment and add '%' to use the prereltag for pre-releases
-%global prereltag alpha3
+%global prereltag beta1
 
 # if you wish to compile an rpm without rdma support, compile like this...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
@@ -53,7 +53,7 @@ Summary:          Cluster File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          3.4.0
-Release:          0.3%{?prereltag:.%{prereltag}}%{?dist}
+Release:          0.1%{?prereltag:.%{prereltag}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
@@ -149,9 +149,13 @@ Provides:         %{name}-libs = %{version}-%{release}
 Provides:         %{name}-common = %{version}-%{release}
 Provides:         %{name}-core = %{version}-%{release}
 
-# We do not want to generate useless provides for xlator .so files
+# We do not want to generate useless provides and requires for xlator .so files
+# Filter all generated:
+# - .so requires that do not start with 'lib'
+# - all provides from xlators and private libraries not in the ldconfig path
+#
 # TODO: RHEL5 does not have a convenient solution
-%if ( 0%{?rhel} == 6 )
+%if 0%{?rhel} == 6
     # filter_setup exists in RHEL6 only
     %filter_provides_in %{_libdir}/glusterfs/%{version}/
     %global __filter_from_req %{?__filter_from_req} | %{__grep} -v -P '^(?!lib).*\.so.*$'
@@ -261,6 +265,23 @@ is in user space and easily manageable.
 
 This package provides the glusterfs server daemon.
 
+%package api
+Summary:          Clustered file-system api library
+License:          GPLv3+
+Group:            System Environment/Daemons
+Requires:         %{name} = %{version}-%{release}
+
+%description api
+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 glusterfs libgfapi library
+
 %if ( 0%{!?_without_ocf:1} )
 %package resource-agents
 Summary:          OCF Resource Agents for GlusterFS
@@ -306,9 +327,27 @@ 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 development libraries.
+This package provides the development libraries and include files.
+
+%package api-devel
+Summary:          Development Libraries
+License:          GPLv2 or LGPLv3+
+Group:            Development/Libraries
+Requires:         %{name} = %{version}-%{release}
+
+%description api-devel
+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 api include files.
 
 %if ( 0%{?_with_ufo:1} )
+%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 )
 %package swift
 
 Summary:          GlusterFS OpenStack Object Storage
@@ -316,11 +355,8 @@ Group:            Applications/System
 License:          ASL 2.0
 BuildArch:        noarch
 
-%if ( 0%{_for_fedora_koji_builds} )
+# http://launchpad.net/swift/grizzly/%{SWIFTVER}/+download/swift-%{SWIFTVER}.tar.gz
-Source20:         http://launchpad.net/swift/folsom/%{SWIFTVER}/+download/swift-%{SWIFTVER}.tar.gz
-%else
 Source20:         swift-%{SWIFTVER}.tar.gz
-%endif
 
 Source30:         gluster-swift-account.service
 Source31:         gluster-swift-container.service
@@ -503,14 +539,26 @@ in clusters for reliable, redundant, and large-scale storage of static objects.
 
 This package contains documentation files for %{name}-swift.
 
+%endif
+
 %package ufo
 Summary:          GlusterFS Unified File and Object Storage.
 Group:            Applications/System
 License:          ASL 2.0
 BuildArch:        noarch
+BuildRequires:    python-setuptools
+%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 )
 Requires:         %{name}-swift = %{version}-%{release}
+%else
+Requires:         openstack-swift = %{SWIFTVER}
+Requires:         openstack-swift-account = %{SWIFTVER}
+Requires:         openstack-swift-container = %{SWIFTVER}
+Requires:         openstack-swift-object = %{SWIFTVER}
+Requires:         openstack-swift-proxy = %{SWIFTVER}
+%endif
 Requires:         memcached
 Requires:         openssl
+Requires:         python-setuptools
 Requires:         python
 Obsoletes:        glusterfs-swift-plugin < 3.3.1-4
 Obsoletes:        glusterfs-swift-ufo <= 3.3.1-4
@@ -533,8 +581,10 @@ storage costs.
 %prep
 %setup -q -n %{name}-%{version}%{?prereltag}
 %if ( 0%{?_with_ufo:1} )
+%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 )
 # unpack swift-1.x.y
 %setup -q -T -D -n %{name}-%{version}%{?prereltag} -a 20
+%endif
 # unpack gluster ufo
 %setup -q -T -D -n %{name}-%{version}%{?prereltag} -a 15
 %if ( 0%{_for_fedora_koji_builds} )
@@ -544,6 +594,7 @@ storage costs.
 %patch2 -p1
 %endif
 %endif
+%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 )
 cd swift-%{SWIFTVER}
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
 %patch20 -p1
@@ -558,6 +609,7 @@ cd swift-%{SWIFTVER}
 %else
 %patch23 -p1
 %endif
+%endif
 %if ( 0%{_for_fedora_koji_builds} )
 %if ( "%{UFOVER}" == "1.1" )
 cd ../ufo
@@ -577,6 +629,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%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 )
 cd swift-%{SWIFTVER}
 %{__python} setup.py build
 %{__mkdir_p} doc/build
@@ -584,6 +637,7 @@ cd swift-%{SWIFTVER}
 %{__python} setup.py build_sphinx
 %endif
 cd ..
+%endif
 cd ufo
 %{__python} setup.py build
 cd ..
@@ -711,6 +765,7 @@ touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol
 touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid
 
 %if ( 0%{?_with_ufo:1} )
+%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 )
 cd swift-%{SWIFTVER}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 # common swift .service or .init files
@@ -794,6 +849,7 @@ for m in doc/manpages/*.1; do
   install -p -m 0644 $m %{buildroot}%{_mandir}/man1
 done
 cd ..
+%endif
 cd ufo
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 cd ..
@@ -818,6 +874,7 @@ cp ufo/bin/gluster-swift-gen-builders %{buildroot}%{_bindir}/
 %doc ChangeLog COPYING-GPLV2 COPYING-LGPLV3 INSTALL README THANKS
 %config(noreplace) %{_sysconfdir}/logrotate.d/*
 %config(noreplace) %{_sysconfdir}/sysconfig/*
+%exclude %{_libdir}/libgfapi.*
 %{_libdir}/glusterfs
 %{_libdir}/*.so.*
 %{_sbindir}/glusterfs*
@@ -935,6 +992,10 @@ fi
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run
 %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
 
+%files api
+%exclude %{_libdir}/*.so
+%{_libdir}/libgfapi.*
+
 %if ( 0%{!?_without_ocf:1} )
 %files resource-agents
 %defattr(-,root,root)
@@ -945,11 +1006,18 @@ fi
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/glusterfs
-%{_libdir}/pkgconfig/glusterfs-api.pc
 %exclude %{_includedir}/glusterfs/y.tab.h
+%exclude %{_includedir}/glusterfs/api
+%exclude %{_libdir}/libgfapi.so
 %{_libdir}/*.so
 
+%files api-devel
+%{_libdir}/pkgconfig/glusterfs-api.pc
+%{_libdir}/libgfapi.so
+%{_includedir}/glusterfs/api/*
+
 %if ( 0%{?_with_ufo:1} )
+%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 )
 %files swift
 %defattr(-,root,root,-)
 %doc swift-%{SWIFTVER}/AUTHORS
@@ -1091,6 +1159,8 @@ fi
 %defattr(-,root,root,-)
 %doc swift-%{SWIFTVER}/LICENSE
 
+%endif
+
 %files ufo
 %defattr(-,root,root,-)
 %{python_sitelib}/gluster
@@ -1166,6 +1236,7 @@ fi
 
 
 %if ( 0%{?_with_ufo:1} )
+%if ( 0%{?fedora} && 0%{?fedora} < 19 ) || ( 0%{?rhel} && 0%{?rhel} < 6 )
 %pre swift
 getent group swift >/dev/null || groupadd -r swift -g 160
 getent passwd swift >/dev/null || \
@@ -1342,8 +1413,15 @@ if [ $1 -ge 1 ] ; then
 %endif
 fi
 %endif
+%endif
 
 %changelog
+* Tue May 7 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.1.beta1
+- prerelease 3.4.0beta1 for oVirt/vdsm dependencies in Fedora19
+
+* Mon Apr 29 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.1-14
+- include backport of G4S/UFO multi-volume fix
+
 * Fri Apr 19 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-0.3alpha3
 - #else -> %else, a twisty maze of passages, all alike
 

sources

@@ -1,3 +1,3 @@
-cfeb80809faead1bf75c3aed53b37fc5  glusterfs-3.4.0alpha3.tar.gz
+e890e25b1cdec3171885ea0185fadefc  glusterfs-3.4.0beta1.tar.gz
 0d2479c3cbb124fa3a6b001d0d4d5a8b  swift-1.8.0.tar.gz
-49358f9687473bd5aa1a4d4375eba259  gluster-swift-ufo-1.2alpha3.tar.gz
+63d2b212c73e04b3c308fa5f37312a3a  gluster-swift-ufo-1.2beta1.tar.gz