rpms/mozvoikko/F-9 mozvoikko-fedora-includes.patch, NONE, 1.1 mozvoikko.spec, 1.1, 1.2 mozvoikko-no-unstable.patch, 1.1, NONE

[Ville-Pekka Vainio]

Author: vpv

Update of /cvs/pkgs/rpms/mozvoikko/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28437

Modified Files:
	mozvoikko.spec 
Added Files:
	mozvoikko-fedora-includes.patch 
Removed Files:
	mozvoikko-no-unstable.patch 
Log Message:
* Sat Aug 30 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-2
- Fix the xulrunner requires:
  - Add define gecko_ver 1.9.0.1
  - Add Requires: gecko-libs = gecko_ver
  - Add BuildRequires: gecko-devel-unstable = gecko_ver
  - Remove all actual xulrunner requires
- Redo the Makefile.xulrunner includes patch, we only need the stable and
  unstable header dirs in Fedora


mozvoikko-fedora-includes.patch:

--- NEW FILE mozvoikko-fedora-includes.patch ---
--- mozvoikko-0.9.5.orig/src/Makefile.xulrunner	2008-06-16 19:43:41.000000000 +0300
+++ mozvoikko-0.9.5/src/Makefile.xulrunner	2008-08-30 14:32:12.000000000 +0300
@@ -22,12 +22,7 @@
 CC_LINK=g++ -shared -Wl,--no-undefined
 include ../mozvoikko.config
 
-XULRUNNER_INCLUDES=-I$(XULRUNNER_SDK)/sdk/include -I$(XULRUNNER_SDK)/include \
--I$(XULRUNNER_INCDIR)/xpcom \
--I$(XULRUNNER_INCDIR)/spellchecker \
--I$(XULRUNNER_INCDIR)/uconv \
--I$(XULRUNNER_INCDIR)/unicharutil \
--I$(XULRUNNER_INCDIR)/xulapp \
+XULRUNNER_INCLUDES= -I$(XULRUNNER_INCDIR)/stable \
 -I$(XULRUNNER_INCDIR)/unstable
 XULRUNNER_LIBS=-L$(XULRUNNER_SDK)/sdk/lib -L$(XULRUNNER_SDK)/sdk/bin \
 -Wl,-rpath-link,$(XULRUNNER_SDK)/sdk/bin -lxpcomglue_s -lxpcom -lnspr4


Index: mozvoikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mozvoikko/F-9/mozvoikko.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozvoikko.spec	24 Jul 2008 19:59:21 -0000	1.1
+++ mozvoikko.spec	30 Aug 2008 17:14:20 -0000	1.2
@@ -1,3 +1,5 @@
+# For the xulrunner unstable requires
+%define gecko_ver 1.9.0.1
 # These come from install.rdf
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define firefox_ext_id \{b676e3ff-cda7-4e0c-b2b8-74e4bb40a67a\}
@@ -10,25 +12,28 @@
 
 Name:           mozvoikko
 Version:        0.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Finnish Voikko spell-checker extension for Mozilla programs
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://voikko.sourceforge.net
 Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
-# This package will build without this patch if BR xulrunner-devel-unstable is
-# added, but with this patch  xulrunner-devel-unstable is not needed in Fedora.
-# Upstream knows about the patch, but it's somewhat Fedora specific.
-Patch0:         mozvoikko-no-unstable.patch
+# Simplify the includes, we only need the stable and unstable header dirs in
+# Fedora
+Patch0:         mozvoikko-fedora-includes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  xulrunner-devel libvoikko-devel
+# For xulrunner unstable
+BuildRequires:  gecko-devel-unstable = %{gecko_ver}
+BuildRequires:  libvoikko-devel
 BuildRequires:  pkgconfig
+# For xulrunner unstable
+Requires:       gecko-libs = %{gecko_ver}
+Requires:       %{libvoikko}%{?mark64}
+Requires:       %{libmalaga}%{?mark64}
 # As long as Firefox is the only program which can use the extension,
 # we may as well require it, since this package is quite useless without it.
 Requires:       firefox
-Requires:       %{libvoikko}%{?mark64}
-Requires:       %{libmalaga}%{?mark64}
 
 %description
 This is mozvoikko, an extension for Mozilla programs for using the Finnish
@@ -65,6 +70,15 @@
 
 
 %changelog
+* Sat Aug 30 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-2
+- Fix the xulrunner requires:
+  - Add define gecko_ver 1.9.0.1
+  - Add Requires: gecko-libs = gecko_ver
+  - Add BuildRequires: gecko-devel-unstable = gecko_ver
+  - Remove all actual xulrunner requires
+- Redo the Makefile.xulrunner includes patch, we only need the stable and
+  unstable header dirs in Fedora
+
 * Thu Jul 24 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 0.9.5-1
 - Bump Release for initial Fedora build
 


--- mozvoikko-no-unstable.patch DELETED ---