diff --git a/libraw1394.spec b/libraw1394.spec
index 4f77f5f..5f01599 100644
--- a/libraw1394.spec
+++ b/libraw1394.spec
@@ -1,22 +1,22 @@
-Summary: Library providing low-level IEEE-1394 access
-Name: libraw1394
-Version: 1.2.1
-Release: 1%{?dist}
-License: LGPL
-Group: System Environment/Libraries
-Source: http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
-URL: http://www.linux1394.org/
-ExcludeArch: s390 s390x
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Summary:        Library providing low-level IEEE-1394 access
+Name:           libraw1394
+Version:        1.2.1
+Release:        2%{?dist}
+License:        LGPL
+Group:          System Environment/Libraries
+Source:         http://www.linux1394.org/dl/libraw1394-%{version}.tar.gz
+URL:            http://www.linux1394.org/
+ExcludeArch:    s390 s390x
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The libraw1394 library provides direct access to the IEEE-1394 bus through
 the Linux 1394 subsystem's raw1394 user space interface.
 
 %package devel
-Summary: Development libs for libraw1394
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}, pkgconfig
+Summary:       Development libs for libraw1394
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}, pkgconfig
 
 %description devel
 Development libraries needed to build applications against libraw1394.
@@ -61,9 +61,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 04 2007 Jarod Wilson <jwilson@redhat.com> - 1.2.1-2
+- Minor spec cleanups for Core/Extras merger (#226039)
+
 * Wed Jul 12 2006 Jarod Wilson <jwilson@redhat.com> - 1.2.1-1
 - update to 1.2.1
-- use %dist tag
+- use %%dist tag
 
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.2.0-3.fc5.2.1
 - rebuild
@@ -140,7 +143,7 @@ rm -rf $RPM_BUILD_ROOT
 - automated rebuild
 
 * Wed Jun 19 2002 Michael Fulbright <msf@redhat.com>
-- fixed up %files list for devel subpackage and included api docs
+- fixed up %%files list for devel subpackage and included api docs
 
 * Sun Jun 09 2002 Michael Fulbright <msf@redhat.com>
 - First RPM build