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

Haïkel Guémar (hguemar) fedora-extras-commits at redhat.com
Thu Nov 23 13:07:39 UTC 2006


Author: hguemar

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

Modified Files:
	gtkmozembedmm.spec 
Log Message:



Index: gtkmozembedmm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkmozembedmm/devel/gtkmozembedmm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtkmozembedmm.spec	23 Nov 2006 12:46:04 -0000	1.7
+++ gtkmozembedmm.spec	23 Nov 2006 13:07:08 -0000	1.8
@@ -1,6 +1,7 @@
+%define gecko_ver 1.8.1
 Name:           gtkmozembedmm
 Version:        1.4.2.cvs20060817
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        C++ wrapper for GtkMozembed
 
@@ -18,12 +19,8 @@
 BuildRequires:  libgnomemm26 >= 2.12.0
 BuildRequires:  libgnomeuimm26-devel >= 2.12.0
 # Use mozilla-devel up to FC5, and gecko-devel for FC6+
-%if %{!?fedora:6}%{?fedora} >= 6
-BuildRequires: gecko-devel 
-Requires: gecko-libs = 2.0
-%else
-BuildRequires: mozilla-devel
-%endif
+BuildRequires: gecko-devel = %{gecko_ver}
+Requires: gecko-libs = %{gecko_ver}
 BuildRequires:  automake >= 1.9.6
 BuildRequires:  libtool
 Requires(post):   /sbin/ldconfig
@@ -41,11 +38,8 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtkmm24-devel
-%if %{!?fedora:6}%{?fedora} >= 6
-BuildRequires: gecko-devel
-%else
-BuildRequires: mozilla-devel 
-%endif
+BuildRequires: gecko-devel = %{gecko_ver}
+
 
 %description devel
 This package contains the headers that programmers will need to
@@ -54,9 +48,7 @@
 
 %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




More information about the scm-commits mailing list