rpms/xournal/devel xournal.spec,1.14,1.15

[Rick L. Vinyard, Jr.]

Author: rvinyard

Update of /cvs/pkgs/rpms/xournal/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2900

Modified Files:
	xournal.spec 
Log Message:



Index: xournal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xournal/devel/xournal.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- xournal.spec	16 Feb 2010 17:49:31 -0000	1.14
+++ xournal.spec	1 Jun 2010 18:10:07 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		xournal
 Version:	0.4.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Notetaking, sketching, PDF annotation and general journal
 
 Group:		Applications/Editors
@@ -14,7 +14,14 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	gtk2-devel >= 2.10.0 
 BuildRequires:	libgnomecanvas-devel >= 2.4.0 
 BuildRequires:	libgnomeprintui22-devel >= 2.0.0 
+%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 BuildRequires:	poppler-glib-devel >= 0.5.4
+%else
+BuildRequires:	poppler-devel >= 0.5.4
+%endif
+%if 0%{?rhel} > 4
+BuildRequires:	autoconf, automake
+%endif
 BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
@@ -103,6 +110,9 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Jun 01 2010 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.5-4
+- Add EPEL defines
+
 * Tue Feb 16 2010 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> 0.4.5-3
 - Remove freetype patch and add general configure.in patch to
   fix implicit DSO linking