rpms/openoffice.org-voikko/F-9 openoffice.org-voikko.spec, 1.10, 1.11

Ville-Pekka Vainio vpv at fedoraproject.org
Tue Nov 18 22:19:54 UTC 2008


Author: vpv

Update of /cvs/pkgs/rpms/openoffice.org-voikko/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21151

Modified Files:
	openoffice.org-voikko.spec 
Log Message:
* Wed Nov 19 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-5
- add --force to protect against installing by rpm an extension which was
  previously installed manually
- Remove unneeded openoffice.org-core Requires, rpmbuild should detect that
  automatically. Keep libvoikko >= 1.5 Requires as instructed by upstream
  release notes, rpmbuild can't detected that automatically.
- Add Epoch 1 to all openoffice.org-core pre-/post-Requires to avoid bugs such
  as rhbz #472093 (incorrect openoffice.org-core dependency)

Note: won't do the update dance for this commit, even the epoch bug should 
never actually happen on F9 anymore



Index: openoffice.org-voikko.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org-voikko/F-9/openoffice.org-voikko.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openoffice.org-voikko.spec	12 Oct 2008 22:58:36 -0000	1.10
+++ openoffice.org-voikko.spec	18 Nov 2008 22:19:23 -0000	1.11
@@ -9,11 +9,12 @@
 Source0:        http://downloads.sourceforge.net/voikko/%{name}-%{version}.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
+BuildRequires:    openoffice.org-sdk >= 1:2.3.0-6.12
+BuildRequires:    libvoikko-devel >= 1.5
+Requires(pre):    openoffice.org-core >= 1:2.3.0-6.12
+Requires(post):   openoffice.org-core >= 1:2.3.0-6.12
+Requires(preun):  openoffice.org-core >= 1:2.3.0-6.12
+Requires(postun): openoffice.org-core >= 1:2.3.0-6.12
 # Rpmbuild only detects libvoikko.so.1 automatically, which is
 # too general for openoffice.org-voikko.
 Requires:         libvoikko >= 1.5
@@ -81,12 +82,14 @@
 
 
 %changelog
-* Mon Oct 13 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-5
+* Wed Nov 19 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-5
 - add --force to protect against installing by rpm an extension which was
   previously installed manually
 - Remove unneeded openoffice.org-core Requires, rpmbuild should detect that
   automatically. Keep libvoikko >= 1.5 Requires as instructed by upstream
   release notes, rpmbuild can't detected that automatically.
+- Add Epoch 1 to all openoffice.org-core pre-/post-Requires to avoid bugs such
+  as rhbz #472093 (incorrect openoffice.org-core dependency)
 
 * Sat Apr 26 2008 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.2-4
 - Build with RPM_OPT_FLAGS, adds FORTIFY_SOURCE etc.




More information about the fedora-extras-commits mailing list