rpms/yum/devel yum.spec,1.159,1.160

[James Bowes (jbowes)]

Author: jbowes

Update of /cvs/extras/rpms/yum/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11153

Modified Files:
	yum.spec 
Log Message:
incorporate suggestions from the merge review


Index: yum.spec
===================================================================
RCS file: /cvs/extras/rpms/yum/devel/yum.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- yum.spec	21 Jun 2007 19:23:04 -0000	1.159
+++ yum.spec	11 Jul 2007 01:57:04 -0000	1.160
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/3.2/%{name}-%{version}.tar.gz
@@ -15,7 +15,7 @@
 Source100: installonlyn.py
 
 URL: http://linux.duke.edu/yum/
-BuildArchitectures: noarch
+BuildArch: noarch
 BuildRequires: python
 BuildRequires: gettext
 Conflicts: pirut < 1.1.4
@@ -54,7 +54,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/yum.conf
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/etc/yum.conf
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d $RPM_BUILD_ROOT/usr/lib/yum-plugins
 
@@ -66,7 +66,7 @@
 EOF
 
 # install yum-updatesd
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/yum/yum-updatesd.conf
+install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum-updatesd.conf
 
 # for now, move repodir/yum.conf back
 mv $RPM_BUILD_ROOT/%{_sysconfdir}/yum/repos.d $RPM_BUILD_ROOT/%{_sysconfdir}/yum.repos.d
@@ -88,7 +88,7 @@
 exit 0
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc README AUTHORS COPYING TODO INSTALL ChangeLog
 %config(noreplace) %{_sysconfdir}/yum.conf
 %dir %{_sysconfdir}/yum
@@ -109,7 +109,7 @@
 /usr/lib/yum-plugins/*
 
 %files updatesd
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %config(noreplace) %{_sysconfdir}/yum/yum-updatesd.conf
 %config %{_sysconfdir}/rc.d/init.d/yum-updatesd
 %config %{_sysconfdir}/dbus-1/system.d/yum-updatesd.conf
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Tue Jul 10 2007 James Bowes <jbowes at redhat.com> - 3.2.1-2
+- defattr, buldarch, and macro suggestions from the merge review
+
 * Thu Jun 21 2007 Seth Vidal <skvidal at fedoraproject.org> - 3.2.1-1
 - bump to 3.2.1