rpms/openoffice.org-voikko/devel import.log, NONE, 1.1 .cvsignore, 1.4, 1.5 openoffice.org-voikko.spec, 1.8, 1.9 sources, 1.4, 1.5 openoffice.org-voikko-2.2-3layer.patch, 1.1, NONE

[Ville-Pekka Vainio (vpv)]

Author: vpv

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

Modified Files:
	.cvsignore openoffice.org-voikko.spec sources 
Added Files:
	import.log 
Removed Files:
	openoffice.org-voikko-2.2-3layer.patch 
Log Message:
New pre-release



--- NEW FILE import.log ---
openoffice_org-voikko-3_0-0_1_pre4_fc10:HEAD:openoffice.org-voikko-3.0-0.1.pre4.fc10.src.rpm:1217015746


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Feb 2008 13:26:47 -0000	1.4
+++ .cvsignore	25 Jul 2008 19:59:04 -0000	1.5
@@ -1 +1 @@
-openoffice.org-voikko-2.2.tar.gz
+openoffice.org-voikko-3.0pre4.tar.gz


Index: openoffice.org-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/openoffice.org-voikko.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- openoffice.org-voikko.spec	3 Jun 2008 09:13:24 -0000	1.8
+++ openoffice.org-voikko.spec	25 Jul 2008 19:59:04 -0000	1.9
@@ -1,29 +1,29 @@
 Name:           openoffice.org-voikko
-Version:        2.2 
-Release:        5%{?dist}
+Version:        3.0 
+Release:        0.1.pre4%{?dist}
 Summary:        Finnish spellchecker and hyphenator extension for OpenOffice.org
 
 Group:          Applications/Productivity
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://voikko.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
+# The usual format of stable release tarball URLs
+#Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.tar.gz
+Source0:        http://www.puimula.org/htp/testing/%{name}-%{version}pre4.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: openoffice.org-sdk >= 2.3.0-6.12 libvoikko-devel >= 1.5
-Requires(pre):    openoffice.org-core >= 2.3.0-6.12
-Requires(post):   openoffice.org-core >= 2.3.0-6.12
-Requires(preun):  openoffice.org-core >= 2.3.0-6.12
-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
+BuildRequires: openoffice.org-sdk >= 3.0.0 libvoikko-devel >= 1.5
+Requires(pre):    openoffice.org-core >= 3.0.0
+Requires(post):   openoffice.org-core >= 3.0.0
+Requires(preun):  openoffice.org-core >= 3.0.0
+Requires(postun): openoffice.org-core >= 3.0.0
+Requires: openoffice.org-core >= 3.0.0 libvoikko >= 1.5
+
+%define ooo_sdk %{_libdir}/openoffice.org/basis3.0/sdk
+%define ooo %{_libdir}/openoffice.org
+%define unopkg %{_libdir}/openoffice.org3/program/unopkg
 # The location of the installed extension. Apparently the directory name must
 # end with .uno.pkg or unopkg will fail.
-%define voikkoext %{_libdir}/openoffice.org/extensions/voikko.uno.pkg
+%define voikkoext %{ooo}/extensions/voikko.uno.pkg
 
 %description
 This package contains a Finnish spell-checking and hyphenation component for
@@ -33,7 +33,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .3layer.patch
 
 
 # Make install-unpacked also builds before installing, leave the build section
@@ -43,9 +42,10 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-. %{oo2_sdk}/setsdkenv_unix.sh
+. %{ooo_sdk}/setsdkenv_unix.sh
+# Use SHOW_UGLY_WARNINGS only for pre-release builds
 make install-unpacked DESTDIR=$RPM_BUILD_ROOT%{voikkoext} \
-    "OPT_FLAGS=$RPM_OPT_FLAGS" %{?_smp_mflags}
+    SHOW_UGLY_WARNINGS=1 "OPT_FLAGS=$RPM_OPT_FLAGS" %{?_smp_mflags}
 # Set the library executable so debuginfo can be extracted.
 chmod +x $RPM_BUILD_ROOT%{voikkoext}/voikko.so
 
@@ -82,6 +82,13 @@
 
 
 %changelog
+* Fri Jul 25 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 3.0-0.1.pre4
+- New pre-release
+- License changed to GPLv3+
+- Require openoffice.org >= 3.0.0
+- Drop unneeded 3 layer patch
+- Build with new SHOW_UGLY_WARNINGS=1 option as this is a test release
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Feb 2008 13:26:47 -0000	1.4
+++ sources	25 Jul 2008 19:59:04 -0000	1.5
@@ -1 +1 @@
-830e6ed421f6d5eef19f3c4978b04da7  openoffice.org-voikko-2.2.tar.gz
+88ffb4d2daad6c26610717cf29e337c4  openoffice.org-voikko-3.0pre4.tar.gz


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