[debootstrap/el6] fixing unmerged changes from fedora-devel spec file

ksyz ksyz at fedoraproject.org
Wed Sep 7 18:09:36 UTC 2011


commit 5fd8ba19bb2b32b48cdd74f6455413097d0a688d
Author: Michal Ingeli <mi at v3.sk>
Date:   Wed Sep 7 20:03:19 2011 +0200

    fixing unmerged changes from fedora-devel spec file

 debootstrap.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/debootstrap.spec b/debootstrap.spec
index cf1c388..fd69e62 100644
--- a/debootstrap.spec
+++ b/debootstrap.spec
@@ -7,8 +7,8 @@ Group:          System Environment/Base
 License:        MIT
 URL:            http://code.erisian.com.au/Wiki/debootstrap
 Source0:        http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_%{version}.tar.gz
-Patch0:         debootstrap-1.0.19-devices.patch
-Patch1:         debootstrap-1.0.19-perms.patch
+Patch0:         debootstrap-devices.patch
+Patch1:         debootstrap-perms.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -27,7 +27,7 @@ Debian GNU/Linux guest system.
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n debootstrap
 %patch0 -p1 -b .devices
 %patch1 -p1 -b .perms
 
@@ -64,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/debootstrap
 %{_sbindir}/debootstrap
 %{_mandir}/man8/debootstrap.8*
-%doc debian/changelog debian/copyright debian/README.Debian
+%doc debian/changelog debian/copyright README
 
 
 %changelog


More information about the scm-commits mailing list