rpms/gtkmozembedmm/devel gtkmozembedmm.spec,1.6,1.7

[Haïkel Guémar (hguemar)]

Author: hguemar

Update of /cvs/extras/rpms/gtkmozembedmm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29857

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkmozembedmm.spec	23 Nov 2006 12:12:13 -0000	1.6
+++ gtkmozembedmm.spec	23 Nov 2006 12:46:04 -0000	1.7
@@ -1,7 +1,6 @@
-%define gecko_version 1.8.1
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
-Release:        6%{?dist}
+Release:        5%{?dist}
 
 Summary:        C++ wrapper for GtkMozembed
 
@@ -19,8 +18,12 @@
 BuildRequires:  libgnomemm26 >= 2.12.0
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
 # Use mozilla-devel up to FC5, and gecko-devel for FC6+
-BuildRequires: gecko-devel = %{gecko_version}
-Requires: gecko-libs = %{gecko_version}
+%if %{!?fedora:6}%{?fedora} >= 6
+BuildRequires: gecko-devel 
+Requires: gecko-libs = 2.0
+%else
+BuildRequires: mozilla-devel
+%endif
 BuildRequires:  automake >= 1.9.6
 BuildRequires:  libtool
 Requires(post):   /sbin/ldconfig
@@ -38,7 +41,11 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
-BuildRequires: gecko-devel = %{gecko_version}
+%if %{!?fedora:6}%{?fedora} >= 6
+BuildRequires: gecko-devel
+%else
+BuildRequires: mozilla-devel 
+%endif
 
 %description devel
 This package contains the headers that programmers will need to
@@ -47,7 +54,9 @@
 
 %prep
 %setup -q -n gtkmozembedmm-%{version}
+%if %{!?fedora:6}%{?fedora} >= 6
 %{__sed} -i 's/mozilla-gtkmozembed/firefox-gtkmozembed/' configure configure.ac
+%endif
 %ifarch x86_64
 # correct a path issue that prevent gtkmozembedmm to build on x86_64
 %{__sed} -i 's/lib\/glibmm-2.4/lib64\/glibmm-2.4/' configure
@@ -96,9 +105,6 @@
 
 
 %changelog
-* Thu Nov 23 2006 Karl <karlthered at gmail.com> - 1.4.2.cvs20060817-6
-- Fixed build issue in rawhide
-
 * Sun Nov 12 2006 Karl <karlthered at gmail.com> - 1.4.2.cvs20060817-5
 - Fixed x86_64 build issue.