From f4dd072b5037fb03637bf682012b26abcbe63945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 18 Mar 2014 14:13:13 +0100 Subject: [PATCH] Add needed bits for el5 Fix `mixed use of spaces-and tabs` Minor cleanup and improved readability --- fdupes.spec | 54 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/fdupes.spec b/fdupes.spec index c72a358..bd19cef 100644 --- a/fdupes.spec +++ b/fdupes.spec @@ -1,24 +1,26 @@ # Place rpm-macros into proper location. %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) -Name: fdupes -Summary: Finds duplicate files in a given set of directories -Version: 1.51 -Release: 4%{?dist} -License: MIT -Group: Applications/File -URL: https://code.google.com/p/fdupes/ -Source0: https://fdupes.googlecode.com/files/%{name}-%{version}.tar.gz -Source1: macros.fdupes - -Patch0: fdupes-1.51-destdir.patch +Name: fdupes +Version: 1.51 +Release: 5%{?dist} +Summary: Finds duplicate files in a given set of directories +%{?el5:Group: Applications/File} + +License: MIT +URL: https://code.google.com/p/fdupes/ +Source0: https://fdupes.googlecode.com/files/%{name}-%{version}.tar.gz +Source1: macros.fdupes + +Patch0: fdupes-1.51-destdir.patch # http://bugs.debian.org/353789 -Patch1: fdupes-1.51-typo.patch +Patch1: fdupes-1.51-typo.patch # Fix CVE -Patch2: fdupes-1.51-check-permissions.patch +Patch2: fdupes-1.51-check-permissions.patch # Apply proper LDFLAGS -Patch3: fdupes-1.51-obey-ldflags.patch +Patch3: fdupes-1.51-obey-ldflags.patch +%{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)} %description FDUPES is a program for identifying duplicate files residing within specified @@ -34,9 +36,9 @@ directories. %build -make %{?_smp_mflags} \ - COMPILER_OPTIONS="%{?optflags}" \ - LDFLAGS="%{?__global_ldflags}" +make %{?_smp_mflags} \ + COMPILER_OPTIONS="%{?optflags}" \ + LDFLAGS="%{?__global_ldflags}" %check @@ -47,15 +49,20 @@ make %{?_smp_mflags} \ %install -make install INSTALL="%{__install} -p" \ - BIN_DIR=%{_bindir} \ - MAN_BASE_DIR=%{_mandir} \ - DESTDIR=%{buildroot} +%{?el5:rm -rf %{buildroot}} +make install INSTALL="%{__install} -p" \ + BIN_DIR=%{_bindir} \ + MAN_BASE_DIR=%{_mandir} \ + DESTDIR=%{buildroot} mkdir -p %{buildroot}%{macrosdir}/macros.d install -m 0644 %{SOURCE1} %{buildroot}%{macrosdir}/macros.d/ +%clean +%{?el5:rm -rf %{buildroot}} + + %files %doc CHANGES CONTRIBUTORS README TODO %doc %{_mandir}/man1/%{name}.1* @@ -64,6 +71,11 @@ install -m 0644 %{SOURCE1} %{buildroot}%{macrosdir}/macros.d/ %changelog +* Tue Mar 18 2014 Björn Esser - 1.51-5 +- Add needed bits for el5 +- Fix `mixed use of spaces-and tabs` +- Minor cleanup and improved readability + * Tue Mar 18 2014 Björn Esser - 1.51-4 - Place rpm-macros into proper location using %%global macrosdir - Apply proper LDFLAGS