Hello community,
here is the log from the commit of package glusterfs for openSUSE:Factory
checked in at 2012-12-07 14:09:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glusterfs (Old)
and /work/SRC/openSUSE:Factory/.glusterfs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glusterfs", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/glusterfs/glusterfs.changes 2012-10-08
07:11:35.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.glusterfs.new/glusterfs.changes 2012-12-07
14:09:30.000000000 +0100
@@ -1,0 +2,22 @@
+Tue Nov 27 10:59:15 UTC 2012 - cfarr...@suse.com
+
+- license update: GPL-2.0 or LGPL-3.0+
+
+-------------------------------------------------------------------
+Fri Nov 9 21:47:11 UTC 2012 - jeng...@inai.de
+
+- Update to new upstream release 3.4.0qa2
+* No changelog provided by upstream
+- Remove glusterfs-init.diff, merged upstream
+- Provide systemd service file
+
+-------------------------------------------------------------------
+Wed Oct 31 12:19:47 UTC 2012 - jeng...@inai.de
+
+- Update to new upstream release 3.3.1
+* mount.glusterfs: Add support for {attribute,entry}-timeout options
+* cli: Proper xml output for "gluster peer status"
+* self-heald: Fix inode leak
+* storage/posix: implement native linux AIO support
+
+-------------------------------------------------------------------
Old:
----
glusterfs-3.3.0.tar.xz
glusterfs-init.diff
New:
----
glusterd.service
glusterfs-3.4.0qa2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glusterfs.spec ++++++
--- /var/tmp/diff_new_pack.njlsyI/_old 2012-12-07 14:09:31.000000000 +0100
+++ /var/tmp/diff_new_pack.njlsyI/_new 2012-12-07 14:09:31.000000000 +0100
@@ -17,20 +17,22 @@
Name: glusterfs
+%define lname_api libgfapi0
%define lname_rpc libgfrpc0
%define lname_xdr libgfxdr0
%define lname_gf libglusterfs0
-Version: 3.3.0
+Version: 3.4.0~qa2
Release: 0
+%define rversion 3.4.0qa2
Summary: Aggregating distributed file system
-License: GPL-2.0+ ; GPL-3.0
+License: GPL-2.0 or LGPL-3.0+
Group: System/Filesystems
Url: http://gluster.org/
#Git-Clone: git://github.com/gluster/glusterfs
-Source: %name-%version.tar.xz
-Patch1: glusterfs-init.diff
-Patch2: glusterfs-date.diff
+Source: %name-%rversion.tar.xz
+Source3: glusterd.service
+Patch1: glusterfs-date.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: automake
BuildRequires: bison
@@ -52,6 +54,9 @@
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(uuid)
%endif
+%if 0%{?suse_version} >= 1210
+BuildRequires: systemd
+%endif
Requires: python
%description
@@ -63,6 +68,14 @@
Translators from GNU Hurd kernel. Much of the code in GlusterFS is in
user space and easily manageable.
+%package -n %lname_api
+Summary: GlusterFS API library
+Group: System/Libraries
+
+%description -n %lname_api
+GlusterFS is a clustered file-system capable of scaling to several
+petabytes.
+
%package -n %lname_rpc
Summary: GlusterFS Remote Procedure Call library
Group: System/Libraries
@@ -90,6 +103,7 @@
%package devel
Summary: Development files for glusterfs
Group: Development/Libraries/C and C++
+Requires: %lname_api = %version
Requires: %lname_gf = %version
Requires: %lname_rpc = %version
Requires: %lname_xdr = %version
@@ -103,8 +117,8 @@
links.
%prep
-%setup -q
-%patch -P 1 -P 2 -p1
+%setup -qn %name-%rversion
+%patch -P 1 -p1
%build
./autogen.sh;
@@ -115,7 +129,8 @@
%install
b="%buildroot";
-%make_install docdir=%_docdir/%name
+make install DESTDIR="$b" docdir="%_docdir/%name"
+find "$b/%_libdir" -type f -name "*.la" -delete;
mkdir -p "$b/%_localstatedir/log"/{glusterd,glusterfs,glusterfsd};
@@ -150,30 +165,32 @@
# W: wrong-file-end-of-line-encoding
perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
+%if 0%{?_unitdir:1}
+mkdir -p "$b/%_unitdir";
+install -pm0644 "%{S:3}" "$b/%_unitdir/";
+%endif
+
%fdupes %buildroot
+%pre
+%service_add_pre glusterd.service
+
%post
-/sbin/ldconfig
-%insserv_cleanup
-%restart_on_update glusterd
+%service_add_post glusterd.service
%preun
-%stop_on_removal glusterd
+%service_del_preun glusterd.service
%postun
-/sbin/ldconfig
-%insserv_cleanup
+%service_del_postun glusterd.service
+%post -n %lname_api -p /sbin/ldconfig
+%postun -n %lname_api -p /sbin/ldconfig
%post -n %lname_rpc -p /sbin/ldconfig
-
%postun -n %lname_rpc -p /sbin/ldconfig
-
%post -n %lname_xdr -p /sbin/ldconfig
-
%postun -n %lname_xdr -p /sbin/ldconfig
-
%post -n %lname_gf -p /sbin/ldconfig
-
%postun -n %lname_gf -p /sbin/ldconfig
%files
@@ -181,15 +198,23 @@
%_initrddir/glusterd
%dir %_sysconfdir/%name
%config(noreplace) %_sysconfdir/%name/glusterd.vol
+%config(noreplace) %_sysconfdir/%name/glusterfs-logrotate
#%config %_sysconfdir/%name/*.sample
/sbin/mount.%name
%_libexecdir/%name
%_libdir/%name
%_sbindir/gluster*
-#%_mandir/man*/*
+%_mandir/man*/*
%_docdir/%name
%_localstatedir/lib/glusterd
%_localstatedir/log/%name
+%if 0%{?_unitdir:1}
+%_unitdir/glusterd.service
+%endif
+
+%files -n %lname_api
+%defattr(-,root,root)
+%_libdir/libgfapi.so.0*
%files -n %lname_rpc
%defattr(-,root,root)
@@ -207,5 +232,6 @@
%defattr(-,root,root)
%_includedir/%name
%_libdir/*.so
+%_libdir/pkgconfig/*.pc
%changelog
++++++ glusterd.service ++++++
[Unit]
Description=Gluster elastic volume management daemon
[Service]
ExecStart=/usr/sbin/glusterd
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
