From 1830a9cd3d202b33dbb05a6ce75ab1d5430b6e64ead8405ba70ab5e3e25e0f8a Mon Sep 17 00:00:00 2001 From: Andrey Karepin Date: Mon, 17 Jun 2013 05:40:14 +0000 Subject: [PATCH] Accepting request 179226 from home:jengelh:attr - Explicitly list libattr-devel as BuildRequires OBS-URL: https://build.opensuse.org/request/show/179226 OBS-URL: https://build.opensuse.org/package/show/network/rsync?expand=0&rev=27 --- rsync.changes | 6 ++++++ rsync.spec | 11 +++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/rsync.changes b/rsync.changes index 06492c4..fe30c42 100644 --- a/rsync.changes +++ b/rsync.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jun 16 23:59:28 UTC 2013 - jengelh@inai.de + +- Explicitly list libattr-devel as BuildRequires +- More robust make install call. Remove redundant %clean section. + ------------------------------------------------------------------- Fri Apr 5 12:33:30 UTC 2013 - idonmez@suse.com diff --git a/rsync.spec b/rsync.spec index 5b12e02..f4ef68d 100644 --- a/rsync.spec +++ b/rsync.spec @@ -28,6 +28,7 @@ Summary: Versatile tool for fast incremental file transfer License: GPL-3.0+ Group: Productivity/Networking/Other Url: http://rsync.samba.org/ + Source: http://rsync.samba.org/ftp/rsync/src/rsync-%{version}.tar.gz Source1: http://rsync.samba.org/ftp/rsync/src/rsync-patches-%{version}.tar.gz Source2: logrotate.rsync @@ -40,6 +41,7 @@ Source8: rsyncd.service Patch3: system-zlib.diff BuildRequires: autoconf BuildRequires: libacl-devel +BuildRequires: libattr-devel BuildRequires: openslp-devel BuildRequires: popt-devel BuildRequires: zlib-devel @@ -90,11 +92,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now -pie" make %{?_smp_mflags} %install -%if 0%{?suse_version} < 1120 -%makeinstall -%else -%make_install -%endif +make install DESTDIR="%buildroot" rm -f %{buildroot}%{_sbindir}/rsyncd install -d %{buildroot}%{_sysconfdir}/logrotate.d install -d %{buildroot}%{_sysconfdir}/init.d @@ -141,9 +139,6 @@ fi %service_del_postun rsyncd.service %endif -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %if 0%{?has_systemd}