From 8e1f244f60da1626f504cda08ff3ade8c17e6333 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 14 Nov 2005 09:58:42 +0000 Subject: [PATCH] spec cleanup and UTF-8ization --- dump.spec | 91 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 35 deletions(-) diff --git a/dump.spec b/dump.spec index 1ff57f6..af8d9c1 100644 --- a/dump.spec +++ b/dump.spec @@ -1,20 +1,18 @@ -%define _sbindir /sbin -# XXX --enable-kerberos needs krcmd -%define myoptions --enable-largefile --with-binmode=6755 --with-manowner=root --with-mangrp=root --with-manmode=0644 --with-dumpdates="%{_sysconfdir}/dumpdates" --enable-readline +%define _sbindir /sbin -Summary: Programs for backing up and restoring ext2/ext3 filesystems. +Summary: Programs for backing up and restoring ext2/ext3 filesystems Name: dump Version: 0.4b40 -Release: 4 +Release: 5 License: BSD Group: Applications/Archiving -URL: http://dump.sourceforge.net +URL: http://dump.sourceforge.net/ Source: dump-%{version}.tar.bz2 Patch0: dump-0.4b40-fixacl.patch -BuildRoot: %{_tmppath}/%{name}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2 -BuildRequires: libtermcap-devel, zlib-devel, ncurses-devel -# This Prereq is now required because we only ship static binaries, and +BuildRequires: libtermcap-devel, zlib-devel, bzip2-devel, ncurses-devel +# This Requires is now mandatory because we only ship static binaries, and # need to ensure the "disk" group is created before installation (#60461) Requires: setup Requires: rmt @@ -34,7 +32,7 @@ Install dump if you need a system for both backing up filesystems and restoring filesystems after backups. %package -n rmt -Summary: Provides certain programs with access to remote tape devices. +Summary: Provides certain programs with access to remote tape devices Group: Applications/Archiving %description -n rmt @@ -47,7 +45,19 @@ restoring files from a backup), and tar (an archiving program). %patch0 -p0 -b .fixacl %build -%configure %{myoptions} --enable-static --enable-rmt --enable-qfa +# XXX --enable-kerberos needs krcmd +%configure \ + --enable-static \ + --enable-rmt \ + --enable-largefile \ + --enable-qfa \ + --enable-readline \ + --with-binmode=0755 \ + --with-manowner=root \ + --with-mangrp=root \ + --with-manmode=0644 \ + --with-dumpdates="%{_sysconfdir}/dumpdates" + make OPT="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes \ -Wmissing-prototypes -Wno-char-subscripts" @@ -56,19 +66,26 @@ rm -rf %{buildroot} mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_mandir}/man8 -%makeinstall SBINDIR=%{buildroot}%{_sbindir} BINDIR=%{buildroot}%{_sbindir} MANDIR=%{buildroot}%{_mandir}/man8 BINOWNER=$(id -un) BINGRP=$(id -gn) MANOWNER=$(id -un) MANGRP=$(id -gn) +%makeinstall \ + SBINDIR=%{buildroot}%{_sbindir} \ + BINDIR=%{buildroot}%{_sbindir} \ + MANDIR=%{buildroot}%{_mandir}/man8 \ + BINOWNER=$(id -un) \ + BINGRP=$(id -gn) \ + MANOWNER=$(id -un) \ + MANGRP=$(id -gn) pushd %{buildroot} - ln -sf dump .%{_sbindir}/rdump - ln -sf dump .%{_sbindir}/rdump.static - ln -sf dump .%{_sbindir}/dump.static - ln -sf restore .%{_sbindir}/rrestore - ln -sf restore .%{_sbindir}/rrestore.static - ln -sf restore .%{_sbindir}/restore.static - chmod ug-s .%{_sbindir}/rmt - mkdir -p .%{_sysconfdir} - > .%{_sysconfdir}/dumpdates - ln -sf ..%{_sbindir}/rmt .%{_sysconfdir}/rmt + ln -sf dump .%{_sbindir}/rdump + ln -sf dump .%{_sbindir}/rdump.static + ln -sf dump .%{_sbindir}/dump.static + ln -sf restore .%{_sbindir}/rrestore + ln -sf restore .%{_sbindir}/rrestore.static + ln -sf restore .%{_sbindir}/restore.static + chmod ug-s .%{_sbindir}/rmt + mkdir -p .%{_sysconfdir} + > .%{_sysconfdir}/dumpdates + ln -sf ..%{_sbindir}/rmt .%{_sysconfdir}/rmt popd %clean @@ -79,23 +96,27 @@ rm -rf %{buildroot} %doc CHANGES COPYRIGHT KNOWNBUGS MAINTAINERS README REPORTING-BUGS THANKS TODO %doc dump.lsm %attr(0664,root,disk) %config(noreplace) %{_sysconfdir}/dumpdates -%attr(0755,root,root) /sbin/dump -/sbin/rdump -%attr(0755,root,root) /sbin/restore -/sbin/rrestore -/sbin/*.static -%{_mandir}/man8/dump.* -%{_mandir}/man8/rdump.* -%{_mandir}/man8/restore.* -%{_mandir}/man8/rrestore.* +%{_sbindir}/dump +%{_sbindir}/rdump +%{_sbindir}/restore +%{_sbindir}/rrestore +%{_sbindir}/*.static +%{_mandir}/man8/dump.8* +%{_mandir}/man8/rdump.8* +%{_mandir}/man8/restore.8* +%{_mandir}/man8/rrestore.8* %files -n rmt %defattr(-,root,root) -%attr(0755,root,root) %{_sbindir}/rmt +%{_sbindir}/rmt %{_sysconfdir}/rmt -%{_mandir}/man8/rmt.* +%{_mandir}/man8/rmt.8* %changelog +* Mon Nov 14 2005 Jindrich Novy 0.4b40-5 +- spec file cleanup - thanks to Matthias Saou (#172961) +- convert spec to UTF-8 + * Wed Jul 06 2005 Karsten Hopp 0.4b40-4 - BuildRequires ncurses-devel @@ -211,13 +232,13 @@ rm -rf %{buildroot} - Updated BuildPreReq to e2fsprogs-devel >= 1.18, readline-devel >= 4.1 to explicitly state the minimum required deps and fix (#51900) -* Sat Sep 8 2001 Trond Eivind Glomsrød 0.4b22-6 +* Sat Sep 8 2001 Trond Eivind Glomsrød 0.4b22-6 - Kill the static subpackage - the standard binaries are now static This removes /usb/sbin/*. The static versions are now in /sbin (#53433) - Obsolete dump-static -* Tue Aug 14 2001 Trond Eivind Glomsrød 0.4b22-5 +* Tue Aug 14 2001 Trond Eivind Glomsrød 0.4b22-5 - Move non-static binaries to /usr/sbin (#49520) * Fri Jun 29 2001 Mike A. Harris 0.4b22-4