rpms/gtksourceview/devel gtksourceview.spec,1.45,1.46

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/pkgs/rpms/gtksourceview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4983

Modified Files:
	gtksourceview.spec 
Log Message:
fix conflicts



Index: gtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview/devel/gtksourceview.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- gtksourceview.spec	19 Jun 2007 01:45:12 -0000	1.45
+++ gtksourceview.spec	27 Jun 2007 20:34:26 -0000	1.46
@@ -7,7 +7,7 @@
 Summary: A library for viewing source files
 Name: gtksourceview
 Version: 1.90.1
-Release: 1%{?dist} 
+Release: 2%{?dist} 
 License: GPL
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/ 
@@ -50,6 +50,10 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# avoid conflict with compat-gtksourceview
+mv $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gtksourceview \
+   $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/gtksourceview-2.0
+
 # remove unwanted files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -71,11 +75,14 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/gtksourceview-2.0
-%{_datadir}/gtk-doc/html/gtksourceview
+%{_datadir}/gtk-doc/html/gtksourceview-2.0
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
 
 %changelog
+* Wed Jun 27 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.1-2
+- Avoid a conflict with compat-gtksourceview
+
 * Mon Jun 18 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.1-1
 - Update to 1.90.1
 - Update dependencies