From 66069f38fff264295e0bfd4b4021460486fade9d Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Feb 05 2009 11:30:13 +0000 Subject: - spec cleanup (thanks to Manuel Wolfshant) --- diff --git a/dump.spec b/dump.spec index 2fb836e..6088a01 100644 --- a/dump.spec +++ b/dump.spec @@ -3,19 +3,21 @@ Summary: Programs for backing up and restoring ext2/ext3 filesystems Name: dump Version: 0.4b41 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: Applications/Archiving URL: http://dump.sourceforge.net/ -Source: dump-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/dump/dump-%{version}.tar.bz2 +#real source is +#Source: http://downloads.sourceforge.net/dump/dump-%{version}.tar.gz Patch0: dump-selinux.patch Patch1: dump-dmfix.patch Patch2: dump-immutable.patch Patch4: dump-0.4b41-libtinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2 -BuildRequires: zlib-devel, bzip2-devel, ncurses-devel, autoconf, automake -BuildRequires: device-mapper-devel, libselinux-devel, libsepol-devel +BuildRequires: zlib-devel, bzip2-devel, automake +BuildRequires: device-mapper-devel, libselinux-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, e2fsprogs-libs, zlib, bzip2-libs, device-mapper @@ -50,6 +52,11 @@ restoring files from a backup), and tar (an archiving program). %patch1 -p1 -b .dmfix %patch2 -p1 -b .orig %patch4 -p1 -b .libtinfo +for i in THANKS MAINTAINERS COPYRIGHT CHANGES; do + iconv -f iso-8859-1 -t utf-8 $i -o $i.new + touch -r $i $i.new + mv $i.new $i +done %build autoreconf -fiv @@ -68,14 +75,14 @@ autoreconf -fiv --with-dumpdates="%{_sysconfdir}/dumpdates" make OPT="$RPM_OPT_FLAGS -Wall -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wno-char-subscripts" + -Wmissing-prototypes -Wno-char-subscripts" %{?_smp_mflags} %install rm -rf %{buildroot} mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_mandir}/man8 -%makeinstall \ +%makeinstall INSTALL="install -p" \ SBINDIR=%{buildroot}%{_sbindir} \ BINDIR=%{buildroot}%{_sbindir} \ MANDIR=%{buildroot}%{_mandir}/man8 \ @@ -100,7 +107,7 @@ rm -rf %{buildroot} %defattr(-,root,root) %doc CHANGES COPYRIGHT KNOWNBUGS MAINTAINERS README REPORTING-BUGS THANKS TODO %doc dump.lsm -%attr(0664,root,disk) %config(noreplace) %{_sysconfdir}/dumpdates +%attr(0664,root,disk) %config(noreplace) %{_sysconfdir}/dumpdates %{_sbindir}/dump %{_sbindir}/rdump %{_sbindir}/restore @@ -117,6 +124,9 @@ rm -rf %{buildroot} %{_mandir}/man8/rmt.8* %changelog +* Thu Feb 05 2009 lonely wolf 0.4b41-10 +- spec cleanup + * Fri Oct 03 2008 Adam Tkac 0.4b41-9 - dump-0.4b37-2TB.patch is no longer needed - rebuild (#464989)