commit a9f17f26f7753fe2e0650974cf167cacf3de60ba Author: Lubomir Rintel <lkundrak@xxxxx> Date: Thu Oct 24 11:39:54 2013 +0200 Attempt at saner SPEC file formatting I'm doing this semi-automatically across all packages I maintain, since some are several years old and since then several have suffered bit-rot and such. I'm fixing up the following: - Old RPM relics (such as %defattr, BuildRoot or %clean sections) - Whitespace errors (such as trailing spaces) - Consistent use of %{buildroot} - Dropping useless %{name} expansions that harm legibility - Consistent spacing between RPM sections - Bad days in %changelogs perl-OpenOffice-UNO.spec | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) --- diff --git a/perl-OpenOffice-UNO.spec b/perl-OpenOffice-UNO.spec index 50a9705..eb2b706 100644 --- a/perl-OpenOffice-UNO.spec +++ b/perl-OpenOffice-UNO.spec @@ -1,6 +1,6 @@ Name: perl-OpenOffice-UNO Version: 0.07 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Interface to OpenOffice's UNO run-time License: LGPLv2+ and SISSL Group: Development/Libraries @@ -10,7 +10,6 @@ Patch0: 0001-Preserve-cflags.patch Patch1: 0001-Hardcode-rpath-to-uno-library.patch Patch2: OpenOffice-UNO-0.07-libraries.patch Patch3: OpenOffice-UNO-0.07-cppumaker.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(Test::More) BuildRequires: perl(Cwd) @@ -51,15 +50,13 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT +make pure_install PERL_INSTALL_ROOT=%{buildroot} -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find %{buildroot} -type f -name .packlist -exec rm -f {} \; +find %{buildroot} -type f -name '*.bs' -size 0 -exec rm -f {} \; +find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \; -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -type f -name '*.bs' -size 0 -exec rm -f {} \; -find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; - -%{_fixperms} $RPM_BUILD_ROOT/* +%{_fixperms} %{buildroot}/* %check @@ -70,12 +67,7 @@ sleep $(expr \( %__isa_bits - 30 \) \* 6) make test -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) %doc Changes README %{perl_vendorarch}/auto/* %{perl_vendorarch}/OpenOffice* @@ -83,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Oct 24 2013 Lubomir Rintel (GoodData) <lubo.rintel@xxxxxxxxxxxx> - 0.07-12 +- Bulk sad and useless attempt at consistent SPEC file formatting + * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.07-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/perl-devel