From 2b157eb97117511c5a47f2227aab81bff90cf32f Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 10 Sep 2018 09:02:33 -0400 Subject: packaging: glusterfs.spec(.in) cleanup Someone (not me) once alphabetized all the %package, %files, and etc. sections, with a comment to keep them alphabetized. Move cloudsync sections to their correct locations in the spec. Also reorder testing and playground within %files section, keep testing %dirs together. Change-Id: I79e2e7a82d20275fd61d018880bcb5913c8f75f3 updates: bz#1193929 Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec.in | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'glusterfs.spec.in') diff --git a/glusterfs.spec.in b/glusterfs.spec.in index d4e78a891d0..f05ead9b764 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -386,6 +386,21 @@ is in user space and easily manageable. This package provides the GlusterFS CLI application and its man page %endif +%package cloudsync-plugins +Summary: Cloudsync Plugins +BuildRequires: libcurl-devel + +%description cloudsync-plugins +GlusterFS is a distributed 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 cloudsync plugins for archival feature. + %package devel Summary: Development Libraries Group: Development/Libraries @@ -449,21 +464,6 @@ is in user space and easily manageable. This package provides support to FUSE based clients and inlcudes the glusterfs(d) binary. -%package cloudsync-plugins -Summary: Cloudsync Plugins -BuildRequires: libcurl-devel - -%description cloudsync-plugins -GlusterFS is a distributed 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 cloudsync plugins for archival feature. - %if ( 0%{!?_without_georeplication:1} ) %package geo-replication Summary: GlusterFS Geo-replication @@ -1162,6 +1162,10 @@ exit 0 %{_sysconfdir}/bash_completion.d/gluster %endif +%files cloudsync-plugins +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins + %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins/cloudsyncs3.so + %files devel %dir %{_includedir}/glusterfs %{_includedir}/glusterfs/* @@ -1200,9 +1204,9 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/__pycache__/* %endif %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quiesce.so -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/playground %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/playground/template.so +%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/testing/performance/symlink-cache.so # Glupy Python files @@ -1236,10 +1240,6 @@ exit 0 %endif %endif -%files cloudsync-plugins -%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins - %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins/cloudsyncs3.so - %if ( 0%{?_with_gnfs:1} && 0%{!?_without_server:1} ) %files gnfs %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator -- cgit