rpms/openoffice.org-voikko/devel openoffice.org-voikko-2.2-3layer.patch, NONE, 1.1 openoffice.org-voikko.spec, 1.7, 1.8

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org-voikko/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27598

Modified Files:
	openoffice.org-voikko.spec 
Added Files:
	openoffice.org-voikko-2.2-3layer.patch 
Log Message:
tweak to build against 3 layer OOo sdk

openoffice.org-voikko-2.2-3layer.patch:

--- NEW FILE openoffice.org-voikko-2.2-3layer.patch ---
--- openoffice.org-voikko-2.2.orig/Makefile	2008-06-03 08:49:57.000000000 +0100
+++ openoffice.org-voikko-2.2/Makefile	2008-06-03 09:21:47.000000000 +0100
@@ -98,7 +98,7 @@
 		WARNING_FLAGS+= -fno-strict-aliasing
 	endif
 endif
-LINK_FLAGS=$(COMP_LINK_FLAGS) $(OPT_FLAGS) $(LINKER_FLAGS) -L"$(OFFICE_PROGRAM_PATH)" \
+LINK_FLAGS=$(COMP_LINK_FLAGS) $(OPT_FLAGS) $(LINKER_FLAGS) $(LINK_LIBS) \
            $(SALLIB) $(CPPULIB) $(CPPUHELPERLIB)
 VOIKKO_CC_FLAGS=$(OPT_FLAGS) $(WARNING_FLAGS) -Ibuild/hpp -I$(PRJ)/include/stl -I$(PRJ)/include
 


Index: openoffice.org-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/openoffice.org-voikko.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- openoffice.org-voikko.spec	26 Apr 2008 21:28:49 -0000	1.7
+++ openoffice.org-voikko.spec	3 Jun 2008 09:13:24 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           openoffice.org-voikko
 Version:        2.2 
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Finnish spellchecker and hyphenator extension for OpenOffice.org
 
 Group:          Applications/Productivity
@@ -16,6 +16,8 @@
 Requires(postun): openoffice.org-core >= 2.3.0-6.12
 Requires: openoffice.org-core >= 2.3.0-6.12 libvoikko >= 1.5
 
+Patch0: openoffice.org-voikko-2.2-3layer.patch
+
 %define oo2_sdk %{_libdir}/openoffice.org/sdk
 %define oo2 %{_libdir}/openoffice.org
 %define unopkg %{oo2}/program/unopkg
@@ -31,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .3layer.patch
 
 
 # Make install-unpacked also builds before installing, leave the build section
@@ -79,6 +82,9 @@
 
 
 %changelog
+* Tue Jun 03 2008 Caolán McNamara <caolan at redhat.com> - 2.2-5
+- add openoffice.org-voikko-2.2-3layer.patch to build against 3 layer OOo
+
 * Sat Apr 26 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-4
 - Build with RPM_OPT_FLAGS, adds FORTIFY_SOURCE etc.