SPECS: nvu.spec - ft epoch

[glen]

Author: glen                         Date: Sun Feb 26 10:57:58 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- ft epoch

---- Files affected:
SPECS:
   nvu.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/nvu.spec
diff -u SPECS/nvu.spec:1.23 SPECS/nvu.spec:1.24
--- SPECS/nvu.spec:1.23	Sat Feb 25 16:44:10 2006
+++ SPECS/nvu.spec	Sun Feb 26 11:57:53 2006
@@ -19,7 +19,7 @@
 URL:		http://www.nvu.com/
 BuildRequires:	GConf2-devel
 BuildRequires:	freetype-devel >= 2.1.3
-BuildConflicts:	freetype-devel = 2.1.8
+BuildConflicts:	freetype-devel = 1:2.1.8
 BuildRequires:	gnome-vfs2-devel
 BuildRequires:	gtk+2-devel >= 1:2.2.0
 BuildRequires:	libgnome-devel
@@ -30,7 +30,7 @@
 BuildRequires:	pkgconfig
 BuildRequires:	zip
 Requires:	freetype >= 2.1.3
-Conflicts:	freetype = 2.1.8
+Conflicts:	freetype = 1:2.1.8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # doesn't provide system mozilla libs
@@ -198,6 +198,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2006/02/26 10:57:53  glen
+- ft epoch
+
 Revision 1.23  2006/02/25 15:44:10  blekot
 - work complete with nvu-1.0
 - rel 1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nvu.spec?r1=1.23&r2=1.24&f=u