--- ORIG/libmtp.spec	2008-03-08 00:32:23.000000000 +0100
+++ libmtp.spec	2009-01-10 20:49:53.000000000 +0100
@@ -1,16 +1,16 @@
 # SPEC file for libmtp, primary target is the Fedora
 # RPM repository.
 
-Name:           libmtp
+Name:           libmtp-compat0261
 Version:        0.2.6.1
 Release:        1%{?dist}
 Summary:        A software library for MTP media players
 URL:            http://libmtp.sourceforge.net/
 
 Group:          System Environment/Libraries
-Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://download.sourceforge.net/libmtp/libmtp-%{version}.tar.gz
 Source1:        libmtp.perms
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/libmtp-%{version}-%{release}-root-%(%{__id_u} -n)
 License:        LGPLv2+
 Requires:       udev
 Requires:       pam
@@ -26,7 +26,7 @@
 %package examples
 Summary:        Example programs for libmtp
 Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}
+Requires:       libmtp = %{version}-%{release}
 
 %description examples
 This package provides example programs for communicating with MTP
@@ -35,7 +35,7 @@
 %package devel
 Summary:        Development files for libmtp
 Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       libmtp = %{version}-%{release}
 Requires:       pkgconfig
 Requires:       libusb-devel
 
@@ -44,7 +44,7 @@
 library for MTP media players.
 
 %prep
-%setup -q
+%setup -q -n libmtp-%{version}
 
 %build
 %configure --disable-static --program-prefix=mtp-
@@ -68,10 +68,10 @@
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.perms.d/60-libmtp.perms
 # Copy documentation to a good place
 install -p -m 644 AUTHORS ChangeLog COPYING INSTALL README TODO \
-$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+$RPM_BUILD_ROOT%{_docdir}/libmtp-%{version}
 # Touch generated files to make them always have the same time stamp.
 touch -r configure.ac \
-      $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html/* \
+      $RPM_BUILD_ROOT%{_docdir}/libmtp-%{version}/html/* \
       $RPM_BUILD_ROOT%{_includedir}/*.h \
       $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc \
       $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
@@ -80,7 +80,7 @@
 # I don't want to pre-generate it but will instead wait for upstream
 # to find a suitable solution that will always bring the same files,
 # or that Doxygen is fixed not to do this.
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
+rm -rf $RPM_BUILD_ROOT%{_docdir}/libmtp-%{version}/html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,9 +91,6 @@
 %files
 %defattr(-, root,root,-)
 %{_libdir}/*.so.*
-%config(noreplace) %{_sysconfdir}/udev/rules.d/*
-%config(noreplace) %{_sysconfdir}/security/console.perms.d/*
-%config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
 %files examples
 %defattr(-,root,root,-)
 %{_bindir}/*
@@ -101,10 +98,13 @@
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/*.so
-%dir %{_docdir}/%{name}-%{version}
-%{_docdir}/%{name}-%{version}/*
+%dir %{_docdir}/libmtp-%{version}
+%{_docdir}/libmtp-%{version}/*
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
+%config(noreplace) %{_sysconfdir}/udev/rules.d/*
+%config(noreplace) %{_sysconfdir}/security/console.perms.d/*
+%config(noreplace) %{_datadir}/hal/fdi/information/10freedesktop/10-usb-music-players-libmtp.fdi
 
 
 %changelog