include rapper here

raptor2.spec

@@ -2,7 +2,7 @@
 Summary: RDF Parser Toolkit for Redland
 Name:    raptor2
 Version: 2.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+ or LGPLv2+ or ASL 2.0
 Source:  http://download.librdf.org/source/raptor2-%{version}.tar.gz
@@ -17,8 +17,8 @@ BuildRequires: gtk-doc
 BuildRequires: libxslt-devel 
 BuildRequires: yajl-devel
 
-## when/if rappor gets moved from there to here -- rex
-#Conflicts: raptor < 1.4.21-10
+# when /usr/bin/rappor moved here  -- rex
+Conflicts: raptor < 1.4.21-10
 
 %description
 Raptor is the RDF Parser Toolkit for Redland that provides
@@ -55,8 +55,6 @@ make DESTDIR=%{buildroot} install
 
 ## unpackaged files
 rm -fv %{buildroot}%{_libdir}/lib*.la
-rm -fv %{buildroot}%{_bindir}/rapper
-rm -fv %{buildroot}%{_mandir}/man1/rapper*
 
 
 %check
@@ -75,9 +73,8 @@ rm -rf %{buildroot}
 %doc AUTHORS ChangeLog NEWS README
 %doc COPYING* LICENSE.txt LICENSE-2.0.txt
 %{_libdir}/libraptor2.so.0*
-## rapper conflicts with raptor(1) --rex
-#{_bindir}/rapper
-#{_mandir}/man1/rapper*
+%{_bindir}/rapper
+%{_mandir}/man1/rapper*
 
 %files devel
 %doc UPGRADING.html
@@ -91,6 +88,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Jul 31 2011 Rex Dieter <rdieter@fedoraproject.org> 2.0.4-2
+- include rapper here
+
 * Fri Jul 29 2011 Rex Dieter <rdieter@fedoraproject.org> 2.0.4-1
 - 2.0.4