rpms/gtksourceview/devel gtksourceview.spec, 1.46, 1.47 sources, 1.29, 1.30

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	gtksourceview.spec sources 
Log Message:
downgrade to 1.8.5



Index: gtksourceview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview/devel/gtksourceview.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- gtksourceview.spec	27 Jun 2007 20:34:26 -0000	1.46
+++ gtksourceview.spec	11 Jul 2007 00:58:00 -0000	1.47
@@ -1,13 +1,13 @@
-%define glib2_version 2.13.3
 %define gtk2_version 2.8.0
 %define gnome_print_version 2.8.0
 
-%define po_package gtksourceview-2.0
+%define po_package gtksourceview-1.0
 
 Summary: A library for viewing source files
 Name: gtksourceview
-Version: 1.90.1
+Version: 1.8.5
 Release: 2%{?dist} 
+Epoch: 1
 License: GPL
 Group: System Environment/Libraries
 URL: http://gtksourceview.sourceforge.net/ 
@@ -15,8 +15,9 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: gnome-vfs2-devel
 BuildRequires: libxml2-devel
-BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: libgnomeprint22-devel >= %{gnome_print_version}
+BuildRequires: libgnomeprintui22-devel >= %{gnome_print_version}
 BuildRequires: intltool >= 0.35
 BuildRequires: gettext 
 
@@ -28,8 +29,9 @@
 %package devel
 Summary: Files to compile applications that use gtksourceview
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: gtk2-devel >= %{gtk2_version} 
+Requires: libgnomeprint22-devel >= %{gnome_print_version}
 Requires: libxml2-devel
 Requires: pkgconfig
 
@@ -50,10 +52,6 @@
 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
 
@@ -69,17 +67,21 @@
 %files -f %{po_package}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING NEWS MAINTAINERS ChangeLog
-%{_datadir}/gtksourceview-2.0
+%{_datadir}/gtksourceview-1.0
 %{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/gtksourceview-2.0
-%{_datadir}/gtk-doc/html/gtksourceview-2.0
+%{_includedir}/gtksourceview-1.0
+%{_datadir}/gtk-doc/html/gtksourceview
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/*.so
 
 %changelog
+* Tue Jul 10 2007 Matthias Clasen <mclasen at redhat.com> - 1:1.8.5-2
+- Add an epoch and downgrade to 1.8.5; gtksourceview 2.x 
+  will live in the gtksourceview2 package2
+
 * Wed Jun 27 2007 Matthias Clasen <mclasen at redhat.com> - 1.90.1-2
 - Avoid a conflict with compat-gtksourceview
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtksourceview/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	19 Jun 2007 00:30:44 -0000	1.29
+++ sources	11 Jul 2007 00:58:00 -0000	1.30
@@ -1 +1 @@
-4c627eda26c63cf76cdabce56e247d91  gtksourceview-1.90.1.tar.bz2
+de67df2944c1cccbc2d0b4a738e11050  gtksourceview-1.8.5.tar.bz2