rpms/rb_libtorrent/devel rb_libtorrent.spec,1.1,1.2

[Peter Gordon (pgordon)]

Author: pgordon

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

Modified Files:
	rb_libtorrent.spec 
Log Message:
Fix comments and %%changelog entry; fix libtorrent Conflicts (should Conflict with libtorrent-devel).


Index: rb_libtorrent.spec
===================================================================
RCS file: /cvs/extras/rpms/rb_libtorrent/devel/rb_libtorrent.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rb_libtorrent.spec	28 Jan 2007 17:14:28 -0000	1.1
+++ rb_libtorrent.spec	28 Jan 2007 17:25:23 -0000	1.2
@@ -35,9 +35,8 @@
 License:	BSD, zlib/libpng License, Boost Software License
 Requires:	%{name} = %{version}-%{release}
 Requires:	pkgconfig
-## Same headers directory, pkgconfig file, and unsuffixed shared library
-## symlink. :(
-Conflicts:	libtorrent
+## Same pkgconfig file, and unsuffixed shared library symlink. :(
+Conflicts:	libtorrent-devel
 ## Needed for various headers retrieved via #include directives...
 Requires:	boost-devel
 Requires:	openssl-devel
@@ -81,7 +80,7 @@
 
 %install
 rm -rf %{buildroot}
-## Ensure that we preserver our timestamps properly.
+## Ensure that we preserve our timestamps properly.
 export CPPROG="%{__cp} -p"
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -c -p"
 ## Do the renaming due to the somewhat limited %%_bindir namespace. 
@@ -124,6 +123,9 @@
 - Strip the @ZLIB@ (and thus, the extra '-lz' link option) from the installed
   pkgconfig file, as that is only useful when building a statically-linked
   libtorrent binary. 
+- Fix conflict: The -devel subpackage should conflict with the -devel
+  subpackage of libtorrent, not the main package.
+- Preserve timestamps in %%install.
 
 * Wed Jan 17 2007 Peter Gordon <peter at thecodergeek.com> - 0.11-3
 - Fix License (GPL -> BSD)